Author: davsclaus
Date: Fri Oct 29 07:56:31 2010
New Revision: 1028636

URL: http://svn.apache.org/viewvc?rev=1028636&view=rev
Log:
CAMEL-3286: Introduced taskExecutorSpring2 option to support Spring 2.x with 
camel-jms thats compiled against Spring 3.x.

Added:
    
camel/trunk/tests/camel-itest-spring-2.5/src/test/java/org/apache/camel/itest/spring2/JmsTaskExecutorSpring2Test.java
   (with props)
Modified:
    
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
    
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
    
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
    
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
    
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
    camel/trunk/tests/camel-itest-spring-2.5/pom.xml

Modified: 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java?rev=1028636&r1=1028635&r2=1028636&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
 Fri Oct 29 07:56:31 2010
@@ -284,6 +284,10 @@ public class JmsComponent extends Defaul
         getConfiguration().setTaskExecutor(taskExecutor);
     }
 
+    public void setTaskExecutorSpring2(Object taskExecutor) {
+        getConfiguration().setTaskExecutorSpring2(taskExecutor);
+    }
+
     public void setTimeToLive(long timeToLive) {
         getConfiguration().setTimeToLive(timeToLive);
     }

Modified: 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=1028636&r1=1028635&r2=1028636&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
 Fri Oct 29 07:56:31 2010
@@ -75,6 +75,8 @@ public class JmsConfiguration implements
     private boolean subscriptionDurable;
     private boolean exposeListenerSession = true;
     private TaskExecutor taskExecutor;
+    // TODO: remove in Camel 3.0 when Spring 3.0+ is required
+    private Object taskExecutorSpring2;
     private boolean pubSubNoLocal;
     private int concurrentConsumers = 1;
     private int maxMessagesPerTask = -1;
@@ -490,6 +492,14 @@ public class JmsConfiguration implements
         this.taskExecutor = taskExecutor;
     }
 
+    public Object getTaskExecutorSpring2() {
+        return taskExecutorSpring2;
+    }
+
+    public void setTaskExecutorSpring2(Object taskExecutorSpring2) {
+        this.taskExecutorSpring2 = taskExecutorSpring2;
+    }
+
     public boolean isPubSubNoLocal() {
         return pubSubNoLocal;
     }

Modified: 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=1028636&r1=1028635&r2=1028636&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
 Fri Oct 29 07:56:31 2010
@@ -513,6 +513,10 @@ public class JmsEndpoint extends Default
         return getConfiguration().getTaskExecutor();
     }
 
+    public Object getTaskExecutorSpring2() {
+        return getConfiguration().getTaskExecutorSpring2();
+    }
+
     public ConnectionFactory getTemplateConnectionFactory() {
         return getConfiguration().getTemplateConnectionFactory();
     }
@@ -811,6 +815,10 @@ public class JmsEndpoint extends Default
         getConfiguration().setTaskExecutor(taskExecutor);
     }
 
+    public void setTaskExecutorSpring2(Object taskExecutor) {
+        getConfiguration().setTaskExecutorSpring2(taskExecutor);
+    }
+
     public void setTemplateConnectionFactory(ConnectionFactory 
templateConnectionFactory) {
         
getConfiguration().setTemplateConnectionFactory(templateConnectionFactory);
     }

Modified: 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java?rev=1028636&r1=1028635&r2=1028636&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
 Fri Oct 29 07:56:31 2010
@@ -25,6 +25,7 @@ import javax.jms.Session;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
+import org.apache.camel.util.IntrospectionSupport;
 import org.springframework.jms.listener.AbstractMessageListenerContainer;
 import org.springframework.jms.listener.DefaultMessageListenerContainer;
 import org.springframework.jms.support.destination.DestinationResolver;
@@ -205,6 +206,10 @@ public class PersistentQueueReplyManager
         if (endpoint.getTaskExecutor() != null) {
             answer.setTaskExecutor(endpoint.getTaskExecutor());
         }
+        if (endpoint.getTaskExecutorSpring2() != null) {
+            // use reflection to invoke to support spring 2 when JAR is 
compiled with Spring 3.0
+            IntrospectionSupport.setProperty(answer, "taskExecutor", 
endpoint.getTaskExecutorSpring2());
+        }
 
         return answer;
     }

Modified: 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java?rev=1028636&r1=1028635&r2=1028636&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
 Fri Oct 29 07:56:31 2010
@@ -25,6 +25,7 @@ import javax.jms.TemporaryQueue;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
+import org.apache.camel.util.IntrospectionSupport;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.jms.listener.AbstractMessageListenerContainer;
 import org.springframework.jms.listener.DefaultMessageListenerContainer;
@@ -118,6 +119,10 @@ public class TemporaryQueueReplyManager 
         if (taskExecutor != null) {
             answer.setTaskExecutor(taskExecutor);
         }
+        if (endpoint.getTaskExecutorSpring2() != null) {
+            // use reflection to invoke to support spring 2 when JAR is 
compiled with Spring 3.0
+            IntrospectionSupport.setProperty(answer, "taskExecutor", 
endpoint.getTaskExecutorSpring2());
+        }
         ExceptionListener exceptionListener = endpoint.getExceptionListener();
         if (exceptionListener != null) {
             answer.setExceptionListener(exceptionListener);

Modified: camel/trunk/tests/camel-itest-spring-2.5/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-spring-2.5/pom.xml?rev=1028636&r1=1028635&r2=1028636&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-spring-2.5/pom.xml (original)
+++ camel/trunk/tests/camel-itest-spring-2.5/pom.xml Fri Oct 29 07:56:31 2010
@@ -17,91 +17,25 @@
        limitations under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
 
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.apache.camel</groupId>
-               <artifactId>camel-parent</artifactId>
-               <version>2.6-SNAPSHOT</version>
-       </parent>
-
-       <artifactId>camel-itest-spring-2.5</artifactId>
-       <name>Camel :: ITest :: Spring 2.5</name>
-       <description>Integration Test against Spring 2.5</description>
-
-       <dependencies>
-               <dependency>
-                       <groupId>org.apache.camel</groupId>
-                       <artifactId>camel-jms</artifactId>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.springframework</groupId>
-                                       <artifactId>spring-core</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.springframework</groupId>
-                                       <artifactId>spring-beans</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.springframework</groupId>
-                                       <artifactId>spring-context</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.springframework</groupId>
-                                       
<artifactId>spring-context-support</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.springframework</groupId>
-                                       <artifactId>spring-tx</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.springframework</groupId>
-                                       <artifactId>spring-aop</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.springframework</groupId>
-                                       <artifactId>spring-jms</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-
-               <!-- testing -->
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <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>
-
-               <!-- specific Spring version to test (just use big jar) -->
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring</artifactId>
-                       <version>2.5.6</version>
-                       <scope>test</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.apache.activemq</groupId>
-                       <artifactId>activemq-core</artifactId>
-                       <scope>test</scope>
+    <parent>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-parent</artifactId>
+        <version>2.6-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>camel-itest-spring-2.5</artifactId>
+    <name>Camel :: ITest :: Spring 2.5</name>
+    <description>Integration Test against Spring 2.5</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-jms</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
@@ -115,22 +49,94 @@
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-context</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context-support</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-tx</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-aop</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jms</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- testing -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <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>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>3.1</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- specific Spring version to test (just use big jar) -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+            <version>2.5.6</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-camel</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</artifactId>
+                </exclusion>
             </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.activemq</groupId>
-                       <artifactId>activemq-camel</artifactId>
-                       <scope>test</scope>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.springframework</groupId>
-                                       <artifactId>spring-core</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.springframework</groupId>
-                                       <artifactId>spring-beans</artifactId>
-                               </exclusion>                            
-                       </exclusions>
-               </dependency>
-       </dependencies>
+        </dependency>
+    </dependencies>
 </project>

Added: 
camel/trunk/tests/camel-itest-spring-2.5/src/test/java/org/apache/camel/itest/spring2/JmsTaskExecutorSpring2Test.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-spring-2.5/src/test/java/org/apache/camel/itest/spring2/JmsTaskExecutorSpring2Test.java?rev=1028636&view=auto
==============================================================================
--- 
camel/trunk/tests/camel-itest-spring-2.5/src/test/java/org/apache/camel/itest/spring2/JmsTaskExecutorSpring2Test.java
 (added)
+++ 
camel/trunk/tests/camel-itest-spring-2.5/src/test/java/org/apache/camel/itest/spring2/JmsTaskExecutorSpring2Test.java
 Fri Oct 29 07:56:31 2010
@@ -0,0 +1,74 @@
+/**
+ * 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.itest.spring2;
+
+import javax.jms.ConnectionFactory;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jms.JmsComponent;
+import 
org.springframework.scheduling.backportconcurrent.ThreadPoolTaskExecutor;
+
+import static 
org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
+
+/**
+ * @version $Revision$
+ */
+public class JmsTaskExecutorSpring2Test extends ContextTestSupport {
+
+    public void testTaskExecutorSpring2() throws Exception {
+        getMockEndpoint("mock:result").expectedMessageCount(1);
+
+        String reply = template.requestBody("activemq:foo", "Hello World", 
String.class);
+        assertEquals("Bye World", reply);
+
+        assertMockEndpointsSatisfied();
+    }
+
+    protected CamelContext createCamelContext() throws Exception {
+        CamelContext camelContext = super.createCamelContext();
+
+        ConnectionFactory connectionFactory = new 
ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
+        JmsComponent jms = jmsComponentClientAcknowledge(connectionFactory);
+
+        // use a spring 2.x task executor
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(4);
+        executor.setMaxPoolSize(16);
+        executor.setThreadNamePrefix("foo");
+        executor.afterPropertiesSet();
+        jms.setTaskExecutorSpring2(executor);
+
+        camelContext.addComponent("activemq", jms);
+
+        return camelContext;
+    }
+
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() throws Exception {
+                from("activemq:foo")
+                    .to("log:input")
+                    .to("mock:result")
+                    .transform(constant("Bye World"))
+                    .to("log:output");
+            }
+        };
+    }
+}

Propchange: 
camel/trunk/tests/camel-itest-spring-2.5/src/test/java/org/apache/camel/itest/spring2/JmsTaskExecutorSpring2Test.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
camel/trunk/tests/camel-itest-spring-2.5/src/test/java/org/apache/camel/itest/spring2/JmsTaskExecutorSpring2Test.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date


Reply via email to