Author: jstrachan
Date: Tue May 22 05:02:28 2007
New Revision: 540547
URL: http://svn.apache.org/viewvc?view=rev&rev=540547
Log:
added an ActiveMQ component which is automatically pre-configured to work well
with Apache ActiveMQ. For more details see
http://cwiki.apache.org/CAMEL/activemq.html
Added:
activemq/camel/trunk/components/camel-activemq/
activemq/camel/trunk/components/camel-activemq/pom.xml (with props)
activemq/camel/trunk/components/camel-activemq/src/
activemq/camel/trunk/components/camel-activemq/src/main/
activemq/camel/trunk/components/camel-activemq/src/main/java/
activemq/camel/trunk/components/camel-activemq/src/main/java/org/
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
(with props)
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
(with props)
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/package.html
(with props)
activemq/camel/trunk/components/camel-activemq/src/main/resources/
activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/
activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/services/
activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/services/org/
activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/services/org/apache/
activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/services/org/apache/camel/
activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/services/org/apache/camel/component/
activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/services/org/apache/camel/component/activemq
activemq/camel/trunk/components/camel-activemq/src/test/
activemq/camel/trunk/components/camel-activemq/src/test/java/
activemq/camel/trunk/components/camel-activemq/src/test/java/org/
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQConfigureTest.java
(with props)
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQRouteTest.java
(with props)
activemq/camel/trunk/components/camel-activemq/src/test/resources/
activemq/camel/trunk/components/camel-activemq/src/test/resources/log4j.properties
(with props)
activemq/camel/trunk/components/camel-activemq/src/test/resources/org/
activemq/camel/trunk/components/camel-activemq/src/test/resources/org/apache/
activemq/camel/trunk/components/camel-activemq/src/test/resources/org/apache/camel/
activemq/camel/trunk/components/camel-activemq/src/test/resources/org/apache/camel/component/
activemq/camel/trunk/components/camel-activemq/src/test/resources/org/apache/camel/component/activemq/
Modified:
activemq/camel/trunk/apache-camel/pom.xml
activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
activemq/camel/trunk/components/camel-jms/pom.xml
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConsumer.java
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
activemq/camel/trunk/components/camel-jms/src/test/resources/log4j.properties
activemq/camel/trunk/components/pom.xml
activemq/camel/trunk/pom.xml
Modified: activemq/camel/trunk/apache-camel/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/pom.xml?view=diff&rev=540547&r1=540546&r2=540547
==============================================================================
--- activemq/camel/trunk/apache-camel/pom.xml (original)
+++ activemq/camel/trunk/apache-camel/pom.xml Tue May 22 05:02:28 2007
@@ -36,6 +36,10 @@
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-activemq</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-bam</artifactId>
</dependency>
<dependency>
@@ -188,7 +192,7 @@
<goal>createbundle</goal>
</goals>
<configuration>
-
<includes>camel-bam,camel-core,camel-cxf,camel-file,camel-http,camel-jaxb,camel-jbi,camel-jms,camel-josql,camel-jpa,camel-mail,camel-mina,camel-rmi,camel-saxon,camel-script,camel-spring,camel-xmpp,commons-logging</includes>
+
<includes>camel-activemq,camel-bam,camel-core,camel-cxf,camel-file,camel-http,camel-jaxb,camel-jbi,camel-jms,camel-josql,camel-jpa,camel-mail,camel-mina,camel-rmi,camel-saxon,camel-script,camel-spring,camel-xmpp,commons-logging</includes>
</configuration>
</execution>
</executions>
Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml?view=diff&rev=540547&r1=540546&r2=540547
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
(original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml Tue May
22 05:02:28 2007
@@ -49,6 +49,7 @@
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
+ <include>org.apache.camel:camel-activemq</include>
<include>org.apache.camel:camel-bam</include>
<include>org.apache.camel:camel-core</include>
<include>org.apache.camel:camel-cxf</include>
Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml?view=diff&rev=540547&r1=540546&r2=540547
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
(original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml Tue
May 22 05:02:28 2007
@@ -55,6 +55,7 @@
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
+ <include>org.apache.camel:camel-activemq</include>
<include>org.apache.camel:camel-bam</include>
<include>org.apache.camel:camel-core</include>
<include>org.apache.camel:camel-cxf</include>
Added: activemq/camel/trunk/components/camel-activemq/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-activemq/pom.xml?view=auto&rev=540547
==============================================================================
--- activemq/camel/trunk/components/camel-activemq/pom.xml (added)
+++ activemq/camel/trunk/components/camel-activemq/pom.xml Tue May 22 05:02:28
2007
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-activemq</artifactId>
+ <name>Camel :: ActiveMQ</name>
+ <description>Camel ActiveMQ support</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apache-activemq</artifactId>
+ </dependency>
+
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <excludes>
+ <!-- TODO - FIXME ASAP -->
+ <exclude>**/JmsRouteUsingSpringWithAutoWireTest.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
Propchange: activemq/camel/trunk/components/camel-activemq/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java?view=auto&rev=540547
==============================================================================
---
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
(added)
+++
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
Tue May 22 05:02:28 2007
@@ -0,0 +1,72 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.activemq;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.jms.JmsComponent;
+import org.apache.camel.component.jms.JmsConfiguration;
+
+/**
+ * The <a href="http://activemq.apache.org/camel/activemq.html";>ActiveMQ
Component</a>
+ *
+ * @version $Revision: 1.1 $
+ */
+public class ActiveMQComponent extends JmsComponent {
+ /**
+ * Creates an <a
href="http://activemq.apache.org/camel/activemq.html";>ActiveMQ Component</a>
+ *
+ * @return the created component
+ */
+ public static ActiveMQComponent activeMQComponent() {
+ return new ActiveMQComponent();
+ }
+
+ /**
+ * Creates an <a
href="http://activemq.apache.org/camel/activemq.html";>ActiveMQ Component</a>
+ * connecting to the given broker URL
+ *
+ * @param brokerURL the URL to connect to
+ * @return the created component
+ */
+ public static ActiveMQComponent activeMQComponent(String brokerURL) {
+ ActiveMQComponent answer = new ActiveMQComponent();
+ answer.getConfiguration().setBrokerURL(brokerURL);
+ return answer;
+ }
+
+ public ActiveMQComponent() {
+ }
+
+ public ActiveMQComponent(CamelContext context) {
+ super(context);
+ }
+
+ public ActiveMQComponent(ActiveMQConfiguration configuration) {
+ super(configuration);
+ }
+
+ @Override
+ public ActiveMQConfiguration getConfiguration() {
+ return (ActiveMQConfiguration) super.getConfiguration();
+ }
+
+ @Override
+ protected JmsConfiguration createConfiguration() {
+ return new ActiveMQConfiguration();
+ }
+}
Propchange:
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java?view=auto&rev=540547
==============================================================================
---
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
(added)
+++
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
Tue May 22 05:02:28 2007
@@ -0,0 +1,76 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.activemq;
+
+import org.apache.activemq.pool.PooledConnectionFactory;
+import org.apache.activemq.spring.ActiveMQConnectionFactory;
+import org.apache.camel.component.jms.JmsConfiguration;
+
+import javax.jms.ConnectionFactory;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class ActiveMQConfiguration extends JmsConfiguration {
+ private String brokerURL = ActiveMQConnectionFactory.DEFAULT_BROKER_URL;
+
+ public ActiveMQConfiguration() {
+ }
+
+ public String getBrokerURL() {
+ return brokerURL;
+ }
+
+ /**
+ * Sets the broker URL to use to connect to ActiveMQ using the
+ * <a
href="http://activemq.apache.org/configuring-transports.html";>ActiveMQ URI
format</a>
+ *
+ * @param brokerURL the URL of the broker.
+ */
+ public void setBrokerURL(String brokerURL) {
+ this.brokerURL = brokerURL;
+ }
+
+ @Override
+ public ActiveMQConnectionFactory getListenerConnectionFactory() {
+ return (ActiveMQConnectionFactory)
super.getListenerConnectionFactory();
+ }
+
+ @Override
+ public void setListenerConnectionFactory(ConnectionFactory
listenerConnectionFactory) {
+ if (listenerConnectionFactory instanceof ActiveMQConnectionFactory) {
+ super.setListenerConnectionFactory(listenerConnectionFactory);
+ }
+ else {
+ throw new IllegalArgumentException("ConnectionFactory " +
listenerConnectionFactory
+ + " is not an instanceof " +
ActiveMQConnectionFactory.class.getName());
+ }
+ }
+
+ @Override
+ protected ConnectionFactory createListenerConnectionFactory() {
+ ActiveMQConnectionFactory answer = new ActiveMQConnectionFactory();
+ answer.setBrokerURL(getBrokerURL());
+ return answer;
+ }
+
+ @Override
+ protected ConnectionFactory createTemplateConnectionFactory() {
+ return new PooledConnectionFactory(getListenerConnectionFactory());
+ }
+}
Propchange:
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/package.html
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/package.html?view=auto&rev=540547
==============================================================================
---
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/package.html
(added)
+++
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/package.html
Tue May 22 05:02:28 2007
@@ -0,0 +1,25 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+<head>
+</head>
+<body>
+
+Defines the <a href="http://activemq.apache.org/camel/activemq.html";>ActiveMQ
Component</a>
+
+</body>
+</html>
Propchange:
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Added:
activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/services/org/apache/camel/component/activemq
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/services/org/apache/camel/component/activemq?view=auto&rev=540547
==============================================================================
---
activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/services/org/apache/camel/component/activemq
(added)
+++
activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/services/org/apache/camel/component/activemq
Tue May 22 05:02:28 2007
@@ -0,0 +1 @@
+class=org.apache.camel.component.activemq.ActiveMQComponent
Added:
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQConfigureTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQConfigureTest.java?view=auto&rev=540547
==============================================================================
---
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQConfigureTest.java
(added)
+++
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQConfigureTest.java
Tue May 22 05:02:28 2007
@@ -0,0 +1,60 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.activemq;
+
+import org.apache.activemq.pool.PooledConnectionFactory;
+import org.apache.activemq.spring.ActiveMQConnectionFactory;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Endpoint;
+import org.apache.camel.component.jms.JmsConsumer;
+import org.apache.camel.component.jms.JmsEndpoint;
+import org.apache.camel.component.jms.JmsProducer;
+import org.apache.camel.processor.Logger;
+import org.springframework.jms.core.JmsTemplate;
+import org.springframework.jms.listener.AbstractMessageListenerContainer;
+
+/**
+ * @version $Revision: 538973 $
+ */
+public class ActiveMQConfigureTest extends ContextTestSupport {
+
+ public void testJmsTemplateUsesPoolingConnectionFactory() throws Exception
{
+ JmsEndpoint endpoint = resolveMandatoryEndpoint("activemq:test.foo");
+ JmsProducer producer = endpoint.createProducer();
+
+ JmsTemplate template = assertIsInstanceOf(JmsTemplate.class,
producer.getTemplate());
+ assertIsInstanceOf(PooledConnectionFactory.class,
template.getConnectionFactory());
+ assertEquals("pubSubDomain", false, template.isPubSubDomain());
+ }
+
+ public void testListenerContainerUsesSpringConnectionFactory() throws
Exception {
+ JmsEndpoint endpoint =
resolveMandatoryEndpoint("activemq:topic:test.foo");
+ JmsConsumer consumer = endpoint.createConsumer(new Logger());
+
+ AbstractMessageListenerContainer listenerContainer =
consumer.getListenerContainer();
+ assertIsInstanceOf(ActiveMQConnectionFactory.class,
listenerContainer.getConnectionFactory());
+ assertEquals("pubSubDomain", true, listenerContainer.isPubSubDomain());
+
+ }
+
+ @Override
+ protected JmsEndpoint resolveMandatoryEndpoint(String uri) {
+ Endpoint endpoint = super.resolveMandatoryEndpoint(uri);
+ return assertIsInstanceOf(JmsEndpoint.class, endpoint);
+ }
+}
\ No newline at end of file
Propchange:
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQConfigureTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQRouteTest.java?view=auto&rev=540547
==============================================================================
---
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQRouteTest.java
(added)
+++
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQRouteTest.java
Tue May 22 05:02:28 2007
@@ -0,0 +1,80 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.activemq;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import static
org.apache.camel.component.activemq.ActiveMQComponent.activeMQComponent;
+import org.apache.camel.component.jms.JmsEndpoint;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * @version $Revision: 538973 $
+ */
+public class ActiveMQRouteTest extends ContextTestSupport {
+ protected MockEndpoint resultEndpoint;
+ protected String startEndpointUri = "activemq:queue:test.a";
+
+ public void testJmsRouteWithTextMessage() throws Exception {
+ String expectedBody = "Hello there!";
+
+ resultEndpoint.expectedBodiesReceived(expectedBody);
+ resultEndpoint.message(0).header("cheese").isEqualTo(123);
+
+ sendExchange(expectedBody);
+
+ resultEndpoint.assertIsSatisfied();
+ }
+
+ protected void sendExchange(final Object expectedBody) {
+ template.sendBody(startEndpointUri, expectedBody, "cheese", 123);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ }
+
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext camelContext = super.createCamelContext();
+
+ camelContext.addComponent("activemq",
activeMQComponent("vm://localhost?broker.persistent=false"));
+
+ return camelContext;
+ }
+
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from(startEndpointUri).to("activemq:queue:test.b");
+ from("activemq:queue:test.b").to("mock:result");
+
+ JmsEndpoint endpoint1 = (JmsEndpoint)
endpoint("activemq:topic:quote.IONA");
+ endpoint1.getConfiguration().setTransacted(true);
+ from(endpoint1).to("mock:transactedClient");
+
+ JmsEndpoint endpoint2 = (JmsEndpoint)
endpoint("activemq:topic:quote.IONA");
+ endpoint1.getConfiguration().setTransacted(true);
+ from(endpoint2).to("mock:nonTrasnactedClient");
+ }
+ };
+ }
+}
\ No newline at end of file
Propchange:
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQRouteTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
activemq/camel/trunk/components/camel-activemq/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-activemq/src/test/resources/log4j.properties?view=auto&rev=540547
==============================================================================
---
activemq/camel/trunk/components/camel-activemq/src/test/resources/log4j.properties
(added)
+++
activemq/camel/trunk/components/camel-activemq/src/test/resources/log4j.properties
Tue May 22 05:02:28 2007
@@ -0,0 +1,30 @@
+## ------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used for eclipse testing, We want to see debug output
on the console.
+#
+log4j.rootLogger=INFO, out
+
+log4j.logger.org.apache.activemq=WARN
+#log4j.logger.org.apache.camel=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
+#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
Propchange:
activemq/camel/trunk/components/camel-activemq/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/camel/trunk/components/camel-jms/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/pom.xml?view=diff&rev=540547&r1=540546&r2=540547
==============================================================================
--- activemq/camel/trunk/components/camel-jms/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jms/pom.xml Tue May 22 05:02:28 2007
@@ -38,36 +38,41 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
- </dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
- <optional>true</optional>
- <scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apache-activemq</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified:
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java?view=diff&rev=540547&r1=540546&r2=540547
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
Tue May 22 05:02:28 2007
@@ -33,11 +33,14 @@
import java.util.Map;
/**
+ * A <a href="http://activemq.apache.org/jms.html";>JMS Component</a>
+ *
* @version $Revision:520964 $
*/
public class JmsComponent extends DefaultComponent<JmsExchange> {
public static final String QUEUE_PREFIX = "queue:";
public static final String TOPIC_PREFIX = "topic:";
+
private JmsConfiguration configuration;
/**
@@ -93,7 +96,6 @@
}
public JmsComponent() {
- this.configuration = new JmsConfiguration();
}
public JmsComponent(JmsConfiguration configuration) {
@@ -102,7 +104,6 @@
public JmsComponent(CamelContext context) {
super(context);
- this.configuration = new JmsConfiguration();
}
@Override
@@ -132,6 +133,9 @@
}
public JmsConfiguration getConfiguration() {
+ if (configuration == null) {
+ configuration = createConfiguration();
+ }
return configuration;
}
@@ -288,4 +292,14 @@
protected String convertPathToActualDestination(String path) {
return path;
}
+
+ /**
+ * Factory method to create the default configuration instance
+ *
+ * @return a newly created configuration object which can then be further
customized
+ */
+ protected JmsConfiguration createConfiguration() {
+ return new JmsConfiguration();
+ }
+
}
Modified:
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?view=diff&rev=540547&r1=540546&r2=540547
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
Tue May 22 05:02:28 2007
@@ -18,6 +18,7 @@
package org.apache.camel.component.jms;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.util.ObjectHelper;
import org.springframework.core.task.TaskExecutor;
import org.springframework.jms.core.JmsOperations;
import org.springframework.jms.core.JmsTemplate;
@@ -42,12 +43,11 @@
public class JmsConfiguration implements Cloneable {
protected static final String TRANSACTED = "TRANSACTED";
protected static final String CLIENT_ACKNOWLEDGE = "CLIENT_ACKNOWLEDGE";
-
- // General Setting used for both the JmsTemplate and JMS Container
private ConnectionFactory connectionFactory;
- private int acknowledgementMode=-1;
+ private ConnectionFactory templateConnectionFactory;
+ private ConnectionFactory listenerConnectionFactory;
+ private int acknowledgementMode = -1;
private String acknowledgementModeName;
-
// Used to configure the spring Container
private ExceptionListener exceptionListener;
private ConsumerType consumerType = ConsumerType.Default;
@@ -68,7 +68,6 @@
private long receiveTimeout = -1;
private int idleTaskExecutionLimit = -1;
private int maxConcurrentConsumers = -1;
-
// JmsTemplate only
private boolean useVersion102;
private boolean explicitQosEnabled;
@@ -77,10 +76,9 @@
private MessageConverter messageConverter;
private boolean messageIdEnabled = true;
private boolean messageTimestampEnabled;
- private int priority = -1;
-
- // Transaction related configuration
- private boolean transacted;
+ private int priority = -1;
+ // Transaction related configuration
+ private boolean transacted;
private PlatformTransactionManager transactionManager;
private String transactionName;
private int transactionTimeout = -1;
@@ -105,9 +103,10 @@
}
public JmsOperations createJmsOperations(boolean pubSubDomain, String
destination) {
+ ConnectionFactory factory = getTemplateConnectionFactory();
JmsTemplate template = useVersion102
- ? new JmsTemplate102(getConnectionFactory(), pubSubDomain)
- : new JmsTemplate(getConnectionFactory());
+ ? new JmsTemplate102(factory, pubSubDomain)
+ : new JmsTemplate(factory);
template.setPubSubDomain(pubSubDomain);
template.setDefaultDestinationName(destination);
@@ -129,13 +128,14 @@
template.setTimeToLive(timeToLive);
}
- template.setSessionTransacted( transacted );
-
+ template.setSessionTransacted(transacted);
+
// This is here for completeness, but the template should not get used
for receiving messages.
- if( acknowledgementMode >= 0 ) {
- template.setSessionAcknowledgeMode(acknowledgementMode);
- } else if( acknowledgementModeName!= null ) {
- template.setSessionAcknowledgeModeName(acknowledgementModeName);
+ if (acknowledgementMode >= 0) {
+ template.setSessionAcknowledgeMode(acknowledgementMode);
+ }
+ else if (acknowledgementModeName != null) {
+ template.setSessionAcknowledgeModeName(acknowledgementModeName);
}
return template;
}
@@ -147,7 +147,7 @@
}
protected void
configureMessageListenerContainer(AbstractMessageListenerContainer container) {
- container.setConnectionFactory(getConnectionFactory());
+ container.setConnectionFactory(getListenerConnectionFactory());
if (autoStartup) {
container.setAutoStartup(true);
}
@@ -164,10 +164,11 @@
container.setAcceptMessagesWhileStopping(acceptMessagesWhileStopping);
container.setExposeListenerSession(exposeListenerSession);
container.setSessionTransacted(transacted);
-
- if( acknowledgementMode >= 0 ) {
+
+ if (acknowledgementMode >= 0) {
container.setSessionAcknowledgeMode(acknowledgementMode);
- } else if( acknowledgementModeName!= null ) {
+ }
+ else if (acknowledgementModeName != null) {
container.setSessionAcknowledgeModeName(acknowledgementModeName);
}
@@ -179,16 +180,18 @@
if (concurrentConsumers >= 0) {
listenerContainer.setConcurrentConsumers(concurrentConsumers);
}
-
+
if (cacheLevel >= 0) {
listenerContainer.setCacheLevel(cacheLevel);
- } else if (cacheLevelName != null) {
+ }
+ else if (cacheLevelName != null) {
listenerContainer.setCacheLevelName(cacheLevelName);
- } else {
- // Default to CACHE_CONSUMER unless specified. This works best
with most JMS providers.
-
listenerContainer.setCacheLevel(DefaultMessageListenerContainer.CACHE_CONSUMER);
}
-
+ else {
+ // Default to CACHE_CONSUMER unless specified. This works
best with most JMS providers.
+
listenerContainer.setCacheLevel(DefaultMessageListenerContainer.CACHE_CONSUMER);
+ }
+
if (idleTaskExecutionLimit >= 0) {
listenerContainer.setIdleTaskExecutionLimit(idleTaskExecutionLimit);
}
@@ -244,13 +247,56 @@
// Properties
//-------------------------------------------------------------------------
public ConnectionFactory getConnectionFactory() {
+ if (connectionFactory == null) {
+ connectionFactory = createConnectionFactory();
+ }
return connectionFactory;
}
+ /**
+ * Sets the default connection factory to be used if a connection factory
is not specified
+ * for either [EMAIL PROTECTED]
#setTemplateConnectionFactory(ConnectionFactory)} or
+ * [EMAIL PROTECTED] #setListenerConnectionFactory(ConnectionFactory)}
+ *
+ * @param connectionFactory the default connection factory to use
+ */
public void setConnectionFactory(ConnectionFactory connectionFactory) {
this.connectionFactory = connectionFactory;
}
+ public ConnectionFactory getListenerConnectionFactory() {
+ if (listenerConnectionFactory == null) {
+ listenerConnectionFactory = createListenerConnectionFactory();
+ }
+ return listenerConnectionFactory;
+ }
+
+ /**
+ * Sets the connection factory to be used for consuming messages via the
[EMAIL PROTECTED] #createMessageListenerContainer()}
+ *
+ * @param listenerConnectionFactory the connection factory to use for
consuming messages
+ */
+ public void setListenerConnectionFactory(ConnectionFactory
listenerConnectionFactory) {
+ this.listenerConnectionFactory = listenerConnectionFactory;
+ }
+
+ public ConnectionFactory getTemplateConnectionFactory() {
+ if (templateConnectionFactory == null) {
+ templateConnectionFactory = createTemplateConnectionFactory();
+ }
+ return templateConnectionFactory;
+ }
+
+ /**
+ * Sets the connection factory to be used for sending messages via the
[EMAIL PROTECTED] JmsTemplate} via
+ * [EMAIL PROTECTED] #createJmsOperations(boolean, String)}
+ *
+ * @param templateConnectionFactory the connection factory for sending
messages
+ */
+ public void setTemplateConnectionFactory(ConnectionFactory
templateConnectionFactory) {
+ this.templateConnectionFactory = templateConnectionFactory;
+ }
+
public boolean isUseVersion102() {
return useVersion102;
}
@@ -308,12 +354,12 @@
}
public String getAcknowledgementModeName() {
- return acknowledgementModeName;
+ return acknowledgementModeName;
}
public void setAcknowledgementModeName(String consumerAcknowledgementMode)
{
this.acknowledgementModeName = consumerAcknowledgementMode;
- this.acknowledgementMode=-1;
+ this.acknowledgementMode = -1;
}
public boolean isExposeListenerSession() {
@@ -500,6 +546,23 @@
this.consumerType = consumerType;
}
+ public int getAcknowledgementMode() {
+ return acknowledgementMode;
+ }
+
+ public void setAcknowledgementMode(int consumerAcknowledgementMode) {
+ this.acknowledgementMode = consumerAcknowledgementMode;
+ this.acknowledgementModeName = null;
+ }
+
+ public boolean isTransacted() {
+ return transacted;
+ }
+
+ public void setTransacted(boolean consumerTransacted) {
+ this.transacted = consumerTransacted;
+ }
+
// Implementation methods
//-------------------------------------------------------------------------
protected AbstractMessageListenerContainer
chooseMessageListenerContainerImplementation() {
@@ -516,21 +579,25 @@
}
}
- public int getAcknowledgementMode() {
- return acknowledgementMode;
- }
-
- public void setAcknowledgementMode(int consumerAcknowledgementMode) {
- this.acknowledgementMode = consumerAcknowledgementMode;
- this.acknowledgementModeName=null;
- }
-
- public boolean isTransacted() {
- return transacted;
- }
-
- public void setTransacted(boolean consumerTransacted) {
- this.transacted = consumerTransacted;
- }
+ /**
+ * Factory method which allows derived classes to customize the lazy
creation
+ */
+ protected ConnectionFactory createConnectionFactory() {
+ ObjectHelper.notNull(connectionFactory, "connectionFactory");
+ return null;
+ }
+ /**
+ * Factory method which allows derived classes to customize the lazy
creation
+ */
+ protected ConnectionFactory createListenerConnectionFactory() {
+ return getConnectionFactory();
+ }
+
+ /**
+ * Factory method which allows derived classes to customize the lazy
creation
+ */
+ protected ConnectionFactory createTemplateConnectionFactory() {
+ return getConnectionFactory();
+ }
}
Modified:
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConsumer.java?view=diff&rev=540547&r1=540546&r2=540547
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConsumer.java
Tue May 22 05:02:28 2007
@@ -40,6 +40,10 @@
this.listenerContainer.setMessageListener(messageListener);
}
+ public AbstractMessageListenerContainer getListenerContainer() {
+ return listenerContainer;
+ }
+
protected MessageListener createMessageListener(JmsEndpoint endpoint,
Processor processor) {
EndpointMessageListener<JmsExchange> messageListener = new
EndpointMessageListener<JmsExchange>(endpoint, processor);
messageListener.setBinding(endpoint.getBinding());
Modified:
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?view=diff&rev=540547&r1=540546&r2=540547
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
Tue May 22 05:02:28 2007
@@ -27,7 +27,9 @@
import org.springframework.jms.listener.AbstractMessageListenerContainer;
/**
- * @version $Revision:520964 $
+ * A <a href="http://activemq.apache.org/jms.html";>JMS Endpoint</a>
+ *
+ * @version $Revision:520964 $
*/
public class JmsEndpoint extends DefaultEndpoint<JmsExchange> {
private JmsBinding binding;
@@ -43,7 +45,7 @@
this.pubSubDomain = pubSubDomain;
}
- public Producer<JmsExchange> createProducer() throws Exception {
+ public JmsProducer createProducer() throws Exception {
JmsOperations template =
configuration.createJmsOperations(pubSubDomain, destination);
return createProducer(template);
}
@@ -51,7 +53,7 @@
/**
* Creates a producer using the given template
*/
- public Producer<JmsExchange> createProducer(JmsOperations template) throws
Exception {
+ public JmsProducer createProducer(JmsOperations template) throws Exception
{
if (template instanceof JmsTemplate) {
JmsTemplate jmsTemplate = (JmsTemplate) template;
jmsTemplate.setPubSubDomain(pubSubDomain);
@@ -60,7 +62,7 @@
return new JmsProducer(this, template);
}
- public Consumer<JmsExchange> createConsumer(Processor processor) throws
Exception {
+ public JmsConsumer createConsumer(Processor processor) throws Exception {
AbstractMessageListenerContainer listenerContainer =
configuration.createMessageListenerContainer();
return createConsumer(processor, listenerContainer);
}
@@ -73,7 +75,7 @@
* @return a newly created consumer
* @throws Exception if the consumer cannot be created
*/
- public Consumer<JmsExchange> createConsumer(Processor processor,
AbstractMessageListenerContainer listenerContainer) throws Exception {
+ public JmsConsumer createConsumer(Processor processor,
AbstractMessageListenerContainer listenerContainer) throws Exception {
listenerContainer.setDestinationName(destination);
listenerContainer.setPubSubDomain(pubSubDomain);
if (selector != null) {
Modified:
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java?view=diff&rev=540547&r1=540546&r2=540547
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
Tue May 22 05:02:28 2007
@@ -53,4 +53,8 @@
}
});
}
+
+ public JmsOperations getTemplate() {
+ return template;
+ }
}
Modified:
activemq/camel/trunk/components/camel-jms/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/resources/log4j.properties?view=diff&rev=540547&r1=540546&r2=540547
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/resources/log4j.properties
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/resources/log4j.properties
Tue May 22 05:02:28 2007
@@ -20,7 +20,7 @@
#
log4j.rootLogger=INFO, out
-#log4j.logger.org.apache.activemq=DEBUG
+log4j.logger.org.apache.activemq=WARN
#log4j.logger.org.apache.camel=DEBUG
# CONSOLE appender not used by default
Modified: activemq/camel/trunk/components/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/pom.xml?view=diff&rev=540547&r1=540546&r2=540547
==============================================================================
--- activemq/camel/trunk/components/pom.xml (original)
+++ activemq/camel/trunk/components/pom.xml Tue May 22 05:02:28 2007
@@ -34,6 +34,7 @@
<packaging>pom</packaging>
<modules>
+ <module>camel-activemq</module>
<module>camel-bam</module>
<module>camel-cxf</module>
<module>camel-http</module>
Modified: activemq/camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?view=diff&rev=540547&r1=540546&r2=540547
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Tue May 22 05:02:28 2007
@@ -137,6 +137,11 @@
<!-- 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-bam</artifactId>
<version>${camel-version}</version>
</dependency>
