d69b1c7cdae00647e79475459594dc4fecf41a3c - servicemix5

commit	d69b1c7cdae00647e79475459594dc4fecf41a3c	[log] [tgz]
author	Freeman Yue Fang <ffang@apache.org>	Mon Feb 24 04:21:18 2014 +0000
committer	Freeman Yue Fang <ffang@apache.org>	Mon Feb 24 04:21:18 2014 +0000
tree	9298a5841957df7a0a59c6969e6596e6ffb59cf5
parent	a9ce33c284d5c0bfa0b6bd5d9315232f6a3bacc7 [diff]

[SM-2246]Merge apache-servicemix and shared into a single assembly module

git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx5/trunk@1571134 13f79535-47bb-0310-9956-ffa450edef68

assemblies/apache-servicemix/pom.xml[Deleted - diff]
assemblies/pom.xml[diff]
assemblies/shared/pom.xml[Deleted - diff]
assemblies/src/main/descriptors/unix-bin.xml[Renamed from assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml - diff]
assemblies/src/main/descriptors/unix-src.xml[Renamed from assemblies/apache-servicemix/src/main/descriptors/unix-src.xml - diff]
assemblies/src/main/descriptors/windows-bin.xml[Renamed from assemblies/apache-servicemix/src/main/descriptors/windows-bin.xml - diff]
assemblies/src/main/descriptors/windows-src.xml[Renamed from assemblies/apache-servicemix/src/main/descriptors/windows-src.xml - diff]
assemblies/src/main/filtered-resources/etc/org.apache.karaf.features.cfg[Renamed from assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg - diff]
assemblies/src/main/filtered-resources/features.xml[Renamed from assemblies/apache-servicemix/src/main/filtered-resources/features.xml - diff]
assemblies/src/main/filtered-resources/pom.xml[Renamed from assemblies/shared/src/main/filtered-resources/pom.xml - diff]
assemblies/src/main/filtered-resources/startup-obr.properties[Renamed from assemblies/shared/src/main/filtered-resources/startup-obr.properties - diff]
assemblies/src/main/resources/appended-resources/META-INF/LICENSE.vm[Renamed from assemblies/shared/src/main/resources/appended-resources/META-INF/LICENSE.vm - diff]
assemblies/src/main/resources/appended-resources/META-INF/NOTICE[Renamed from assemblies/shared/src/main/resources/appended-resources/META-INF/NOTICE - diff]
assemblies/src/main/resources/common-bin.xml[Renamed from assemblies/shared/src/main/resources/common-bin.xml - diff]
assemblies/src/main/resources/common-unix-bin.xml[Renamed from assemblies/shared/src/main/resources/common-unix-bin.xml - diff]
assemblies/src/main/resources/common-windows-bin.xml[Renamed from assemblies/shared/src/main/resources/common-windows-bin.xml - diff]
assemblies/src/main/resources/etc/custom.properties[Renamed from assemblies/shared/src/main/resources/etc/custom.properties - diff]
assemblies/src/main/resources/etc/jre.properties[Renamed from assemblies/shared/src/main/resources/etc/jre.properties - diff]
assemblies/src/main/resources/etc/org.apache.aries.transaction.cfg[Renamed from assemblies/shared/src/main/resources/etc/org.apache.aries.transaction.cfg - diff]
assemblies/src/main/resources/etc/org.apache.karaf.features.obr.cfg[Renamed from assemblies/shared/src/main/resources/etc/org.apache.karaf.features.obr.cfg - diff]
assemblies/src/main/resources/etc/org.ops4j.pax.logging.cfg[Renamed from assemblies/shared/src/main/resources/etc/org.ops4j.pax.logging.cfg - diff]
assemblies/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg[Renamed from assemblies/shared/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg - diff]
assemblies/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub[Renamed from assemblies/shared/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub - diff]
assemblies/src/main/resources/etc/system.properties[Renamed from assemblies/shared/src/main/resources/etc/system.properties - diff]
assemblies/src/main/resources/etc/users.properties[Renamed from assemblies/shared/src/main/resources/etc/users.properties - diff]
assemblies/src/main/resources/examples-unix-bin.xml[Renamed from assemblies/shared/src/main/resources/examples-unix-bin.xml - diff]
assemblies/src/main/resources/examples-windows-bin.xml[Renamed from assemblies/shared/src/main/resources/examples-windows-bin.xml - diff]
assemblies/src/main/resources/licenses/asm.txt[Renamed from assemblies/shared/src/main/resources/licenses/asm.txt - diff]
assemblies/src/main/resources/licenses/bsd.txt[Renamed from assemblies/shared/src/main/resources/licenses/bsd.txt - diff]
assemblies/src/main/resources/licenses/cddl-1.0.txt[Renamed from assemblies/shared/src/main/resources/licenses/cddl-1.0.txt - diff]
assemblies/src/main/resources/licenses/cpl-1.0.txt[Renamed from assemblies/shared/src/main/resources/licenses/cpl-1.0.txt - diff]
assemblies/src/main/resources/licenses/epl-1.0.txt[Renamed from assemblies/shared/src/main/resources/licenses/epl-1.0.txt - diff]
assemblies/src/main/resources/licenses/slf4j-mit.txt[Renamed from assemblies/shared/src/main/resources/licenses/slf4j-mit.txt - diff]

33 files changed

tree: 9298a5841957df7a0a59c6969e6596e6ffb59cf5