You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2013/02/22 21:30:47 UTC

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

Author: gertv
Date: Fri Feb 22 20:30:46 2013
New Revision: 1449202

URL: http://svn.apache.org/r1449202
Log:
SM-2174 / SM-2175: ActiveMQ 5.8.0 integration

Modified:
    servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
    servicemix/smx5/trunk/assemblies/apache-servicemix/pom.xml
    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=1449202&r1=1449201&r2=1449202&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 Fri Feb 22 20:30: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,cxf-specs,camel,camel-activemq,camel-cxf,camel-blueprint,war
+featuresBoot=karaf-framework,config,activemq-broker,cxf-specs,camel,camel-cxf,camel-blueprint,war
 

Modified: servicemix/smx5/trunk/assemblies/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix/pom.xml?rev=1449202&r1=1449201&r2=1449202&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix/pom.xml (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix/pom.xml Fri Feb 22 20:30:46 2013
@@ -122,7 +122,6 @@
                                 <feature>config</feature>
                                 <feature>activemq</feature>
                                 <feature>camel</feature>
-                                <feature>camel-activemq</feature>
                                 <feature>camel-cxf</feature>
                                 <feature>camel-blueprint</feature>
                                 <feature>war</feature>

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=1449202&r1=1449201&r2=1449202&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 Fri Feb 22 20:30: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,cxf-specs,camel,camel-activemq,camel-cxf,camel-blueprint,war
+featuresBoot=karaf-framework,config,activemq-broker,cxf-specs,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=1449202&r1=1449201&r2=1449202&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 Fri Feb 22 20:30:46 2013
@@ -34,19 +34,13 @@
         <bundle dependency="true">mvn:org.springframework/spring-aop/${spring.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>
-
     <!--
       -
       -  Examples
       -
     -->
     <feature name="examples-activemq-camel-blueprint" version="${version}" resolver="(obr)">
-        <feature version="${version}">camel-activemq</feature>
+        <feature version="${activemq.version}">activemq-broker</feature>
         <feature version="${camel.version}">camel-blueprint</feature>
         <bundle>mvn:org.apache.servicemix.examples/activemq-camel-blueprint/${version}</bundle>
     </feature>
@@ -128,6 +122,18 @@
         <feature version="${activemq.version}">activemq-broker</feature>
     </feature>
 
+    <!-- Override activemq-client feature as a workaround to https://issues.apache.org/jira/browse/AMQ-4341 -->
+    <feature name="activemq-client" version="${activemq.version}" resolver="(obr)" start-level="50">
+      <bundle>mvn:org.apache.activemq/activemq-osgi/${activemq.version}</bundle>
+      <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
+      <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-annotation.version}</bundle>
+      <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
+      <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${geronimo-j2ee-management.version}</bundle>
+      <bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool.version}</bundle>
+      <feature version="[3,4)">spring</feature>
+      <bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
+    </feature>
+
     <!-- Override activemq-broker feature as a workaround to https://issues.apache.org/jira/browse/AMQ-4341 -->
     <feature name="activemq-broker" version="${activemq.version}" resolver="(obr)" start-level="50">
         <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${geronimo-j2ee-management.version}</bundle>
@@ -154,16 +160,10 @@
         <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version}</bundle>
         <bundle>mvn:org.apache.activemq/activemq-karaf/${activemq.version}</bundle>
         <bundle dependency="true">mvn:org.scala-lang/scala-library/${scala.version}</bundle>
-        <feature version="${activemq.version}">activemq-http</feature>
         <configfile finalname="/etc/activemq.xml">mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/activemq</configfile>
         <configfile finalname="/etc/org.apache.activemq.server-default.cfg">mvn:org.apache.activemq/activemq-karaf/${activemq.version}/cfg/activemq</configfile>
     </feature>
 
-    <!-- Overriding the activemq-http feature, the original one is broker -->
-    <feature name="activemq-http" version="${activemq.version}">
-
-    </feature>
-
     <feature name="jms-appender" version="${version}" resolver="(obr)" start-level="50">
         <feature version="${version}">activemq-broker</feature>
         <bundle>mvn:org.apache.servicemix.logging/jms-appender/${version}</bundle>