You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ch...@apache.org on 2007/09/07 17:43:50 UTC
svn commit: r573614 - in /activemq/camel/trunk: ./ apache-camel/ components/
components/camel-activemq/ components/camel-jms/
examples/camel-example-spring/
examples/camel-example-spring/src/main/java/org/apache/camel/example/spring/
examples/camel-exa...
Author: chirino
Date: Fri Sep 7 08:43:48 2007
New Revision: 573614
URL: http://svn.apache.org/viewvc?rev=573614&view=rev
Log:
Moved the camel-activemq module into the activemq-core module to break the circular dependency between the activemq and camel projects.
Removed:
activemq/camel/trunk/components/camel-activemq/
Modified:
activemq/camel/trunk/apache-camel/pom.xml
activemq/camel/trunk/components/camel-jms/pom.xml
activemq/camel/trunk/components/pom.xml
activemq/camel/trunk/examples/camel-example-spring/pom.xml
activemq/camel/trunk/examples/camel-example-spring/src/main/java/org/apache/camel/example/spring/MyRouteBuilder.java
activemq/camel/trunk/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml
activemq/camel/trunk/pom.xml
activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java
activemq/camel/trunk/tests/camel-partial-classpath-test/pom.xml
Modified: activemq/camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/pom.xml?rev=573614&r1=573613&r2=573614&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/pom.xml (original)
+++ activemq/camel/trunk/apache-camel/pom.xml Fri Sep 7 08:43:48 2007
@@ -33,11 +33,6 @@
<description>Apache Camel Assembly</description>
<dependencies>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-activemq</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-atom</artifactId>
@@ -206,7 +201,7 @@
<goal>createbundle</goal>
</goals>
<configuration>
- <includes>camel-activemq,camel-bam,camel-core,camel-cxf,camel-ftp,camel-juel,
+ <includes>camel-bam,camel-core,camel-cxf,camel-ftp,camel-juel,
camel-http,camel-irc,camel-jaxb,camel-jdbc,camel-jing,camel-jms,camel-josql,
camel-jpa,camel-mail,camel-mina,camel-msv,camel-ognl,camel-quartz,camel-rmi,
camel-saxon,camel-script,camel-spring,camel-xmpp,commons-logging</includes>
Modified: activemq/camel/trunk/components/camel-jms/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/pom.xml?rev=573614&r1=573613&r2=573614&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jms/pom.xml Fri Sep 7 08:43:48 2007
@@ -60,20 +60,10 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
+ <artifactId>apache-activemq</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Modified: activemq/camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/pom.xml?rev=573614&r1=573613&r2=573614&view=diff
==============================================================================
--- activemq/camel/trunk/components/pom.xml (original)
+++ activemq/camel/trunk/components/pom.xml Fri Sep 7 08:43:48 2007
@@ -34,7 +34,6 @@
<packaging>pom</packaging>
<modules>
- <module>camel-activemq</module>
<module>camel-atom</module>
<module>camel-bam</module>
<module>camel-cxf</module>
Modified: activemq/camel/trunk/examples/camel-example-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring/pom.xml?rev=573614&r1=573613&r2=573614&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-spring/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-spring/pom.xml Fri Sep 7 08:43:48 2007
@@ -37,10 +37,15 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-activemq</artifactId>
+ <artifactId>camel-jms</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apache-activemq</artifactId>
</dependency>
<!-- for testing -->
Modified: activemq/camel/trunk/examples/camel-example-spring/src/main/java/org/apache/camel/example/spring/MyRouteBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring/src/main/java/org/apache/camel/example/spring/MyRouteBuilder.java?rev=573614&r1=573613&r2=573614&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-spring/src/main/java/org/apache/camel/example/spring/MyRouteBuilder.java (original)
+++ activemq/camel/trunk/examples/camel-example-spring/src/main/java/org/apache/camel/example/spring/MyRouteBuilder.java Fri Sep 7 08:43:48 2007
@@ -42,7 +42,7 @@
from("file:src/data?noop=true").
to("activemq:test.MyQueue");
- from("activemq:test.MyQueue").
+ from("jms:test.MyQueue").
to("file://target/test?noop=true");
// set up a listener on the file component
Modified: activemq/camel/trunk/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml?rev=573614&r1=573613&r2=573614&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml (original)
+++ activemq/camel/trunk/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml Fri Sep 7 08:43:48 2007
@@ -34,7 +34,11 @@
</camelContext>
<!-- lets configure the default ActiveMQ broker URL -->
- <bean id="activemq" class="org.apache.camel.component.activemq.ActiveMQComponent">
- <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
+ <bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
+ <property name="connectionFactory">
+ <bean class="org.apache.activemq.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
+ </bean>
+ </property>
</bean>
</beans>
Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=573614&r1=573613&r2=573614&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Fri Sep 7 08:43:48 2007
@@ -185,11 +185,6 @@
<!-- Camel jars -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-activemq</artifactId>
- <version>${camel-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-atom</artifactId>
<version>${camel-version}</version>
</dependency>
@@ -419,22 +414,11 @@
<version>1.2.12</version>
</dependency>
-
<!-- optional dependencies for JMS -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apache-activemq</artifactId>
- <version>5.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-web</artifactId>
- <version>5.0-SNAPSHOT</version>
+ <version>4.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
Modified: activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java?rev=573614&r1=573613&r2=573614&view=diff
==============================================================================
--- activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java (original)
+++ activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java Fri Sep 7 08:43:48 2007
@@ -21,8 +21,9 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jms.JmsComponent;
+
import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
-import org.apache.camel.component.activemq.ActiveMQComponent;
import org.apache.camel.util.jndi.JndiContext;
import javax.jms.ConnectionFactory;
@@ -60,7 +61,8 @@
answer.bind("myBean", myBean);
// add ActiveMQ with embedded broker
- answer.bind("jms", ActiveMQComponent.activeMQComponent("vm://localhost?broker.persistent=false"));
+ ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
+ answer.bind("jms", JmsComponent.jmsComponentAutoAcknowledge(connectionFactory));
return answer;
}
Modified: activemq/camel/trunk/tests/camel-partial-classpath-test/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-partial-classpath-test/pom.xml?rev=573614&r1=573613&r2=573614&view=diff
==============================================================================
--- activemq/camel/trunk/tests/camel-partial-classpath-test/pom.xml (original)
+++ activemq/camel/trunk/tests/camel-partial-classpath-test/pom.xml Fri Sep 7 08:43:48 2007
@@ -39,20 +39,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-activemq</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-all</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-jms</artifactId>
<exclusions>
<exclusion>