servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1574744 - in /servicemix/smx5/trunk/assembly: ./ src/main/descriptors/ src/main/filtered-resources/ src/main/filtered-resources/etc/
Date Thu, 06 Mar 2014 02:06:17 GMT
Author: ffang
Date: Thu Mar  6 02:06:17 2014
New Revision: 1574744

URL: http://svn.apache.org/r1574744
Log:
[SM-2262]Split features file in multiple parts

Added:
    servicemix/smx5/trunk/assembly/src/main/filtered-resources/examples.xml
    servicemix/smx5/trunk/assembly/src/main/filtered-resources/internal.xml
Modified:
    servicemix/smx5/trunk/assembly/pom.xml
    servicemix/smx5/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx5/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
    servicemix/smx5/trunk/assembly/src/main/filtered-resources/features.xml

Modified: servicemix/smx5/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/pom.xml?rev=1574744&r1=1574743&r2=1574744&view=diff
==============================================================================
--- servicemix/smx5/trunk/assembly/pom.xml (original)
+++ servicemix/smx5/trunk/assembly/pom.xml Thu Mar  6 02:06:17 2014
@@ -144,7 +144,9 @@
                                 <descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</descriptor>
+                                <descriptor>file:${basedir}/target/classes/internal.xml</descriptor>
                                 <descriptor>file:${basedir}/target/classes/features.xml</descriptor>
+                                <descriptor>file:${basedir}/target/classes/examples.xml</descriptor>
                             </descriptors>
                             <features>
                                 <feature>cxf</feature>
@@ -286,10 +288,20 @@
                         <configuration>
                             <artifacts>
                                 <artifact>
+                                    <file>target/classes/internal.xml</file>
+                                    <type>xml</type>
+                                    <classifier>internal</classifier>
+                                </artifact>
+                                <artifact>
                                     <file>target/classes/features.xml</file>
                                     <type>xml</type>
                                     <classifier>features</classifier>
                                 </artifact>
+                                <artifact>
+                                    <file>target/classes/examples.xml</file>
+                                    <type>xml</type>
+                                    <classifier>examples</classifier>
+                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>

Modified: servicemix/smx5/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1574744&r1=1574743&r2=1574744&view=diff
==============================================================================
--- servicemix/smx5/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx5/trunk/assembly/src/main/descriptors/unix-bin.xml Thu Mar  6 02:06:17 2014
@@ -30,6 +30,14 @@
 
     <files>
         <file>
+        <!-- Install the internal features descriptor into the system repository -->
+            <source>${basedir}/target/classes/internal.xml</source>
+            <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
+            <destName>${artifactId}-${version}-internal.xml</destName>
+            <fileMode>0644</fileMode>
+            <lineEnding>unix</lineEnding>
+        </file>
+        <file>
         <!-- Install the features descriptor into the system repository -->
             <source>${basedir}/target/classes/features.xml</source>
             <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
@@ -37,6 +45,14 @@
             <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
+        <file>
+        <!-- Install the example features descriptor into the system repository -->
+            <source>${basedir}/target/classes/examples.xml</source>
+            <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
+            <destName>${artifactId}-${version}-examples.xml</destName>
+            <fileMode>0644</fileMode>
+            <lineEnding>unix</lineEnding>
+        </file>
     </files>
 
 </assembly>

Modified: servicemix/smx5/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1574744&r1=1574743&r2=1574744&view=diff
==============================================================================
--- servicemix/smx5/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
(original)
+++ servicemix/smx5/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
Thu Mar  6 02:06:17 2014
@@ -20,7 +20,7 @@
 #
 # Comma separated list of features repositories to register by default
 #
-featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/internal,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/examples,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features
 
 #
 # Comma separated list of features to install at startup

Added: servicemix/smx5/trunk/assembly/src/main/filtered-resources/examples.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/src/main/filtered-resources/examples.xml?rev=1574744&view=auto
==============================================================================
--- servicemix/smx5/trunk/assembly/src/main/filtered-resources/examples.xml (added)
+++ servicemix/smx5/trunk/assembly/src/main/filtered-resources/examples.xml Thu Mar  6 02:06:17
2014
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<features name="servicemix-examples-${version}">
+
+    <!--
+      -
+      -  Examples
+      -
+    -->
+    <feature name="examples-activemq-camel-blueprint" version="${version}" resolver="(obr)">
+        <feature version="${activemq.version}">activemq-broker-noweb</feature>
+        <feature version="${camel.version}">camel-jms</feature>
+        <feature version="${camel.version}">camel-blueprint</feature>
+        <bundle>mvn:org.apache.servicemix.examples/activemq-camel-blueprint/${version}</bundle>
+    </feature>
+    <feature name="examples-cxf-osgi" version="${version}" resolver="(obr)">
+        <feature version="${cxf.version}">cxf</feature>
+        <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
+        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/cxf-osgi/${version}</bundle>
+    </feature>
+    <feature name="examples-cxf-jaxrs" version="${version}" resolver="(obr)">
+        <feature version="${cxf.version}">cxf</feature>
+        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+	<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs/${version}</bundle>
+    </feature>
+    <feature name="examples-cxf-jaxrs-blueprint" version="${version}" resolver="(obr)">
+        <feature version="${cxf.version}">cxf</feature>
+        <feature version="${version}">swagger</feature>
+        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+	<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs-blueprint/${version}</bundle>
+    </feature>
+    <feature name="examples-cxf-jaxws-blueprint" version="${version}" resolver="(obr)">
+        <feature version="${cxf.version}">cxf</feature>
+        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+	<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/cxf-jaxws-blueprint/${version}</bundle>
+    </feature>
+    <feature name="examples-camel-sql-derby" version="${version}" resolver="(obr)">
+        <feature version="${camel.version}">camel-sql</feature>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.derby/${derby.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-derby/${version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/camel-sql-orders/${version}</bundle>
+    </feature>
+    <feature name="examples-camel-sql-pgsql" version="${version}" resolver="(obr)">
+        <feature version="${camel.version}">camel-sql</feature>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp.bundle.version}</bundle>
+        <bundle dependency="true">wrap:mvn:postgresql/postgresql/${postgresql.version}.jdbc4</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-pgsql/${version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/camel-sql-orders/${version}</bundle>
+    </feature>
+    <feature name="examples-camel-sql-h2" version="${version}" resolver="(obr)">
+        <feature version="${camel.version}">camel-sql</feature>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.osgi/org.osgi.compendium/${osgi.version}</bundle>
+        <bundle dependency="true">mvn:com.h2database/h2/${h2.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-h2/${version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/camel-sql-orders/${version}</bundle>
+    </feature>
+    <feature name="examples-camel-osgi" version="${version}" resolver="(obr)">
+        <feature version="${camel.version}">camel</feature>
+        <bundle>mvn:org.apache.servicemix.examples/camel-osgi/${version}</bundle>
+    </feature>
+    <feature name="examples-camel-blueprint" version="${version}" resolver="(obr)">
+        <feature version="${camel.version}">camel-blueprint</feature>
+        <bundle>mvn:org.apache.servicemix.examples/camel-blueprint/${version}</bundle>
+    </feature>
+    <feature name="examples-camel-drools" version="${version}" resolver="(obr)">
+        <feature version="${camel.version}">camel-jms</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/camel-drools/${version}</bundle>
+    </feature>
+    <feature name="examples-camel-drools-blueprint" version="${version}" resolver="(obr)">
+        <feature version="${camel.version}">camel-jms</feature>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/camel-drools-blueprint/${version}</bundle>
+    </feature>
+    <feature name="examples-camel-cxf-rest" version="${version}" resolver="(obr)">
+        <bundle>mvn:org.apache.servicemix.examples/camel-cxf-rest-service/${version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/camel-cxf-rest-route/${version}</bundle>
+    </feature>
+    <feature name="examples-cxf-ws-addressing" version="${version}" resolver="(obr)">
+        <feature version="${cxf.version}">cxf</feature>
+        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-addressing/${version}</bundle>
+    </feature>
+    <feature name="examples-cxf-ws-security-osgi" version="${version}" resolver="(obr)">
+        <feature version="${cxf.version}">cxf</feature>
+        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-osgi/${version}</bundle>
+    </feature>
+    <feature name="examples-cxf-ws-security-blueprint" version="${version}" resolver="(obr)">
+        <feature version="${cxf.version}">cxf</feature>
+        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-blueprint/${version}</bundle>
+    </feature>
+    <feature name="examples-cxf-ws-security-signature" version="${version}" resolver="(obr)">
+        <feature version="${cxf.version}">cxf</feature>
+        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-signature/${version}</bundle>
+    </feature>
+    <feature name="examples-cxf-ws-rm" version="${version}" resolver="(obr)">
+        <feature version="${cxf.version}">cxf</feature>
+        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-rm/${version}</bundle>
+    </feature>
+    <feature name="examples-cxf-wsn-receive" version="${version}" resolver="(obr)">
+        <feature version="${camel.version}">camel-jetty</feature>
+        <feature version="${camel.version}">camel-jms</feature>
+        <feature version="${camel.version}">camel-jaxb</feature>
+        <feature version="${cxf.version}">cxf-wsn</feature>
+        <bundle>mvn:org.apache.servicemix.examples/cxf-wsn-base/${version}</bundle>
+        <bundle>mvn:org.apache.servicemix.examples/cxf-wsn-receive/${version}</bundle>
+    </feature>
+    <feature name="examples-cxf-wsn-notifier" version="${version}" resolver="(obr)">
+        <feature version="${version}">examples-cxf-wsn-receive</feature>
+        <bundle>mvn:org.apache.servicemix.examples/cxf-wsn-notifier/${version}</bundle>
+    </feature>
+
+    <feature name="examples-activiti-camel" version="${version}" resolver="(obr)">
+	      <feature version="${camel.version}">camel-core</feature>
+        <feature version="${activiti.version}">activiti</feature>
+        <bundle>mvn:org.apache.servicemix.examples/activiti-camel/${version}</bundle>
+    </feature>
+
+    <feature name="examples-akka-camel" version="${version}" resolver="(obr)">
+        <feature version="${akka.version}">akka</feature>
+        <feature version="${camel.version}">camel-scala</feature>
+        <bundle>mvn:org.apache.servicemix.examples/akka-camel/${version}</bundle>
+    </feature>
+
+</features>

Modified: servicemix/smx5/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/src/main/filtered-resources/features.xml?rev=1574744&r1=1574743&r2=1574744&view=diff
==============================================================================
--- servicemix/smx5/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx5/trunk/assembly/src/main/filtered-resources/features.xml Thu Mar  6 02:06:17
2014
@@ -15,11 +15,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<features name="servicemix-${version}">
-    <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</repository>
-    <repository>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</repository>
-    <repository>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</repository>
-    <repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
+<features name="servicemix-features-${version}">
 
     <feature name="connector" version="${version}" resolver="(obr)" start-level='50'>
         <feature version="${aries.transaction.version}">transaction</feature>
@@ -33,139 +29,6 @@
         <bundle dependency="true">mvn:org.springframework/org.springframework.aop/${spring.version}</bundle>
     </feature>
 
-    <!--
-      -
-      -  Examples
-      -
-    -->
-    <feature name="examples-activemq-camel-blueprint" version="${version}" resolver="(obr)">
-        <feature version="${activemq.version}">activemq-broker-noweb</feature>
-        <feature version="${camel.version}">camel-jms</feature>
-        <feature version="${camel.version}">camel-blueprint</feature>
-        <bundle>mvn:org.apache.servicemix.examples/activemq-camel-blueprint/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-osgi" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-osgi/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-jaxrs" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
-	<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-jaxrs-blueprint" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <feature version="${version}">swagger</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
-	<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs-blueprint/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-jaxws-blueprint" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
-	<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-jaxws-blueprint/${version}</bundle>
-    </feature>
-    <feature name="examples-camel-sql-derby" version="${version}" resolver="(obr)">
-        <feature version="${camel.version}">camel-sql</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.derby/${derby.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-derby/${version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/camel-sql-orders/${version}</bundle>
-    </feature>
-    <feature name="examples-camel-sql-pgsql" version="${version}" resolver="(obr)">
-        <feature version="${camel.version}">camel-sql</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp.bundle.version}</bundle>
-        <bundle dependency="true">wrap:mvn:postgresql/postgresql/${postgresql.version}.jdbc4</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-pgsql/${version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/camel-sql-orders/${version}</bundle>
-    </feature>
-    <feature name="examples-camel-sql-h2" version="${version}" resolver="(obr)">
-        <feature version="${camel.version}">camel-sql</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.osgi/org.osgi.compendium/${osgi.version}</bundle>
-        <bundle dependency="true">mvn:com.h2database/h2/${h2.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-h2/${version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/camel-sql-orders/${version}</bundle>
-    </feature>
-    <feature name="examples-camel-osgi" version="${version}" resolver="(obr)">
-        <feature version="${camel.version}">camel</feature>
-        <bundle>mvn:org.apache.servicemix.examples/camel-osgi/${version}</bundle>
-    </feature>
-    <feature name="examples-camel-blueprint" version="${version}" resolver="(obr)">
-        <feature version="${camel.version}">camel-blueprint</feature>
-        <bundle>mvn:org.apache.servicemix.examples/camel-blueprint/${version}</bundle>
-    </feature>
-    <feature name="examples-camel-drools" version="${version}" resolver="(obr)">
-        <feature version="${camel.version}">camel-jms</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/camel-drools/${version}</bundle>
-    </feature>
-    <feature name="examples-camel-drools-blueprint" version="${version}" resolver="(obr)">
-        <feature version="${camel.version}">camel-jms</feature>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/camel-drools-blueprint/${version}</bundle>
-    </feature>
-    <feature name="examples-camel-cxf-rest" version="${version}" resolver="(obr)">
-        <bundle>mvn:org.apache.servicemix.examples/camel-cxf-rest-service/${version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/camel-cxf-rest-route/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-ws-addressing" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
-        <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-addressing/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-ws-security-osgi" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-osgi/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-ws-security-blueprint" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-blueprint/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-ws-security-signature" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
-        <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-signature/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-ws-rm" version="${version}" resolver="(obr)">
-        <feature version="${cxf.version}">cxf</feature>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-ws-rm/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-wsn-receive" version="${version}" resolver="(obr)">
-        <feature version="${camel.version}">camel-jetty</feature>
-        <feature version="${camel.version}">camel-jms</feature>
-        <feature version="${camel.version}">camel-jaxb</feature>
-        <feature version="${cxf.version}">cxf-wsn</feature>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-wsn-base/${version}</bundle>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-wsn-receive/${version}</bundle>
-    </feature>
-    <feature name="examples-cxf-wsn-notifier" version="${version}" resolver="(obr)">
-        <feature version="${version}">examples-cxf-wsn-receive</feature>
-        <bundle>mvn:org.apache.servicemix.examples/cxf-wsn-notifier/${version}</bundle>
-    </feature>
-
-    <feature name="examples-activiti-camel" version="${version}" resolver="(obr)">
-	      <feature version="${camel.version}">camel-core</feature>
-        <feature version="${activiti.version}">activiti</feature>
-        <bundle>mvn:org.apache.servicemix.examples/activiti-camel/${version}</bundle>
-    </feature>
-
-    <feature name="examples-akka-camel" version="${version}" resolver="(obr)">
-        <feature version="${akka.version}">akka</feature>
-        <feature version="${camel.version}">camel-scala</feature>
-        <bundle>mvn:org.apache.servicemix.examples/akka-camel/${version}</bundle>
-    </feature>
-
     <feature name="jms-appender" version="${version}" resolver="(obr)" start-level="50">
         <feature version="${activemq.version}">activemq-broker-noweb</feature>
         <bundle>mvn:org.apache.servicemix.logging/jms-appender/${version}</bundle>
@@ -200,10 +63,6 @@
         <bundle>mvn:com.typesafe.akka/akka-camel_2.10/${akka.version}</bundle>
     </feature>
 
-    <!-- workaround before SM-2179 get addressed on CXF side-->
-    <feature name="jaxrs-api">
-        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-m10/${servicemix.specs.version}</bundle>
-    </feature>
     <feature name="swagger" version="${version}" resolver="(obr)">
         <bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist.bundle.version}</bundle>

Added: servicemix/smx5/trunk/assembly/src/main/filtered-resources/internal.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/src/main/filtered-resources/internal.xml?rev=1574744&view=auto
==============================================================================
--- servicemix/smx5/trunk/assembly/src/main/filtered-resources/internal.xml (added)
+++ servicemix/smx5/trunk/assembly/src/main/filtered-resources/internal.xml Thu Mar  6 02:06:17
2014
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<features name="servicemix-internal-${version}">
+    <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</repository>
+    <repository>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</repository>
+    <repository>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</repository>
+    <repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
+
+    <!-- workaround before SM-2179 get addressed on CXF side-->
+    <feature name="jaxrs-api">
+        <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-m10/${servicemix.specs.version}</bundle>
+    </feature>
+
+</features>



Mime
View raw message