svn commit: r677185 - in /activemq/camel/trunk/components/camel-spring-integration/src: main/java/org/apache/camel/component/spring/integration/ test/java/org/apache/camel/component/spring/integration/ test/resources/org/apache/camel/component/spring/i...

[ningjiang]

Author: ningjiang
Date: Wed Jul 16 00:42:40 2008
New Revision: 677185

URL: http://svn.apache.org/viewvc?rev=677185&view=rev
Log:
CAMEL-729 supports to set the consumer.delay etc in camel-spring-integration

Modified:
    
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
    
activemq/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
    
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml

Modified: 
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java?rev=677185&r1=677184&r2=677185&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
 (original)
+++ 
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
 Wed Jul 16 00:42:40 2008
@@ -22,6 +22,7 @@
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.impl.ScheduledPollEndpoint;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.integration.channel.MessageChannel;
@@ -31,7 +32,7 @@
  *
  * @version $Revision$
  */
-public class SpringIntegrationEndpoint extends 
DefaultEndpoint<SpringIntegrationExchange> {
+public class SpringIntegrationEndpoint extends 
ScheduledPollEndpoint<SpringIntegrationExchange> {
     private static final Log LOG = 
LogFactory.getLog(SpringIntegrationEndpoint.class);
     private String inputChannel;
     private String outputChannel;

Modified: 
activemq/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java?rev=677185&r1=677184&r2=677185&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
 (original)
+++ 
activemq/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
 Wed Jul 16 00:42:40 2008
@@ -17,6 +17,8 @@
 
 package org.apache.camel.component.spring.integration;
 
+import java.util.Map;
+
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringTestSupport;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -27,6 +29,12 @@
 
 public class SpringIntegrationTwoWayConsumerTest extends SpringTestSupport {
     private static final String MESSAGE_BODY = "Request message";
+    public void testDelyConfiguration() throws Exception {
+        SpringIntegrationEndpoint endpoint = 
(SpringIntegrationEndpoint)resolveMandatoryEndpoint("spring-integration://requestChannel?outputChannel=responseChannel&inOut=true&consumer.delay=5000");
+        Map map = endpoint.getConsumerProperties();
+        assertEquals("There should have a delay property ", map.size(), 1);
+        assertEquals("The delay value is not right", map.get("delay"), "5000");
+    }
 
     public void testSendingTwoWayMessage() throws Exception {
 

Modified: 
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml?rev=677185&r1=677184&r2=677185&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
 (original)
+++ 
activemq/camel/trunk/components/camel-spring-integration/src/test/resources/org/apache/camel/component/spring/integration/twoWayConsumer.xml
 Wed Jul 16 00:42:40 2008
@@ -36,7 +36,7 @@
     <camelContext id="camel" 
xmlns="http://activemq.apache.org/camel/schema/spring";>
       <route>
         <!-- Using the &amp; as the separator of & -->
-        <from 
uri="spring-integration://requestChannel?outputChannel=responseChannel&amp;inOut=true"/>
+        <from 
uri="spring-integration://requestChannel?outputChannel=responseChannel&amp;inOut=true&amp;consumer.delay=5000"/>
         <process ref="myProcessor"/>
       </route>
     </camelContext>