diff --git a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd index a835171d16..47bc601db8 100644 --- a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd +++ b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd @@ -3,12 +3,14 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:tool="http://www.springframework.org/schema/tool" + xmlns:integration="http://www.springframework.org/schema/integration" targetNamespace="http://www.springframework.org/schema/integration/ws" elementFormDefault="qualified" attributeFormDefault="unqualified"> + + + + diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/WebServiceHandlerParserTests.java b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/WebServiceHandlerParserTests.java index acd01b426c..829867a65b 100644 --- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/WebServiceHandlerParserTests.java +++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/WebServiceHandlerParserTests.java @@ -24,7 +24,9 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.endpoint.MessageEndpoint; +import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; +import org.springframework.integration.scheduling.IntervalTrigger; import org.springframework.integration.ws.handler.MarshallingWebServiceHandler; import org.springframework.integration.ws.handler.SimpleWebServiceHandler; import org.springframework.oxm.Marshaller; @@ -150,6 +152,23 @@ public class WebServiceHandlerParserTests { assertEquals(messageSender, ((WebServiceMessageSender[])accessor.getPropertyValue("messageSenders"))[0]); assertEquals("Wrong number of message senders " ,2 , ((WebServiceMessageSender[])accessor.getPropertyValue("messageSenders")).length); } + + + @Test + public void testSimpleWebServiceHandlerWithPoller() { + ApplicationContext context = new ClassPathXmlApplicationContext( + "simpleWebServiceHandlerParserTests.xml", this.getClass()); + MessageEndpoint endpoint = (MessageEndpoint) context.getBean("handlerWithPoller"); + assertEquals(PollingConsumerEndpoint.class, endpoint.getClass()); + Object obj = new DirectFieldAccessor(endpoint).getPropertyValue("trigger"); + assertEquals(IntervalTrigger.class, obj.getClass()); + + IntervalTrigger trigger = (IntervalTrigger)obj; + DirectFieldAccessor accessor = new DirectFieldAccessor(trigger); + accessor = new DirectFieldAccessor(trigger); + + assertEquals("IntervalTrigger had wrong itnerval" , 5000, ((Long)accessor.getPropertyValue("interval")).longValue()); + } @Test public void testWebServiceHandlerWithAllInOneMarshaller() { diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml index 91f96c8a11..b8a569d505 100644 --- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml +++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceHandlerParserTests.xml @@ -14,6 +14,10 @@ http://www.springframework.org/schema/util/spring-util.xsd"> + + + + + message-senders="messageSenders"> + + + + +