From cd19db289b8607c5ce4b954143de328459176f9d Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Wed, 7 Nov 2012 20:41:40 +0000
Subject: [PATCH] Moving spring support classes into the activemq-spring
 module.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406795 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-camel/pom.xml                             | 14 ++++++--------
 .../apache/activemq/leveldb/ActiveMQScenario.scala |  2 +-
 activemq-spring/pom.xml                            |  1 +
 .../activemq/spring/ActiveMQConnectionFactory.java |  0
 .../ActiveMQConnectionFactoryFactoryBean.java      |  0
 .../spring/ActiveMQXAConnectionFactory.java        |  0
 .../java/org/apache/activemq/spring/package.html   |  0
 7 files changed, 8 insertions(+), 9 deletions(-)
 rename {activemq-client => activemq-spring}/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java (100%)
 rename {activemq-client => activemq-spring}/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java (100%)
 rename {activemq-client => activemq-spring}/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java (100%)
 rename {activemq-client => activemq-spring}/src/main/java/org/apache/activemq/spring/package.html (100%)

diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index 5f6c8d2eb4..54e53d170a 100755
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -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>
@@ -160,12 +164,6 @@
       <optional>true</optional>
       <scope>test</scope>
     </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>
diff --git a/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala b/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala
index 6227bc9a3d..d5df3f3a89 100644
--- a/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala
+++ b/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala
@@ -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}
 
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 9bbad109ca..35f28cbbfa 100755
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -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
diff --git a/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java b/activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java
similarity index 100%
rename from activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java
rename to activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java
diff --git a/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java b/activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java
similarity index 100%
rename from activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java
rename to activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java
diff --git a/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java b/activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java
similarity index 100%
rename from activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java
rename to activemq-spring/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java
diff --git a/activemq-client/src/main/java/org/apache/activemq/spring/package.html b/activemq-spring/src/main/java/org/apache/activemq/spring/package.html
similarity index 100%
rename from activemq-client/src/main/java/org/apache/activemq/spring/package.html
rename to activemq-spring/src/main/java/org/apache/activemq/spring/package.html