Author: gnodet
Date: Sun Oct 26 15:53:35 2008
New Revision: 708055
URL: http://svn.apache.org/viewvc?rev=708055&view=rev
Log:
SMX4KNL-128: Remove OBR support from default distribution
Modified:
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/features.xml
Modified:
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=708055&r1=708054&r2=708055&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
(original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Sun
Oct 26 15:53:35 2008
@@ -112,7 +112,6 @@
<includes>
<include>org.apache.felix:org.osgi.compendium</include>
<include>org.apache.felix:org.apache.felix.configadmin</include>
-
<include>org.apache.felix:org.apache.felix.bundlerepository</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
</includes>
</dependencySet>
@@ -207,7 +206,6 @@
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.admin</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.osgi</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.log</include>
-
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.obr</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.features</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.config</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.packages</include>
Modified:
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=708055&r1=708054&r2=708055&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
(original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
Sun Oct 26 15:53:35 2008
@@ -104,7 +104,6 @@
<includes>
<include>org.apache.felix:org.osgi.compendium</include>
<include>org.apache.felix:org.apache.felix.configadmin</include>
-
<include>org.apache.felix:org.apache.felix.bundlerepository</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
</includes>
</dependencySet>
@@ -199,7 +198,6 @@
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.admin</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.osgi</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.log</include>
-
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.obr</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.features</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.config</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.packages</include>
Modified:
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/features.xml?rev=708055&r1=708054&r2=708055&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/features.xml
(original)
+++
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/features.xml
Sun Oct 26 15:53:35 2008
@@ -17,7 +17,11 @@
limitations under the License.
-->
<features>
- <feature name="wrapper">
+ <feature name="wrapper" version="${version}">
<bundle>mvn:org.apache.servicemix.kernel.gshell/org.apache.servicemix.kernel.gshell.wrapper/${version}</bundle>
</feature>
+ <feature name="obr" version="${version}">
+
<bundle>mvn:org.apache.felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}</bundle>
+
<bundle>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.obr/${version}</bundle>
+ </feature>
</features>
