You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2013/03/25 12:15:17 UTC

svn commit: r1460616 - in /servicemix/smx5/trunk/assemblies: apache-servicemix-full/src/main/filtered-resources/etc/ apache-servicemix/src/main/filtered-resources/ apache-servicemix/src/main/filtered-resources/etc/

Author: ffang
Date: Mon Mar 25 11:15:17 2013
New Revision: 1460616

URL: http://svn.apache.org/r1460616
Log:
[SM-2179]can't install camel-cxf feature

Modified:
    servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
    servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
    servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml

Modified: servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1460616&r1=1460615&r2=1460616&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Mon Mar 25 11:15:17 2013
@@ -25,5 +25,5 @@ featuresRepositories=mvn:org.apache.kara
 #
 # Comma separated list of features to install at startup
 #
-featuresBoot=karaf-framework,config,activemq-broker,cxf-specs,camel,camel-cxf,camel-blueprint,war
+featuresBoot=karaf-framework,config,activemq-broker,jaxrs-api,camel,camel-cxf,camel-blueprint,war
 

Modified: servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1460616&r1=1460615&r2=1460616&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Mon Mar 25 11:15:17 2013
@@ -25,5 +25,5 @@ featuresRepositories=mvn:org.apache.kara
 #
 # Comma separated list of features to install at startup
 #
-featuresBoot=karaf-framework,config,activemq-broker,cxf-specs,camel,camel-cxf,camel-blueprint,war
+featuresBoot=karaf-framework,config,activemq-broker,jaxrs-api,camel,camel-cxf,camel-blueprint,war
 

Modified: servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?rev=1460616&r1=1460615&r2=1460616&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml Mon Mar 25 11:15:17 2013
@@ -202,4 +202,8 @@
         <bundle>mvn:org.apache.servicemix.akka/org.apache.servicemix.akka.akka-osgi-aries/${project.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>
 </features>