From eb41f9a5bd5ca54277bd9c0e0a81d0295d9f400d Mon Sep 17 00:00:00 2001 From: David Turanski Date: Fri, 15 Mar 2013 12:11:29 -0400 Subject: [PATCH] upgraded spring and SI versions, clean up --- README => README.md | 109 ++++++++------- pom.xml | 20 ++- src/main/resources/META-INF/spring.schemas | 4 +- ....1.xsd => spring-integration-flow-1.0.xsd} | 2 +- .../integration/flow/FlowUtilsTest.java | 48 ------- .../config/xml/FlowClientNamespaceTest.java | 101 -------------- .../config/xml/FlowConfigNamespaceTest.java | 65 --------- .../xml/FlowConfigNamespaceTests-context.xml | 5 +- .../flow/config/xml/FlowContextTest.java | 43 ------ .../flow/config/xml/FlowWithAutowireTest.java | 22 ---- .../xml/FlowWithAutowireTests-context.xml | 6 +- .../flow/config/xml/FlowWithErrorTest.java | 102 -------------- .../config/xml/FlowWithErrorTests-context.xml | 2 +- .../xml/FlowWithOptionalResponseTest.java | 61 --------- .../FlowWithOptionalResponseTests-context.xml | 2 +- .../config/xml/FlowWithReferencesTest.java | 52 -------- .../config/xml/TransactionalFlowTest.java | 124 ------------------ .../xml/TransactionalFlowTests-context.xml | 4 +- .../FlowClientNamespaceTest-context.xml | 42 ------ .../FlowConfigNamespaceTest-context.xml | 25 ---- .../resources/FlowContextTest-context.xml | 22 ---- .../FlowContextWithJMXTest-context.xml | 22 ---- .../FlowWithAutowireTest-context.xml | 9 -- .../resources/FlowWithErrorTest-context.xml | 39 ------ .../FlowWithOptionalResponseTest-context.xml | 24 ---- .../FlowWithReferencesTest-context.xml | 28 ---- .../autowired/autowired-flow-context.xml | 14 +- .../integration/flows/basic1/flow-context.xml | 10 +- .../integration/flows/basic2/flow-context.xml | 10 +- .../invalid-flow-context.xml | 8 +- .../integration/flows/nested/flow-context.xml | 10 +- .../flows/no-response/flow-context.xml | 6 +- .../flows/optional-response/flow-context.xml | 6 +- .../flows/subflow1-bean-config.xml | 4 +- .../flows/subflow1/subflow1-context.xml | 6 +- .../flows/subflow2/subflow2-context.xml | 6 +- .../flows/subflow4/subflow4-context.xml | 8 +- .../flows/subflow5/subflow5-context.xml | 8 +- .../flows/transactional-flow/flow-context.xml | 17 ++- .../TransactionalFlowTest-context.xml | 18 --- .../resources/autowired-referenced-beans.xml | 8 -- src/test/resources/ref-bean-config.xml | 10 -- src/test/resources/txmanager-config.xml | 7 - 43 files changed, 135 insertions(+), 1004 deletions(-) rename README => README.md (72%) rename src/main/resources/org/springframework/integration/flow/config/{spring-integration-flow-2.1.xsd => spring-integration-flow-1.0.xsd} (99%) delete mode 100644 src/test/java/org/springframework/integration/flow/FlowUtilsTest.java delete mode 100644 src/test/java/org/springframework/integration/flow/config/xml/FlowClientNamespaceTest.java delete mode 100644 src/test/java/org/springframework/integration/flow/config/xml/FlowConfigNamespaceTest.java delete mode 100644 src/test/java/org/springframework/integration/flow/config/xml/FlowContextTest.java delete mode 100644 src/test/java/org/springframework/integration/flow/config/xml/FlowWithAutowireTest.java delete mode 100644 src/test/java/org/springframework/integration/flow/config/xml/FlowWithErrorTest.java delete mode 100644 src/test/java/org/springframework/integration/flow/config/xml/FlowWithOptionalResponseTest.java delete mode 100644 src/test/java/org/springframework/integration/flow/config/xml/FlowWithReferencesTest.java delete mode 100644 src/test/java/org/springframework/integration/flow/config/xml/TransactionalFlowTest.java delete mode 100644 src/test/resources/FlowClientNamespaceTest-context.xml delete mode 100644 src/test/resources/FlowConfigNamespaceTest-context.xml delete mode 100644 src/test/resources/FlowContextTest-context.xml delete mode 100644 src/test/resources/FlowContextWithJMXTest-context.xml delete mode 100644 src/test/resources/FlowWithAutowireTest-context.xml delete mode 100644 src/test/resources/FlowWithErrorTest-context.xml delete mode 100644 src/test/resources/FlowWithOptionalResponseTest-context.xml delete mode 100644 src/test/resources/FlowWithReferencesTest-context.xml delete mode 100644 src/test/resources/TransactionalFlowTest-context.xml delete mode 100644 src/test/resources/autowired-referenced-beans.xml delete mode 100644 src/test/resources/ref-bean-config.xml delete mode 100644 src/test/resources/txmanager-config.xml diff --git a/README b/README.md similarity index 72% rename from README rename to README.md index 8d3d0ad..807744f 100644 --- a/README +++ b/README.md @@ -1,22 +1,22 @@ Spring Integration Flow ------------------------ +======================== -NOTE: If you want to get right to the code, see the unit tests and check out (literally :) the spring-integration-flow-samples project +*NOTE: If you want to get right to the code, see the unit tests and check out (literally :) the [spring-integration-flow-samples](http:github.com/dturanski/spring-integration-flow-samples) project* -Goals ---------- +#Goals Spring Integration components already support common enterprise integration patterns. Sometimes it is desirable to create common message flows which implement higher level messaging patterns or "cross cutting concerns" for your application environment. This is especially true in more complex applications. Out of the box, a best practice is to define a common message flow in its own bean definition file which may be imported into other message flows. This approach however has some limitations: -- It's input and output channels are referenced in every consuming flow. Each common flow must ensure unique channel names -- True encapsuation is impossible as any internal channels and components are exposed to the consuming flow. Note that these must have + +* It's input and output channels are referenced in every consuming flow. Each common flow must ensure unique channel names +* True encapsuation is impossible as any internal channels and components are exposed to the consuming flow. Note that these must have unique names as well -- Since a common flow is statically bound to channels, it cannot be used in a chain without implementing some type of service-activator/ +* Since a common flow is statically bound to channels, it cannot be used in a chain without implementing some type of service-activator/ gateway wrapper. -- Since the common flow is part of the same application context (an imported resource), is not practical to configure multiple instances with +* Since the common flow is part of the same application context (an imported resource), is not practical to configure multiple instances with different property values, bean definitions, etc. (As of Spring 3.1 it may possible to do something with environment profiles, but would be overly complex) The spring-integration-flow module provides a way to implement and use common flows while addressing the above limitations. A flow is an @@ -33,47 +33,49 @@ The flow is not bound to input and output channels in the consumer context and m a chain. It is also possible in theory to compose flows of other flows (NOTE: This hasn't been tested yet). -Usage --------- +# Usage The flow consumer instantiates a flow and configures one or more flow outbound-gateways. Instantiating a flow is very simple: - + The above bean definition instantiates a flow defined as "subflow1". The flow id references an existing flow implementation, presumably packaged in a separate jar. The flow element also provides optional 'properties' attribute and a 'referenced-bean-locations' attributes to inject properties and a list of bean definition locations respectively. Note that any bean definition or property in the parent context may also be referenced (inherited) by the flow. As -an alternative to the properties attribute which references a util:properties bean, A properties object may be configured as an inner bean. The following are -functionally equivalent: +an alternative to the properties attribute which references a util:properties bean, A properties object may be configured as an inner bean. The following are functionally equivalent: + ----------------------------------------------------------- - - + + --------------------------------------------------------- - - - + + - - + + - - + + + - + A message sent on the gateway's input-channel is delegated to the flow. The message on the output-channel is a response from one of the flows output ports. The output port name is contained in the response message header 'flow.output.port' -NOTE: An optional input-port attribute is available if the flow defines multiple inputs, otherwise the input port it will be automatically mapped. +*NOTE: An optional input-port attribute is available if the flow defines multiple inputs, otherwise the input port it will be automatically mapped.* Flows may also be used in a chain just as any AbstractReplyProducingMessageHandler: - - - - + + + + + +## Referencing External Bean Definitions +Sometimes you may want to reference external bean definitions that must be defined differently for each flow instance. To do this, simply provide a list of resources containing these bean definitions. + + -Implementing a Flow -------------------- +# Implementing a Flow The flow element is used to locate the flow's spring bean definition file(s) by convention (classpath:META-INF/spring/flows/[flow-id]/*.xml). It's bean definition files and any referenced-bean-locations will be used to create a child application context. The flow context must provide a FlowConfiguration bean which defines the flows input and output ports and maps them to internal input and output channels. @@ -109,22 +116,22 @@ flows input and output ports and maps them to internal input and output channels Namespace support is provided for FlowConfiguration. In the simplest case, a flow implementation encapsulates a Spring Integration flow with a single input-channel and a single output-channel. The required configuration is simply declared: - - - + + + Note: The output-channel attribute is optional if the flow does not produce a response. For more complex scenarios, the flow configuration supports multiple port-mappings, each bound to a single input channel and 0 or more output channels. A configuration for specifying multiple outputs looks like: - - - - - - - + + + + + + + If the flow defines multiple inputs, then multiple port-mapping elements must be configured. Additionally the flow client must specify the input-port in the outbound-gateway. diff --git a/pom.xml b/pom.xml index d8cf8a8..433cfac 100644 --- a/pom.xml +++ b/pom.xml @@ -4,11 +4,11 @@ 4.0.0 org.springframework.integration spring-integration-flow - 2.1.0.M1 + 1.0.0.SNAPSHOT-BUILD Spring Integration Flow Support - 3.1.0.RELEASE - 2.1.0.RELEASE + 3.2.2.RELEASE + 3.0.0.BUILD-SNAPSHOT UTF8 @@ -76,20 +76,16 @@ - SpringSource External Bundle Repository - http://repository.springsource.com/maven/bundles/external/ + SpringSource Plugin Repository + http://repo.springsource.org/plugins-release SpringSource Milestone Repository - http://maven.springframework.org/milestone/ + http://repo.springsource.org/libs-milestone - SpringSource Release Bundle Repository - http://repository.springsource.com/maven/bundles/release/ - - - SpringSource Release Repository - http://maven.springframework.org/release/ + SpringSource Snapshot Repository + http://repo.springsource.org/libs-snapshot diff --git a/src/main/resources/META-INF/spring.schemas b/src/main/resources/META-INF/spring.schemas index 343df27..21dd262 100644 --- a/src/main/resources/META-INF/spring.schemas +++ b/src/main/resources/META-INF/spring.schemas @@ -1,2 +1,2 @@ -http\://www.springframework.org/schema/integration/flow/spring-integration-flow-2.1.xsd=org/springframework/integration/flow/config/spring-integration-flow-2.1.xsd -http\://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd=org/springframework/integration/flow/config/spring-integration-flow-2.1.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/flow/spring-integration-flow-1.0.xsd=org/springframework/integration/flow/config/spring-integration-flow-1.0.xsd +http\://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd=org/springframework/integration/flow/config/spring-integration-flow-1.0.xsd \ No newline at end of file diff --git a/src/main/resources/org/springframework/integration/flow/config/spring-integration-flow-2.1.xsd b/src/main/resources/org/springframework/integration/flow/config/spring-integration-flow-1.0.xsd similarity index 99% rename from src/main/resources/org/springframework/integration/flow/config/spring-integration-flow-2.1.xsd rename to src/main/resources/org/springframework/integration/flow/config/spring-integration-flow-1.0.xsd index 481f40e..383c8eb 100644 --- a/src/main/resources/org/springframework/integration/flow/config/spring-integration-flow-2.1.xsd +++ b/src/main/resources/org/springframework/integration/flow/config/spring-integration-flow-1.0.xsd @@ -8,7 +8,7 @@ + schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd" /> diff --git a/src/test/java/org/springframework/integration/flow/FlowUtilsTest.java b/src/test/java/org/springframework/integration/flow/FlowUtilsTest.java deleted file mode 100644 index ed3261a..0000000 --- a/src/test/java/org/springframework/integration/flow/FlowUtilsTest.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.springframework.integration.flow; - -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; - -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.channel.PublishSubscribeChannel; -import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; -import org.springframework.integration.flow.config.FlowUtils; -import org.springframework.integration.message.GenericMessage; -/** - * - * @author David Turanski - * - */ -public class FlowUtilsTest { - @Test - public void buildBridge(){ - - SubscribableChannel inputChannel = new DirectChannel(); - SubscribableChannel outputChannel = new PublishSubscribeChannel(); - PollableChannel receiveChannel = new QueueChannel(); - - FlowUtils.bridgeChannels(inputChannel, outputChannel); - FlowUtils.bridgeChannels(outputChannel, receiveChannel); - - Message message = new GenericMessage("hello"); - - inputChannel.send(message); - Message result = receiveChannel.receive(100); - assertNotNull(result); - assertSame(message, result); - - } - - @Test - public void displayDependencies() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("META-INF/spring/integration/flows/subflow5/subflow5-context.xml"); - FlowUtils.displayBeansGraph(ctx.getBeanFactory()); - } - -} diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowClientNamespaceTest.java b/src/test/java/org/springframework/integration/flow/config/xml/FlowClientNamespaceTest.java deleted file mode 100644 index 4ac651a..0000000 --- a/src/test/java/org/springframework/integration/flow/config/xml/FlowClientNamespaceTest.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * Licensed 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.springframework.integration.flow.config.xml; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.flow.Flow; -import org.springframework.integration.message.GenericMessage; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * - * @author David Turanski - * - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration("classpath:/FlowClientNamespaceTest-context.xml") -public class FlowClientNamespaceTest { - - @Autowired - @Qualifier("inputC1") - MessageChannel gatewayInput; - - @Autowired - @Qualifier("outputC1") - PollableChannel gatewayOutput; - - @Test - public void testGateway() { - Message msg = new GenericMessage("hello"); - gatewayInput.send(msg); - Message reply = gatewayOutput.receive(); - assertNotNull(reply); - } - - @Autowired - @Qualifier("inputC2") - MessageChannel gatewayInput2; - - @Autowired - @Qualifier("outputC2") - PollableChannel gatewayOutput2; - - @Test - public void testOutboundGateway() { - Message msg1 = new GenericMessage("hello"); - Message msg2 = new GenericMessage("world"); - Message reply = null; - - gatewayInput2.send(msg1); - reply = gatewayOutput2.receive(); - assertNotNull(reply); - assertEquals("gateway-output", reply.getHeaders().get("flow.output.port")); - assertEquals("yeah!", reply.getHeaders().get("gateway")); - - gatewayInput2.send(msg2); - reply = gatewayOutput2.receive(); - assertNotNull(reply); - assertEquals("gateway-discard", reply.getHeaders().get("flow.output.port")); - assertEquals("yeah!", reply.getHeaders().get("gateway")); - - gatewayInput2.send(msg1); - reply = gatewayOutput2.receive(); - assertNotNull(reply); - assertEquals("gateway-output", reply.getHeaders().get("flow.output.port")); - assertEquals("yeah!", reply.getHeaders().get("gateway")); - - } - - @Autowired - @Qualifier("flowWithProps") - Flow flowWithProps; - - @Test - public void testFlowWithInnerProps() { - assertEquals("val1",flowWithProps.getProperties().getProperty("key1")); - } - -} diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowConfigNamespaceTest.java b/src/test/java/org/springframework/integration/flow/config/xml/FlowConfigNamespaceTest.java deleted file mode 100644 index 4b97869..0000000 --- a/src/test/java/org/springframework/integration/flow/config/xml/FlowConfigNamespaceTest.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * Licensed 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.springframework.integration.flow.config.xml; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.util.Iterator; -import java.util.Map; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.integration.flow.FlowConfiguration; -import org.springframework.integration.flow.PortConfiguration; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * - * @author David Turanski - * - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration("classpath:/FlowConfigNamespaceTest-context.xml") -public class FlowConfigNamespaceTest { - @Autowired - ApplicationContext applicationContext; - - @Test - public void test() { - - Map flowConfigurations = applicationContext.getBeansOfType(FlowConfiguration.class); - - Iterator iterator = flowConfigurations.values().iterator(); - FlowConfiguration flowConfiguration = iterator.next(); - assertNotNull(flowConfiguration.getPortConfigurations()); - assertEquals(2, flowConfiguration.getPortConfigurations().size()); - PortConfiguration pc0 = flowConfiguration.getPortConfigurations().get(0); - assertEquals("input", pc0.getInputPortName()); - assertEquals("subflow-input", pc0.getInputChannel()); - - assertEquals("subflow-output", pc0.getOutputChannel("output")); - assertEquals(1, pc0.getOutputPortNames().size()); - - flowConfiguration = iterator.next(); - assertNotNull(flowConfiguration.getPortConfigurations()); - assertEquals (1, flowConfiguration.getPortConfigurations().size()); - } - -} diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowConfigNamespaceTests-context.xml b/src/test/java/org/springframework/integration/flow/config/xml/FlowConfigNamespaceTests-context.xml index 4b305af..0acbf32 100644 --- a/src/test/java/org/springframework/integration/flow/config/xml/FlowConfigNamespaceTests-context.xml +++ b/src/test/java/org/springframework/integration/flow/config/xml/FlowConfigNamespaceTests-context.xml @@ -1,8 +1,9 @@ diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowContextTest.java b/src/test/java/org/springframework/integration/flow/config/xml/FlowContextTest.java deleted file mode 100644 index 26e95f0..0000000 --- a/src/test/java/org/springframework/integration/flow/config/xml/FlowContextTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * Licensed 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.springframework.integration.flow.config.xml; - -import org.junit.Test; -import org.springframework.beans.factory.BeanCreationException; -import org.springframework.context.support.ClassPathXmlApplicationContext; - - -/** - * @author David Turanski - * - */ - -public class FlowContextTest { - @Test(expected=BeanCreationException.class) - public void testChannelConflictShouldThrowException() { - try { - new ClassPathXmlApplicationContext("/FlowContextTest-context.xml"); - } catch (BeanCreationException e) { - System.out.println(e.getCause().getMessage()); - throw e; - } - } - - @Test - public void testFlowWithJMX() { - - new ClassPathXmlApplicationContext("/FlowContextWithJMXTest-context.xml"); - - } - -} diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithAutowireTest.java b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithAutowireTest.java deleted file mode 100644 index 9916ef0..0000000 --- a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithAutowireTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.integration.flow.config.xml; - -import static org.junit.Assert.assertNotNull; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.flow.Flow; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration("classpath:/FlowWithAutowireTest-context.xml") -public class FlowWithAutowireTest { - @Autowired - Flow flow; - @Test - public void test() { - Foo foo = flow.getFlowContext().getBean(Foo.class); - assertNotNull(foo.bar); - } -} diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithAutowireTests-context.xml b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithAutowireTests-context.xml index 0bd969b..3d62532 100644 --- a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithAutowireTests-context.xml +++ b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithAutowireTests-context.xml @@ -1,8 +1,8 @@ msg = new GenericMessage("hello"); - Handler handler = new Handler(); - errorChannel.subscribe(handler); - inputChannel.send(msg); - assertTrue(handler.gotResponse); - - } - - @Test - public void testDirectCallWithErrorChannel(){ - ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:/META-INF/spring/integration/flows/subflow5/subflow5-context.xml"); - MessageChannel inputChannel = applicationContext.getBean("subflow-input",MessageChannel.class); - SubscribableChannel errorChannel = applicationContext.getBean("errorChannel",SubscribableChannel.class); - - errorChannel.subscribe(new MessageHandler() { - - @Override - public void handleMessage(Message message) throws MessagingException { - assertTrue( message.getPayload() instanceof MessagingException ); - } - }); - - Message msg = new GenericMessage("hello"); - assertTrue(inputChannel.send(msg)); - } - - - @Test - public void testWithErrorChannel(){ - ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:/FlowWithErrorTest-context.xml"); - MessageChannel inputChannel = applicationContext.getBean("inputC1",MessageChannel.class); - PollableChannel output = applicationContext.getBean("outputC1",PollableChannel.class); - Message msg = new GenericMessage("hello"); - inputChannel.send(msg); - - Message reply = output.receive(100); - assertNotNull(reply); - assertTrue(reply.getPayload() instanceof MessagingException); - } - - private static class Handler implements MessageHandler { - public boolean gotResponse; - @SuppressWarnings("unused") - public Message message; - /* (non-Javadoc) - * @see org.springframework.integration.core.MessageHandler#handleMessage(org.springframework.integration.Message) - */ - @Override - public void handleMessage(Message message) throws MessagingException { - this.gotResponse = true; - this.message = message; - } - - } - - - -} diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithErrorTests-context.xml b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithErrorTests-context.xml index 5d2f0f0..351e5cb 100644 --- a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithErrorTests-context.xml +++ b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithErrorTests-context.xml @@ -7,7 +7,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd"> + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithOptionalResponseTest.java b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithOptionalResponseTest.java deleted file mode 100644 index 4c84964..0000000 --- a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithOptionalResponseTest.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.springframework.integration.flow.config.xml; - -import static org.junit.Assert.assertTrue; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; -import org.springframework.integration.message.GenericMessage; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration("classpath:/FlowWithOptionalResponseTest-context.xml") -public class FlowWithOptionalResponseTest { - @Autowired - @Qualifier("inputC") - MessageChannel input; - - @Autowired - @Qualifier("inputCO") - MessageChannel inputForOptionalResponse; - - @Autowired - @Qualifier("outputC") - SubscribableChannel output; - - @Test - public void testOneWay() { - - input.send(new GenericMessage("hello")); - } - - @Test - public void testOptionResponse() { - TestMessageHandler counter = new TestMessageHandler(); - - output.subscribe(counter); - - for (int i=0; i< 100; i++){ - inputForOptionalResponse.send(new GenericMessage("hello")); - } - - assertTrue(String.valueOf(counter.count), counter.count >1 && counter.count < 100); - } - - static class TestMessageHandler implements MessageHandler { - int count = 0; - @Override - public void handleMessage(Message message) throws MessagingException { - count++; - } - } - - -} diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithOptionalResponseTests-context.xml b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithOptionalResponseTests-context.xml index 511e26c..5ab4dce 100644 --- a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithOptionalResponseTests-context.xml +++ b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithOptionalResponseTests-context.xml @@ -7,7 +7,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd"> + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithReferencesTest.java b/src/test/java/org/springframework/integration/flow/config/xml/FlowWithReferencesTest.java deleted file mode 100644 index 29172be..0000000 --- a/src/test/java/org/springframework/integration/flow/config/xml/FlowWithReferencesTest.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * Licensed 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.springframework.integration.flow.config.xml; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.message.GenericMessage; - -/** - * - * @author David Turanski - * - */ - -public class FlowWithReferencesTest { - - @Test - public void testReferencedBeanConfig(){ - ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:/FlowWithReferencesTest-context.xml"); - MessageChannel input = applicationContext.getBean("inputC",MessageChannel.class); - PollableChannel output = applicationContext.getBean("outputC",PollableChannel.class); - Message msg = new GenericMessage("hello"); - input.send(msg); - Message reply = output.receive(); - assertNotNull(reply); - assertEquals("it works!",reply.getHeaders().get("refbean.value")); - assertEquals("val1",reply.getHeaders().get("property.value.1")); - assertEquals("undefined",reply.getHeaders().get("property.value.2")); - } - - -} diff --git a/src/test/java/org/springframework/integration/flow/config/xml/TransactionalFlowTest.java b/src/test/java/org/springframework/integration/flow/config/xml/TransactionalFlowTest.java deleted file mode 100644 index 30269ca..0000000 --- a/src/test/java/org/springframework/integration/flow/config/xml/TransactionalFlowTest.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright 2002-2011 the original author or authors. - * - * Licensed 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.springframework.integration.flow.config.xml; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; -import org.springframework.integration.flow.FlowConstants; -import org.springframework.integration.flow.Transaction.StubTransactionManager; -import org.springframework.integration.message.ErrorMessage; -import org.springframework.integration.message.GenericMessage; - -/** - * @author David Turanski - * - */ -public class TransactionalFlowTest { - @Test - public void testFlowDirectCommit() { - ApplicationContext applicationContext = - new ClassPathXmlApplicationContext("/META-INF/spring/integration/flows/transactional-flow/flow-context.xml" - ,"/txmanager-config.xml"); - MessageChannel inputChannel = applicationContext.getBean("inputChannel", MessageChannel.class); - SubscribableChannel outputChannel = applicationContext.getBean("outputChannel", SubscribableChannel.class); - StubTransactionManager transactionManager = applicationContext.getBean(StubTransactionManager.class); - Handler handler = new Handler(); - outputChannel.subscribe(handler); - inputChannel.send(new GenericMessage("hello")); - assertTrue(handler.messageReceived); - assertTrue(transactionManager.committed); - assertFalse(transactionManager.rolledback); - } - - @Test - public void testFlowDirectRollback() { - ApplicationContext applicationContext = - new ClassPathXmlApplicationContext("/META-INF/spring/integration/flows/transactional-flow/flow-context.xml", - "/txmanager-config.xml"); - MessageChannel inputChannel = applicationContext.getBean("inputChannel", MessageChannel.class); - SubscribableChannel outputChannel = applicationContext.getBean("outputChannel", SubscribableChannel.class); - StubTransactionManager transactionManager = applicationContext.getBean(StubTransactionManager.class); - Handler handler = new Handler(); - outputChannel.subscribe(handler); - try { - inputChannel.send(new GenericMessage("rollback")); - fail("should throw exception"); - } catch (Exception e) { - assertFalse(handler.messageReceived); - assertTrue(transactionManager.rolledback); - assertFalse(transactionManager.committed); - } - } - - @Test - public void testFlowCommit() { - ApplicationContext applicationContext = - new ClassPathXmlApplicationContext("/TransactionalFlowTest-context.xml","/txmanager-config.xml"); - MessageChannel inputChannel = applicationContext.getBean("inputC", MessageChannel.class); - SubscribableChannel outputChannel = applicationContext.getBean("outputC", SubscribableChannel.class); - StubTransactionManager transactionManager = applicationContext.getBean(StubTransactionManager.class); - Handler handler = new Handler(); - outputChannel.subscribe(handler); - inputChannel.send(new GenericMessage("hello")); - assertTrue(handler.messageReceived); - assertTrue(transactionManager.committed); - assertFalse(transactionManager.rolledback); - } - - @Test - public void testFlowRollbackWithGatewayErrorChannel() { - ApplicationContext applicationContext = - new ClassPathXmlApplicationContext("/TransactionalFlowTest-context.xml","/txmanager-config.xml"); - MessageChannel inputChannel = applicationContext.getBean("inputC", MessageChannel.class); - SubscribableChannel errorChannel = applicationContext.getBean("errorChannel", SubscribableChannel.class); - StubTransactionManager transactionManager = applicationContext.getBean(StubTransactionManager.class); - Handler handler = new Handler(); - errorChannel.subscribe(handler); - - inputChannel.send(new GenericMessage("rollback")); - - assertTrue(handler.messageReceived); - assertTrue(handler.message instanceof ErrorMessage); - assertEquals(FlowConstants.FLOW_HANDLER_EXCEPTION_HEADER_VALUE, - handler.message.getHeaders().get(FlowConstants.FLOW_OUTPUT_PORT_HEADER)); - assertTrue(transactionManager.rolledback); - assertFalse(transactionManager.committed); - - } - - - private static class Handler implements MessageHandler { - public boolean messageReceived; - public Message message; - /* (non-Javadoc) - * @see org.springframework.integration.core.MessageHandler#handleMessage(org.springframework.integration.Message) - */ - @Override - public void handleMessage(Message message) throws MessagingException { - this.messageReceived = true; - this.message = message; - } - - } -} diff --git a/src/test/java/org/springframework/integration/flow/config/xml/TransactionalFlowTests-context.xml b/src/test/java/org/springframework/integration/flow/config/xml/TransactionalFlowTests-context.xml index 57ba3d3..14da99e 100644 --- a/src/test/java/org/springframework/integration/flow/config/xml/TransactionalFlowTests-context.xml +++ b/src/test/java/org/springframework/integration/flow/config/xml/TransactionalFlowTests-context.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int-flow="http://www.springframework.org/schema/integration/flow" xmlns:int="http://www.springframework.org/schema/integration" - xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd - http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow-2.1.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd + http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/src/test/resources/FlowClientNamespaceTest-context.xml b/src/test/resources/FlowClientNamespaceTest-context.xml deleted file mode 100644 index 59d38ac..0000000 --- a/src/test/resources/FlowClientNamespaceTest-context.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - val1 - - - - - diff --git a/src/test/resources/FlowConfigNamespaceTest-context.xml b/src/test/resources/FlowConfigNamespaceTest-context.xml deleted file mode 100644 index 4b305af..0000000 --- a/src/test/resources/FlowConfigNamespaceTest-context.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/test/resources/FlowContextTest-context.xml b/src/test/resources/FlowContextTest-context.xml deleted file mode 100644 index 8827133..0000000 --- a/src/test/resources/FlowContextTest-context.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/test/resources/FlowContextWithJMXTest-context.xml b/src/test/resources/FlowContextWithJMXTest-context.xml deleted file mode 100644 index 7692902..0000000 --- a/src/test/resources/FlowContextWithJMXTest-context.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - diff --git a/src/test/resources/FlowWithAutowireTest-context.xml b/src/test/resources/FlowWithAutowireTest-context.xml deleted file mode 100644 index 879c71b..0000000 --- a/src/test/resources/FlowWithAutowireTest-context.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/src/test/resources/FlowWithErrorTest-context.xml b/src/test/resources/FlowWithErrorTest-context.xml deleted file mode 100644 index 5d2f0f0..0000000 --- a/src/test/resources/FlowWithErrorTest-context.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/resources/FlowWithOptionalResponseTest-context.xml b/src/test/resources/FlowWithOptionalResponseTest-context.xml deleted file mode 100644 index 511e26c..0000000 --- a/src/test/resources/FlowWithOptionalResponseTest-context.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/test/resources/FlowWithReferencesTest-context.xml b/src/test/resources/FlowWithReferencesTest-context.xml deleted file mode 100644 index 11f5e76..0000000 --- a/src/test/resources/FlowWithReferencesTest-context.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - val1 - - - - - - - - - - - diff --git a/src/test/resources/META-INF/spring/integration/flows/autowired/autowired-flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/autowired/autowired-flow-context.xml index 9d46529..e4bbc18 100644 --- a/src/test/resources/META-INF/spring/integration/flows/autowired/autowired-flow-context.xml +++ b/src/test/resources/META-INF/spring/integration/flows/autowired/autowired-flow-context.xml @@ -1,13 +1,13 @@ + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> diff --git a/src/test/resources/META-INF/spring/integration/flows/basic1/flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/basic1/flow-context.xml index d161bcb..e8a11c6 100644 --- a/src/test/resources/META-INF/spring/integration/flows/basic1/flow-context.xml +++ b/src/test/resources/META-INF/spring/integration/flows/basic1/flow-context.xml @@ -1,10 +1,10 @@ diff --git a/src/test/resources/META-INF/spring/integration/flows/basic2/flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/basic2/flow-context.xml index a201aef..c738b3a 100644 --- a/src/test/resources/META-INF/spring/integration/flows/basic2/flow-context.xml +++ b/src/test/resources/META-INF/spring/integration/flows/basic2/flow-context.xml @@ -1,10 +1,10 @@ diff --git a/src/test/resources/META-INF/spring/integration/flows/flow-with-channel-conflict/invalid-flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/flow-with-channel-conflict/invalid-flow-context.xml index 82fe10a..58e27e3 100644 --- a/src/test/resources/META-INF/spring/integration/flows/flow-with-channel-conflict/invalid-flow-context.xml +++ b/src/test/resources/META-INF/spring/integration/flows/flow-with-channel-conflict/invalid-flow-context.xml @@ -5,11 +5,11 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-flow="http://www.springframework.org/schema/integration/flow" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> diff --git a/src/test/resources/META-INF/spring/integration/flows/nested/flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/nested/flow-context.xml index 1540328..abe0e0f 100644 --- a/src/test/resources/META-INF/spring/integration/flows/nested/flow-context.xml +++ b/src/test/resources/META-INF/spring/integration/flows/nested/flow-context.xml @@ -1,10 +1,10 @@ diff --git a/src/test/resources/META-INF/spring/integration/flows/no-response/flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/no-response/flow-context.xml index 2a05aea..855f00e 100644 --- a/src/test/resources/META-INF/spring/integration/flows/no-response/flow-context.xml +++ b/src/test/resources/META-INF/spring/integration/flows/no-response/flow-context.xml @@ -4,10 +4,10 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-flow="http://www.springframework.org/schema/integration/flow" - xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"> + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> diff --git a/src/test/resources/META-INF/spring/integration/flows/optional-response/flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/optional-response/flow-context.xml index a367b45..ba08c18 100644 --- a/src/test/resources/META-INF/spring/integration/flows/optional-response/flow-context.xml +++ b/src/test/resources/META-INF/spring/integration/flows/optional-response/flow-context.xml @@ -4,10 +4,10 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-flow="http://www.springframework.org/schema/integration/flow" - xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"> + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> diff --git a/src/test/resources/META-INF/spring/integration/flows/subflow1-bean-config.xml b/src/test/resources/META-INF/spring/integration/flows/subflow1-bean-config.xml index e1cc01d..d69dc0e 100644 --- a/src/test/resources/META-INF/spring/integration/flows/subflow1-bean-config.xml +++ b/src/test/resources/META-INF/spring/integration/flows/subflow1-bean-config.xml @@ -1,11 +1,11 @@ + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> diff --git a/src/test/resources/META-INF/spring/integration/flows/subflow1/subflow1-context.xml b/src/test/resources/META-INF/spring/integration/flows/subflow1/subflow1-context.xml index ee19edc..52ab3b4 100644 --- a/src/test/resources/META-INF/spring/integration/flows/subflow1/subflow1-context.xml +++ b/src/test/resources/META-INF/spring/integration/flows/subflow1/subflow1-context.xml @@ -4,10 +4,10 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-flow="http://www.springframework.org/schema/integration/flow" - xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"> + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> diff --git a/src/test/resources/META-INF/spring/integration/flows/subflow2/subflow2-context.xml b/src/test/resources/META-INF/spring/integration/flows/subflow2/subflow2-context.xml index 9164c37..07c818e 100644 --- a/src/test/resources/META-INF/spring/integration/flows/subflow2/subflow2-context.xml +++ b/src/test/resources/META-INF/spring/integration/flows/subflow2/subflow2-context.xml @@ -5,11 +5,11 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-flow="http://www.springframework.org/schema/integration/flow" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> diff --git a/src/test/resources/META-INF/spring/integration/flows/subflow4/subflow4-context.xml b/src/test/resources/META-INF/spring/integration/flows/subflow4/subflow4-context.xml index 00c64a9..6c47bc7 100644 --- a/src/test/resources/META-INF/spring/integration/flows/subflow4/subflow4-context.xml +++ b/src/test/resources/META-INF/spring/integration/flows/subflow4/subflow4-context.xml @@ -5,11 +5,11 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-flow="http://www.springframework.org/schema/integration/flow" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> diff --git a/src/test/resources/META-INF/spring/integration/flows/subflow5/subflow5-context.xml b/src/test/resources/META-INF/spring/integration/flows/subflow5/subflow5-context.xml index c595001..fd44bca 100644 --- a/src/test/resources/META-INF/spring/integration/flows/subflow5/subflow5-context.xml +++ b/src/test/resources/META-INF/spring/integration/flows/subflow5/subflow5-context.xml @@ -5,11 +5,11 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-flow="http://www.springframework.org/schema/integration/flow" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> diff --git a/src/test/resources/META-INF/spring/integration/flows/transactional-flow/flow-context.xml b/src/test/resources/META-INF/spring/integration/flows/transactional-flow/flow-context.xml index 3e57eec..830bbea 100644 --- a/src/test/resources/META-INF/spring/integration/flows/transactional-flow/flow-context.xml +++ b/src/test/resources/META-INF/spring/integration/flows/transactional-flow/flow-context.xml @@ -1,16 +1,15 @@ + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"> diff --git a/src/test/resources/TransactionalFlowTest-context.xml b/src/test/resources/TransactionalFlowTest-context.xml deleted file mode 100644 index 57ba3d3..0000000 --- a/src/test/resources/TransactionalFlowTest-context.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - diff --git a/src/test/resources/autowired-referenced-beans.xml b/src/test/resources/autowired-referenced-beans.xml deleted file mode 100644 index c34e251..0000000 --- a/src/test/resources/autowired-referenced-beans.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/src/test/resources/ref-bean-config.xml b/src/test/resources/ref-bean-config.xml deleted file mode 100644 index 88efa47..0000000 --- a/src/test/resources/ref-bean-config.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/src/test/resources/txmanager-config.xml b/src/test/resources/txmanager-config.xml deleted file mode 100644 index c4a7b36..0000000 --- a/src/test/resources/txmanager-config.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - -