You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/11/07 21:41:41 UTC
svn commit: r1406795 - in /activemq/trunk: activemq-camel/ activemq-client/src/main/java/org/apache/activemq/spring/ activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ activemq-spring/ activemq-spring/src/main/java/org/apache/activemq/s...

Author: chirino
Date: Wed Nov  7 20:41:40 2012
New Revision: 1406795

URL: http://svn.apache.org/viewvc?rev=1406795&view=rev
Log:
Moving spring support classes into the activemq-spring module.

Added:
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java
      - copied, changed from r1406770, activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java
      - copied, changed from r1406770, activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java
      - copied, changed from r1406770, activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/package.html
      - copied, changed from r1406770, activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/package.html
Removed:
    activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java
    activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java
    activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java
    activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/package.html
Modified:
    activemq/trunk/activemq-camel/pom.xml
    activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala
    activemq/trunk/activemq-spring/pom.xml

Modified: activemq/trunk/activemq-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/pom.xml?rev=1406795&r1=1406794&r2=1406795&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/pom.xml (original)
+++ activemq/trunk/activemq-camel/pom.xml Wed Nov  7 20:41:40 2012
@@ -69,7 +69,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-spring</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-amq-store</artifactId>
     </dependency>
 
     <!-- to use AMQ with Camel efficient we would need to use pooling -->
@@ -101,7 +105,7 @@
       <artifactId>camel-test</artifactId>
       <scope>test</scope>
     </dependency>
-		<dependency>
+    <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test-spring</artifactId>
       <scope>test</scope>
@@ -162,12 +166,6 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-spring</artifactId>
-      <optional>true</optional>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-ra</artifactId>
       <optional>true</optional>
       <scope>test</scope>

Modified: activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala?rev=1406795&r1=1406794&r2=1406795&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala (original)
+++ activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala Wed Nov  7 20:41:40 2012
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.leveldb
 
-import org.apache.activemq.spring.ActiveMQConnectionFactory
+import org.apache.activemq.ActiveMQConnectionFactory
 import javax.jms.{Destination, ConnectionFactory}
 import org.apache.activemq.command.{ActiveMQTopic, ActiveMQQueue}
 

Modified: activemq/trunk/activemq-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/pom.xml?rev=1406795&r1=1406794&r2=1406795&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/pom.xml (original)
+++ activemq/trunk/activemq-spring/pom.xml Wed Nov  7 20:41:40 2012
@@ -38,6 +38,7 @@
       *
     </activemq.osgi.import.pkg>
     <activemq.osgi.export>
+      org.apache.activemq.spring*;version=${project.version};-noimport:=;-split-package:=merge-last,
       org.apache.activemq.pool*;version=${project.version};-noimport:=;-split-package:=merge-last,
       org.apache.activemq.xbean*;version=${project.version};-noimport:=true;-split-package:=merge-last,
       org.apache.activemq.hooks*;version=${project.version};-noimport:=;-split-package:=merge-last

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java (from r1406770, activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java&p1=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java&r1=1406770&r2=1406795&rev=1406795&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java (from r1406770, activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java&p1=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java&r1=1406770&r2=1406795&rev=1406795&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java (from r1406770, activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java&p1=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java&r1=1406770&r2=1406795&rev=1406795&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/package.html (from r1406770, activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/package.html)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/package.html?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/package.html&p1=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/package.html&r1=1406770&r2=1406795&rev=1406795&view=diff
==============================================================================
    (empty)