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 16:08:44 UTC

svn commit: r1449071 - in /servicemix/smx5/trunk: ./ assemblies/apache-servicemix-full/src/main/filtered-resources/etc/ assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/ assemblies/apache-servicemix/src/main/filtered-resources/ asse...

Author: gertv
Date: Fri Feb 22 15:08:43 2013
New Revision: 1449071

URL: http://svn.apache.org/r1449071
Log:
SM-2174: Upgrade to ActiveMQ 5.8.0

Removed:
    servicemix/smx5/trunk/assemblies/shared/src/main/filtered-resources/etc/
    servicemix/smx5/trunk/assemblies/shared/src/main/resources/etc/activemq-broker.xml
Modified:
    servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
    servicemix/smx5/trunk/assemblies/apache-servicemix-minimal/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
    servicemix/smx5/trunk/assemblies/shared/src/main/resources/common-bin.xml
    servicemix/smx5/trunk/itests/tests/pom.xml
    servicemix/smx5/trunk/logging/jms-appender/pom.xml
    servicemix/smx5/trunk/parent/pom.xml
    servicemix/smx5/trunk/pom.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=1449071&r1=1449070&r2=1449071&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 15:08:43 2013
@@ -20,10 +20,10 @@
 #
 # 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.nmr/apache-servicemix-nmr/${servicemix.nmr.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/features,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
 #
-featuresBoot=karaf-framework,config,activemq-broker,activemq-spring,cxf-specs,camel,camel-activemq,camel-cxf,camel-blueprint,war
+featuresBoot=karaf-framework,config,activemq-broker,cxf-specs,camel,camel-activemq,camel-cxf,camel-blueprint,war
 

Modified: servicemix/smx5/trunk/assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1449071&r1=1449070&r2=1449071&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix-minimal/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Fri Feb 22 15:08:43 2013
@@ -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.nmr/apache-servicemix-nmr/${servicemix.nmr.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/features,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

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=1449071&r1=1449070&r2=1449071&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 15:08:43 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,cxf-specs,camel,camel-activemq,camel-cxf,camel-blueprint,war
+featuresBoot=karaf-framework,config,activemq-broker,cxf-specs,camel,camel-activemq,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=1449071&r1=1449070&r2=1449071&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 15:08:43 2013
@@ -128,6 +128,42 @@
         <feature version="${activemq.version}">activemq-broker</feature>
     </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>
+        <bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
+        <feature version="${activemq.version}">activemq-client</feature>
+        <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
+        <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
+        <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3.bundle.version}</bundle>
+        <bundle dependency="true">mvn:joda-time/joda-time/${joda-time.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/${aries.version}</bundle>
+
+        <!-- the following 4 bundles is needed by activemq-console -->
+        <bundle dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf.version}</bundle>
+        <bundle dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf-proto/${hawtbuf.version}</bundle>
+        <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle>
+        <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>

Modified: servicemix/smx5/trunk/assemblies/shared/src/main/resources/common-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/shared/src/main/resources/common-bin.xml?rev=1449071&r1=1449070&r2=1449071&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/shared/src/main/resources/common-bin.xml (original)
+++ servicemix/smx5/trunk/assemblies/shared/src/main/resources/common-bin.xml Fri Feb 22 15:08:43 2013
@@ -29,7 +29,7 @@
             <outputFileNameMapping>servicemix-version.jar</outputFileNameMapping>
             <fileMode>0644</fileMode>
             <includes>
-                <include>org.apache.servicemix.features:org.apache.servicemix.features.branding</include>
+                <include>org.apache.servicemix:org.apache.servicemix.branding</include>
             </includes>
             <useTransitiveDependencies>false</useTransitiveDependencies>
         </dependencySet>

Modified: servicemix/smx5/trunk/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/itests/tests/pom.xml?rev=1449071&r1=1449070&r2=1449071&view=diff
==============================================================================
--- servicemix/smx5/trunk/itests/tests/pom.xml (original)
+++ servicemix/smx5/trunk/itests/tests/pom.xml Fri Feb 22 15:08:43 2013
@@ -245,8 +245,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>${activemq.version}</version>
+            <artifactId>activemq-broker</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
@@ -265,7 +264,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
-            <artifactId>kahadb</artifactId>
+            <artifactId>activemq-kahadb-store</artifactId>
             <version>${activemq.version}</version>
         </dependency>
         <dependency>

Modified: servicemix/smx5/trunk/logging/jms-appender/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/logging/jms-appender/pom.xml?rev=1449071&r1=1449070&r2=1449071&view=diff
==============================================================================
--- servicemix/smx5/trunk/logging/jms-appender/pom.xml (original)
+++ servicemix/smx5/trunk/logging/jms-appender/pom.xml Fri Feb 22 15:08:43 2013
@@ -44,8 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>${activemq.version}</version>
+            <artifactId>activemq-broker</artifactId>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>

Modified: servicemix/smx5/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/parent/pom.xml?rev=1449071&r1=1449070&r2=1449071&view=diff
==============================================================================
--- servicemix/smx5/trunk/parent/pom.xml (original)
+++ servicemix/smx5/trunk/parent/pom.xml Fri Feb 22 15:08:43 2013
@@ -37,7 +37,7 @@
 
   <!-- Properties -->
   <properties>
-    <activemq.version>5.8-SNAPSHOT</activemq.version>
+    <activemq.version>5.8.0</activemq.version>
     <activiti.version>5.10</activiti.version>
     <camel.version>2.11-SNAPSHOT</camel.version>
     <cxf.version>2.7.3</cxf.version>
@@ -89,6 +89,13 @@
         <version>${project.version}</version>
       </dependency>
 
+      <!-- Apache ActiveMQ -->
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-broker</artifactId>
+        <version>${activemq.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.activiti</groupId>
         <artifactId>activiti-camel</artifactId>

Modified: servicemix/smx5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/pom.xml?rev=1449071&r1=1449070&r2=1449071&view=diff
==============================================================================
--- servicemix/smx5/trunk/pom.xml (original)
+++ servicemix/smx5/trunk/pom.xml Fri Feb 22 15:08:43 2013
@@ -151,7 +151,6 @@
         <geronimo-ws-metadata.version>1.1.3</geronimo-ws-metadata.version>
 
         <!-- ServiceMix Bundles -->
-        <dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
         <abdera.bundle.version>0.4.0-incubating_4</abdera.bundle.version>
         <antlr.bundle.version>3.0.1_6</antlr.bundle.version>
         <antlr-runtime.bundle.version>3.0.1_2</antlr-runtime.bundle.version>
@@ -163,8 +162,10 @@
         <commons-net.bundle.version>2.2</commons-net.bundle.version>
         <commons-pool.version>1.6</commons-pool.version>
         <commons-vfs.bundle.version>1.0_5</commons-vfs.bundle.version>
+        <dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
         <drools.bundle.version>${drools.version}</drools.bundle.version>
         <fastinfoset.bundle.version>1.2.7_3</fastinfoset.bundle.version>
+        <jasypt.bundle.version>1.9.0_1</jasypt.bundle.version>
         <jaxb.api.version>2.2</jaxb.api.version>
         <jaxb-impl.bundle.version>2.2.1.1_1</jaxb-impl.bundle.version>
         <jdt-core.bundle.version>3.2.3_4</jdt-core.bundle.version>
@@ -183,13 +184,15 @@
         <saaj-impl.bundle.version>1.3.9_2</saaj-impl.bundle.version>
         <saxon.bundle.version>9.3.0.11_2</saxon.bundle.version>
         <snmp4j.bundle.version>1.8.1_4</snmp4j.bundle.version>
-        <velocity.bundle.version>1.7_1</velocity.bundle.version>
+        <velocity.bundle.version>1.7_5</velocity.bundle.version>
         <wsdl4j.bundle.version>1.6.2_3</wsdl4j.bundle.version>
         <xalan.bundle.version>2.7.1_3</xalan.bundle.version>
         <xerces.bundle.version>2.9.1_4</xerces.bundle.version>
         <xmlbeans.bundle.version>2.5.0_1</xmlbeans.bundle.version>
         <xmlresolver.bundle.version>1.2_3</xmlresolver.bundle.version>
         <xmlsec.bundle.version>1.5.1</xmlsec.bundle.version>
+        <xpp3.bundle.version>1.1.4c_5</xpp3.bundle.version>
+        <xstream.bundle.version>1.3_3</xstream.bundle.version>
 
         <!-- ServiceMix legal shared resources -->
         <servicemix.legal.version>1.0</servicemix.legal.version>
@@ -203,12 +206,16 @@
         <!-- Other Dependencies -->
         <axiom.version>1.2.12</axiom.version>
         <bouncycastle.version>140</bouncycastle.version>
+        <commons-codec.version>1.4</commons-codec.version>
+        <commons-collections.version>3.2.1</commons-collections.version>
         <commons-jexl.version>2.0.1</commons-jexl.version>
         <commons-lang.version>2.6</commons-lang.version>
         <commons-logging.version>1.1.1</commons-logging.version>
         <drools.version>5.5.0.Final</drools.version>
         <groovy.version>1.8.3</groovy.version>
+        <hawtbuf.version>1.9</hawtbuf.version>
         <h2.version>1.3.167</h2.version>
+        <jackson.version>1.9.2</jackson.version>
         <jaxp-ri.version>1.4.4</jaxp-ri.version>
         <xerces.version>2.11.0</xerces.version>
         <xml.api.version>2.11.0-20110622</xml.api.version>
@@ -216,15 +223,17 @@
         <jaxws-api.version>2.2</jaxws-api.version>
         <jetty.version>7.4.5.v20110725</jetty.version>
         <jettison.version>1.3</jettison.version>
+        <joda-time.version>1.6.2</joda-time.version>
         <lingo.version>1.3</lingo.version>
         <mybatis.version>3.1.1</mybatis.version>
+        <scala.version>2.10.0</scala.version>
         <scriptengines.version>1.1</scriptengines.version>
         <spring.version>3.0.7.RELEASE</spring.version>
         <spring.osgi.version>1.2.1</spring.osgi.version>
         <wss4j.version>1.6.7</wss4j.version>
         <neethi.version>3.0.0</neethi.version>
         <xfire.version>1.0.1</xfire.version>
-        <xbean.version>3.11.1</xbean.version>
+        <xbean.version>3.12</xbean.version>
         <xmlschema.version>2.0</xmlschema.version>
     </properties>