servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1454293 - in /servicemix/smx4/features/trunk/assemblies: apache-servicemix-full/src/main/filtered-resources/etc/ apache-servicemix-jbi/ apache-servicemix-jbi/src/main/filtered-resources/etc/ apache-servicemix/ apache-servicemix/src/main/fi...
Date Fri, 08 Mar 2013 08:57:46 GMT
Author: gertv
Date: Fri Mar  8 08:57:46 2013
New Revision: 1454293

URL: http://svn.apache.org/r1454293
Log:
SMX4-1286: Replace camel-activemq with activemq-camel

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

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1454293&r1=1454292&r2=1454293&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
(original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
Fri Mar  8 08:57:46 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,activemq-spring,saaj,cxf-specs,camel,camel-activemq,camel-cxf,camel-blueprint,war
+featuresBoot=karaf-framework,config,activemq-broker,activemq-spring,saaj,cxf-specs,camel,activemq-camel,camel-cxf,camel-blueprint,war
 

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/pom.xml?rev=1454293&r1=1454292&r2=1454293&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/pom.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/pom.xml Fri Mar  8 08:57:46
2013
@@ -64,7 +64,7 @@
                                 <feature>activemq-spring</feature>
                                 <feature>activemq-broker</feature>
                                 <feature>camel</feature>
-                                <feature>camel-activemq</feature>
+                                <feature>activemq-camel</feature>
                                 <feature>camel-nmr</feature>
                                 <feature>camel-cxf</feature>
                                 <feature>camel-blueprint</feature>

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1454293&r1=1454292&r2=1454293&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
(original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
Fri Mar  8 08:57:46 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,activemq-spring,saaj,cxf-specs,camel,camel-activemq,camel-nmr,camel-cxf,camel-blueprint,jbi-cluster,war,servicemix-cxf-bc,servicemix-file,servicemix-ftp,servicemix-http,servicemix-jms,servicemix-mail,servicemix-smpp,servicemix-snmp,servicemix-vfs,servicemix-bean,servicemix-camel,servicemix-cxf-se,servicemix-drools,servicemix-eip,servicemix-osworkflow,servicemix-quartz,servicemix-scripting,servicemix-validation,servicemix-saxon,servicemix-wsn2005,servicemix-exec
+featuresBoot=karaf-framework,config,activemq-broker,activemq-spring,saaj,cxf-specs,camel,activemq-camel,camel-nmr,camel-cxf,camel-blueprint,jbi-cluster,war,servicemix-cxf-bc,servicemix-file,servicemix-ftp,servicemix-http,servicemix-jms,servicemix-mail,servicemix-smpp,servicemix-snmp,servicemix-vfs,servicemix-bean,servicemix-camel,servicemix-cxf-se,servicemix-drools,servicemix-eip,servicemix-osworkflow,servicemix-quartz,servicemix-scripting,servicemix-validation,servicemix-saxon,servicemix-wsn2005,servicemix-exec
 

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml?rev=1454293&r1=1454292&r2=1454293&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/pom.xml Fri Mar  8 08:57:46
2013
@@ -126,7 +126,7 @@
                                 <feature>activemq-spring</feature>
                                 <feature>activemq-broker</feature>
                                 <feature>camel</feature>
-                                <feature>camel-activemq</feature>
+                                <feature>activemq-camel</feature>
                                 <feature>camel-cxf</feature>
                                 <feature>camel-blueprint</feature>
                                 <feature>war</feature>

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1454293&r1=1454292&r2=1454293&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
(original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
Fri Mar  8 08:57:46 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,activemq-spring,saaj,cxf-specs,camel,camel-activemq,camel-cxf,camel-blueprint,war
+featuresBoot=karaf-framework,config,activemq-broker,activemq-spring,saaj,cxf-specs,camel,activemq-camel,camel-cxf,camel-blueprint,war
 

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?rev=1454293&r1=1454292&r2=1454293&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
(original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
Fri Mar  8 08:57:46 2013
@@ -49,11 +49,6 @@
         <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
         <bundle>mvn:org.apache.servicemix.camel/org.apache.servicemix.camel.component/${version}</bundle>
     </feature>
-    <feature name="camel-activemq" version="${version}" resolver="(obr)" start-level='50'>
-        <feature version="${activemq.version}">activemq</feature>
-        <feature version="${camel.version}">camel-jms</feature>
-        <bundle>mvn:org.apache.activemq/activemq-camel/${activemq.version}</bundle>
-    </feature>
 
     <!--
       -
@@ -61,7 +56,7 @@
       -
     -->
     <feature name="examples-activemq-camel-blueprint" version="${version}" resolver="(obr)">
-        <feature version="${version}">camel-activemq</feature>
+        <feature version="${version}">activemq-camel</feature>
         <feature version="${camel.version}">camel-blueprint</feature>
         <bundle>mvn:org.apache.servicemix.examples/activemq-camel-blueprint/${version}</bundle>
     </feature>



Mime
View raw message