camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1445483 - in /camel/trunk: apache-camel/ components/camel-jms/ components/camel-mqtt/ components/camel-sjms/ examples/camel-example-activemq-tomcat/ examples/camel-example-cxf/ examples/camel-example-cxf/src/main/resources/META-INF/spring/...
Date Wed, 13 Feb 2013 06:58:38 GMT
Author: davsclaus
Date: Wed Feb 13 06:58:37 2013
New Revision: 1445483

URL: http://svn.apache.org/r1445483
Log:
CAMEL-6074: Upgrade to ActiveMQ 5.8.0

Modified:
    camel/trunk/apache-camel/pom.xml
    camel/trunk/components/camel-jms/pom.xml
    camel/trunk/components/camel-mqtt/pom.xml
    camel/trunk/components/camel-sjms/pom.xml
    camel/trunk/examples/camel-example-activemq-tomcat/pom.xml
    camel/trunk/examples/camel-example-cxf/pom.xml
    camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/HttpToJmsCamelContext.xml
    camel/trunk/examples/camel-example-guice-jms/pom.xml
    camel/trunk/examples/camel-example-jms-file/pom.xml
    camel/trunk/examples/camel-example-loan-broker/pom.xml
    camel/trunk/examples/camel-example-pojo-messaging/pom.xml
    camel/trunk/examples/camel-example-spring-javaconfig/pom.xml
    camel/trunk/examples/camel-example-spring-xquery/pom.xml
    camel/trunk/examples/camel-example-spring/pom.xml
    camel/trunk/parent/pom.xml
    camel/trunk/tests/camel-itest/pom.xml
    camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml

Modified: camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Wed Feb 13 06:58:37 2013
@@ -674,7 +674,12 @@
 
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-broker</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-client</artifactId>
       <optional>true</optional>
     </dependency>
 

Modified: camel/trunk/components/camel-jms/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/pom.xml (original)
+++ camel/trunk/components/camel-jms/pom.xml Wed Feb 13 06:58:37 2013
@@ -73,22 +73,29 @@
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
+            <artifactId>activemq-broker</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-spring</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-kahadb-store</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-jaas</artifactId>
+            <version>${activemq-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-client</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.fusesource.fuse-extra</groupId>
-                    <artifactId>fusemq-leveldb</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.fusesource.mqtt-client</groupId>
-                    <artifactId>mqtt-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>

Modified: camel/trunk/components/camel-mqtt/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mqtt/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/components/camel-mqtt/pom.xml (original)
+++ camel/trunk/components/camel-mqtt/pom.xml Wed Feb 13 06:58:37 2013
@@ -53,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
+            <artifactId>activemq-broker</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: camel/trunk/components/camel-sjms/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/pom.xml (original)
+++ camel/trunk/components/camel-sjms/pom.xml Wed Feb 13 06:58:37 2013
@@ -77,18 +77,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-broker</artifactId>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-context</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.fusesource.mqtt-client</groupId>
-          <artifactId>mqtt-client</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>

Modified: camel/trunk/examples/camel-example-activemq-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-activemq-tomcat/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-activemq-tomcat/pom.xml (original)
+++ camel/trunk/examples/camel-example-activemq-tomcat/pom.xml Wed Feb 13 06:58:37 2013
@@ -93,22 +93,21 @@
 		<!-- embed ActiveMQ broker -->
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-core</artifactId>
-			<!-- exclude stuff we dont need (not needed with AMQ 5.7.0) -->
-			<exclusions>
-				<exclusion>
-					<groupId>org.fusesource.fuse-extra</groupId>
-					<artifactId>fusemq-leveldb</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.fusesource.mqtt-client</groupId>
-					<artifactId>mqtt-client</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.osgi</groupId>
-					<artifactId>org.osgi.core</artifactId>
-				</exclusion>
-			</exclusions>
+			<artifactId>activemq-broker</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-spring</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-kahadb-store</artifactId>
+		</dependency>
+
+        <!-- ActiveMQ client -->
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.activemq</groupId>

Modified: camel/trunk/examples/camel-example-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf/pom.xml Wed Feb 13 06:58:37 2013
@@ -95,7 +95,15 @@
 
         <dependency>
             <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
+            <artifactId>activemq-broker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-spring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-kahadb-store</artifactId>
         </dependency>
 
         <dependency>

Modified: camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/HttpToJmsCamelContext.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/HttpToJmsCamelContext.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/HttpToJmsCamelContext.xml
(original)
+++ camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/HttpToJmsCamelContext.xml
Wed Feb 13 06:58:37 2013
@@ -24,7 +24,7 @@
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-       http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.5.0.xsd
+       http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
   <!-- Enable bridge between Camel Property Placeholder and Spring Property placeholder
so we can use system properties

Modified: camel/trunk/examples/camel-example-guice-jms/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-guice-jms/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-guice-jms/pom.xml (original)
+++ camel/trunk/examples/camel-example-guice-jms/pom.xml Wed Feb 13 06:58:37 2013
@@ -55,7 +55,11 @@
 
         <dependency>
             <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
+            <artifactId>activemq-broker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-client</artifactId>
         </dependency>
 
         <!-- osgi -->

Modified: camel/trunk/examples/camel-example-jms-file/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-jms-file/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-jms-file/pom.xml (original)
+++ camel/trunk/examples/camel-example-jms-file/pom.xml Wed Feb 13 06:58:37 2013
@@ -44,17 +44,15 @@
     <!-- ActiveMQ dependencies -->
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-core</artifactId>
+			<artifactId>activemq-broker</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>activemq-camel</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.camel</groupId>
-					<artifactId>camel-web</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.xbean</groupId>

Modified: camel/trunk/examples/camel-example-loan-broker/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loan-broker/pom.xml (original)
+++ camel/trunk/examples/camel-example-loan-broker/pom.xml Wed Feb 13 06:58:37 2013
@@ -65,7 +65,19 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-core</artifactId>
+			<artifactId>activemq-broker</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-spring</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-kahadb-store</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-client</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.activemq</groupId>

Modified: camel/trunk/examples/camel-example-pojo-messaging/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-pojo-messaging/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-pojo-messaging/pom.xml (original)
+++ camel/trunk/examples/camel-example-pojo-messaging/pom.xml Wed Feb 13 06:58:37 2013
@@ -37,7 +37,11 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-core</artifactId>
+			<artifactId>activemq-broker</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-client</artifactId>
 		</dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>

Modified: camel/trunk/examples/camel-example-spring-javaconfig/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-javaconfig/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-javaconfig/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-javaconfig/pom.xml Wed Feb 13 06:58:37 2013
@@ -63,7 +63,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-broker</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-client</artifactId>
     </dependency>
 
     <!-- osgi -->

Modified: camel/trunk/examples/camel-example-spring-xquery/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-xquery/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-xquery/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-xquery/pom.xml Wed Feb 13 06:58:37 2013
@@ -54,7 +54,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-broker</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-client</artifactId>
     </dependency>
 
     <!-- logging -->

Modified: camel/trunk/examples/camel-example-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring/pom.xml Wed Feb 13 06:58:37 2013
@@ -47,7 +47,11 @@
 
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-core</artifactId>
+			<artifactId>activemq-broker</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-client</artifactId>
 		</dependency>
 
         <!-- logging -->

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Feb 13 06:58:37 2013
@@ -37,7 +37,7 @@
     <!-- dependency versions -->
     <abdera-version>1.1.3</abdera-version>
     <!-- Note that activemq dependency is only used for testing! -->
-    <activemq-version>5.7.0</activemq-version>
+    <activemq-version>5.8.0</activemq-version>
     <ahc-version>1.7.9</ahc-version>
     <ant-bundle-version>1.7.0_6</ant-bundle-version>
     <antlr-bundle-version>3.4_1</antlr-bundle-version>
@@ -1385,7 +1385,22 @@
       <!-- optional dependencies for JMS -->
       <dependency>
         <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-core</artifactId>
+        <artifactId>activemq-broker</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-kahadb-store</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-client</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-spring</artifactId>
         <version>${activemq-version}</version>
       </dependency>
       <dependency>

Modified: camel/trunk/tests/camel-itest/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/pom.xml (original)
+++ camel/trunk/tests/camel-itest/pom.xml Wed Feb 13 06:58:37 2013
@@ -256,7 +256,17 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-broker</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-kahadb-store</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-client</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml?rev=1445483&r1=1445482&r2=1445483&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
Wed Feb 13 06:58:37 2013
@@ -48,9 +48,11 @@
       <artifactId>camel-spring</artifactId>
       <version>${camel-version}</version>
     </dependency>
+
+    <!-- the ActiveMQ client with connection pooling -->
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-client</artifactId>
       <version>${activemq-version}</version>
     </dependency>
     <dependency>
@@ -59,6 +61,28 @@
       <version>${activemq-version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-pool</artifactId>
+      <version>${activemq-version}</version>
+    </dependency>
+
+    <!-- the ActiveMQ broker is optional and can be removed if connecting to a remote
broker only -->
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-broker</artifactId>
+      <version>${activemq-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-spring</artifactId>
+      <version>${activemq-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-kahadb-store</artifactId>
+      <version>${activemq-version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
       <version>${xbean-spring-version}</version>



Mime
View raw message