diff --git a/build.gradle b/build.gradle index 480bad685c..ae13dc455e 100644 --- a/build.gradle +++ b/build.gradle @@ -241,16 +241,6 @@ project('spring-integration-http') { } } -project('spring-integration-httpinvoker') { - description = 'Spring Integration HttpInvoker Support' - dependencies { - compile project(":spring-integration-core") - compile "org.springframework:spring-aop:$springVersion" - compile "org.springframework:spring-web:$springVersion" - compile("javax.servlet:servlet-api:2.4") { provided = true } - } -} - project('spring-integration-ip') { description = 'Spring Integration IP Support' dependencies { diff --git a/pom.xml b/pom.xml index 30d473525c..d01ae7a0a8 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,6 @@ spring-integration-ftp spring-integration-groovy spring-integration-http - spring-integration-httpinvoker spring-integration-ip spring-integration-jdbc spring-integration-jms diff --git a/settings.gradle b/settings.gradle index 2a7bda9779..e9dca2f6bc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -24,7 +24,6 @@ include 'spring-integration-file' include 'spring-integration-ftp' include 'spring-integration-groovy' include 'spring-integration-http' -include 'spring-integration-httpinvoker' include 'spring-integration-ip' include 'spring-integration-jdbc' include 'spring-integration-jms' diff --git a/spring-integration-event/pom.xml b/spring-integration-event/pom.xml index 376718ced3..33e14d905c 100644 --- a/spring-integration-event/pom.xml +++ b/spring-integration-event/pom.xml @@ -130,12 +130,6 @@ 3.1.0.M2 compile - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.hamcrest hamcrest-all @@ -166,6 +160,12 @@ 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-feed/pom.xml b/spring-integration-feed/pom.xml index 48544d9442..ec8005e950 100644 --- a/spring-integration-feed/pom.xml +++ b/spring-integration-feed/pom.xml @@ -106,12 +106,6 @@ 2.1.0.BUILD-SNAPSHOT test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-context @@ -172,6 +166,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + net.java.dev.rome rome diff --git a/spring-integration-file/pom.xml b/spring-integration-file/pom.xml index 552b8b2efb..747e4eb1af 100644 --- a/spring-integration-file/pom.xml +++ b/spring-integration-file/pom.xml @@ -130,12 +130,6 @@ 3.1.0.M2 compile - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.hamcrest hamcrest-all @@ -166,6 +160,12 @@ 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-ftp/pom.xml b/spring-integration-ftp/pom.xml index 369a594501..6008464101 100644 --- a/spring-integration-ftp/pom.xml +++ b/spring-integration-ftp/pom.xml @@ -142,6 +142,12 @@ 3.1.0.M2 test + + org.springframework.integration + spring-integration-file + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-context-support @@ -167,12 +173,6 @@ 1.8.4 test - - org.springframework.integration - spring-integration-file - 2.1.0.BUILD-SNAPSHOT - compile - junit junit-dep diff --git a/spring-integration-groovy/pom.xml b/spring-integration-groovy/pom.xml index a89b2aed2e..2c7043bc9e 100644 --- a/spring-integration-groovy/pom.xml +++ b/spring-integration-groovy/pom.xml @@ -124,12 +124,6 @@ 3.1.0.M2 compile - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.hamcrest hamcrest-all @@ -166,6 +160,12 @@ 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-http/pom.xml b/spring-integration-http/pom.xml index 37801db8a5..bbc9067a03 100644 --- a/spring-integration-http/pom.xml +++ b/spring-integration-http/pom.xml @@ -106,12 +106,6 @@ 2.1.0.BUILD-SNAPSHOT test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - javax.servlet servlet-api @@ -179,6 +173,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-httpinvoker/.springBeans b/spring-integration-httpinvoker/.springBeans deleted file mode 100644 index 85a1da38fa..0000000000 --- a/spring-integration-httpinvoker/.springBeans +++ /dev/null @@ -1,13 +0,0 @@ - - - 1 - - - - - - - - - - diff --git a/spring-integration-httpinvoker/pom.xml b/spring-integration-httpinvoker/pom.xml deleted file mode 100644 index d6e798c187..0000000000 --- a/spring-integration-httpinvoker/pom.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - 4.0.0 - org.springframework.integration - spring-integration-httpinvoker - 2.1.0.BUILD-SNAPSHOT - Spring Integration HttpInvoker Support - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - src/main/java - - **/* - - - **/*.java - - - - src/main/resources - - **/* - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin - - - **/*Tests.java - - - **/*Abstract*.java - - - - - - - - http://download.java.net/maven/2 - http://download.java.net/maven/2 - - - http://maven.springframework.org/milestone - http://maven.springframework.org/milestone - - - http://maven.springframework.org/release - http://maven.springframework.org/release - - - http://maven.springframework.org/snapshot - http://maven.springframework.org/snapshot - - - http://repository.springsource.com/maven/bundles/external - http://repository.springsource.com/maven/bundles/external - - - http://repository.springsource.com/maven/bundles/milestone - http://repository.springsource.com/maven/bundles/milestone - - - http://repository.springsource.com/maven/bundles/release - http://repository.springsource.com/maven/bundles/release - - - - - org.easymock - easymock - 2.3 - test - - - org.springframework - spring-web - 3.1.0.M2 - compile - - - org.springframework - spring-aop - 3.1.0.M2 - compile - - - org.easymock - easymockclassextension - 2.3 - test - - - org.springframework - spring-test - 3.1.0.M2 - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.hamcrest - hamcrest-all - 1.1 - test - - - org.mockito - mockito-all - 1.8.4 - test - - - javax.servlet - servlet-api - 2.4 - provided - - - log4j - log4j - 1.2.12 - test - - - cglib - cglib-nodep - 2.2 - test - - - junit - junit-dep - 4.8.2 - test - - - - UTF8 - - diff --git a/spring-integration-httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGateway.java b/spring-integration-httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGateway.java deleted file mode 100644 index 92f24783ed..0000000000 --- a/spring-integration-httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGateway.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright 2002-2010 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.httpinvoker; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.integration.MessagingException; -import org.springframework.integration.gateway.RemotingInboundGatewaySupport; -import org.springframework.integration.gateway.RequestReplyExchanger; -import org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter; -import org.springframework.web.HttpRequestHandler; - -/** - * An inbound gateway adapter for HttpInvoker-based remoting. Since this class implements - * {@link HttpRequestHandler}, it can be configured with a delegating Servlet where the - * servlet-name matches this adapter's bean name. For example, the following servlet can - * be defined in web.xml: - * - * 
- * <servlet>
- *     <servlet-name>httpInvokerGateway</servlet-name>
- *     <servlet-class>org.springframework.web.context.support.HttpRequestHandlerServlet</servlet-class>
- * </servlet>
- *
- * - * And, this would match the following bean definition in the application context loaded - * by a {@link org.springframework.web.context.ContextLoaderListener}: - * - * 
- * <bean id="httpInvokerGateway" class="org.springframework.integration.adapter.httpinvoker.HttpInvokerGateway">
- *     <constructor-arg ref="requestChannel"/>
- * </bean>
- *
- * - *

- * Alternatively, in a Spring MVC application, the DispatcherServlet can delegate to the - * "httpInvokerGateway" bean based on a handler mapping configuration. In that case, - * the HttpRequestHandlerServlet would not be necessary. - *

- * - * @author Mark Fisher - * - * @deprecated as of 2.0.x. We recommend using the REST-based HTTP adapters instead. - */ -@Deprecated -public class HttpInvokerInboundGateway extends RemotingInboundGatewaySupport implements HttpRequestHandler { - - private volatile HttpInvokerServiceExporter exporter; - - private final Object initializationMonitor = new Object(); - - - @Override - protected void onInit() throws Exception { - synchronized (this.initializationMonitor) { - if (this.exporter == null) { - HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter(); - exporter.setService(this); - exporter.setServiceInterface(RequestReplyExchanger.class); - exporter.afterPropertiesSet(); - this.exporter = exporter; - } - } - super.onInit(); - } - - public void handleRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - if (this.exporter == null) { - throw new MessagingException("adapter has not been initialized"); - } - this.exporter.handleRequest(request, response); - } - -} diff --git a/spring-integration-httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerOutboundGateway.java b/spring-integration-httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerOutboundGateway.java deleted file mode 100644 index 7e6b007fad..0000000000 --- a/spring-integration-httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerOutboundGateway.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2002-2010 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.httpinvoker; - -import org.springframework.integration.gateway.AbstractRemotingOutboundGateway; -import org.springframework.integration.gateway.RequestReplyExchanger; -import org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean; - -/** - * A MessageHandler adapter for HttpInvoker-based remoting. - * - * @author Mark Fisher - * - * @deprecated as of 2.0.x. We recommend using the REST-based HTTP adapters instead. - */ -@Deprecated -public class HttpInvokerOutboundGateway extends AbstractRemotingOutboundGateway { - - public HttpInvokerOutboundGateway(String url) { - super(url); - } - - - @Override - protected RequestReplyExchanger createProxy(String url) { - HttpInvokerProxyFactoryBean proxyFactory = new HttpInvokerProxyFactoryBean(); - proxyFactory.setServiceInterface(RequestReplyExchanger.class); - proxyFactory.setServiceUrl(url); - proxyFactory.afterPropertiesSet(); - return (RequestReplyExchanger) proxyFactory.getObject(); - } - -} diff --git a/spring-integration-httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParser.java b/spring-integration-httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParser.java deleted file mode 100644 index a9442c8ec1..0000000000 --- a/spring-integration-httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParser.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2002-2010 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.httpinvoker.config; - -import org.w3c.dom.Element; - -import org.springframework.integration.config.xml.AbstractInboundGatewayParser; - -/** - * Parser for the <httpinvoker-gateway/> element. - * - * @author Mark Fisher - * - * @deprecated as of 2.0.x. We recommend using the REST-based HTTP adapters instead. - */ -@Deprecated -public class HttpInvokerInboundGatewayParser extends AbstractInboundGatewayParser { - - @Override - protected String getBeanClassName(Element element) { - return "org.springframework.integration.httpinvoker.HttpInvokerInboundGateway"; - } - -} diff --git a/spring-integration-httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerNamespaceHandler.java b/spring-integration-httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerNamespaceHandler.java deleted file mode 100644 index e44e0fb9ba..0000000000 --- a/spring-integration-httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerNamespaceHandler.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2002-2010 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.httpinvoker.config; - -import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHandler; - -/** - * Namespace handler for Spring Integration's httpinvoker namespace. - * - * @author Mark Fisher - * - * @deprecated as of 2.0.x. We recommend using the REST-based HTTP adapters instead. - */ -@Deprecated -public class HttpInvokerNamespaceHandler extends AbstractIntegrationNamespaceHandler { - - public void init() { - this.registerBeanDefinitionParser("inbound-gateway", new HttpInvokerInboundGatewayParser()); - this.registerBeanDefinitionParser("outbound-gateway", new HttpInvokerOutboundGatewayParser()); - } - -} diff --git a/spring-integration-httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerOutboundGatewayParser.java b/spring-integration-httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerOutboundGatewayParser.java deleted file mode 100644 index cd819e77e2..0000000000 --- a/spring-integration-httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerOutboundGatewayParser.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2002-2010 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.httpinvoker.config; - -import org.w3c.dom.Element; - -import org.springframework.integration.config.xml.AbstractOutboundGatewayParser; - -/** - * Parser for the <outbound-gateway/> element of the 'httpinvoker' namespace. - * - * @author Mark Fisher - * - * @deprecated as of 2.0.x. We recommend using the REST-based HTTP adapters instead. - */ -@Deprecated -public class HttpInvokerOutboundGatewayParser extends AbstractOutboundGatewayParser { - - @Override - protected String getGatewayClassName(Element element) { - return "org.springframework.integration.httpinvoker.HttpInvokerOutboundGateway"; - } - -} diff --git a/spring-integration-httpinvoker/src/main/resources/META-INF/spring.handlers b/spring-integration-httpinvoker/src/main/resources/META-INF/spring.handlers deleted file mode 100644 index c77f3fddf1..0000000000 --- a/spring-integration-httpinvoker/src/main/resources/META-INF/spring.handlers +++ /dev/null @@ -1 +0,0 @@ -http\://www.springframework.org/schema/integration/httpinvoker=org.springframework.integration.httpinvoker.config.HttpInvokerNamespaceHandler \ No newline at end of file diff --git a/spring-integration-httpinvoker/src/main/resources/META-INF/spring.schemas b/spring-integration-httpinvoker/src/main/resources/META-INF/spring.schemas deleted file mode 100644 index 916caffef0..0000000000 --- a/spring-integration-httpinvoker/src/main/resources/META-INF/spring.schemas +++ /dev/null @@ -1,3 +0,0 @@ -http\://www.springframework.org/schema/integration/httpinvoker/spring-integration-httpinvoker-1.0.xsd=org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-1.0.xsd -http\://www.springframework.org/schema/integration/httpinvoker/spring-integration-httpinvoker-2.0.xsd=org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-2.0.xsd -http\://www.springframework.org/schema/integration/httpinvoker/spring-integration-httpinvoker.xsd=org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-2.0.xsd \ No newline at end of file diff --git a/spring-integration-httpinvoker/src/main/resources/META-INF/spring.tooling b/spring-integration-httpinvoker/src/main/resources/META-INF/spring.tooling deleted file mode 100644 index acef8eab85..0000000000 --- a/spring-integration-httpinvoker/src/main/resources/META-INF/spring.tooling +++ /dev/null @@ -1,4 +0,0 @@ -# Tooling related information for the integration httpinvoker namespace -http\://www.springframework.org/schema/integration/httpinvoker@name=integration httpinvoker Namespace -http\://www.springframework.org/schema/integration/httpinvoker@prefix=int-httpinvoker -http\://www.springframework.org/schema/integration/httpinvoker@icon=org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker.gif diff --git a/spring-integration-httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-1.0.xsd b/spring-integration-httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-1.0.xsd deleted file mode 100644 index bc8755bbfc..0000000000 --- a/spring-integration-httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-1.0.xsd +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - Defines an HttpInvoker-based inbound Messaging Gateway. - - - - - - - - - - - - - - - Defines an HttpInvoker-based outbound Messaging Gateway. - - - - - - - - - - - - - - - - - Defines common configuration for gateway adapters. - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-integration-httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-2.0.xsd b/spring-integration-httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-2.0.xsd deleted file mode 100644 index a96ea37a3e..0000000000 --- a/spring-integration-httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker-2.0.xsd +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - Defines an HttpInvoker-based inbound Messaging Gateway. - - - - - - - - - - - - - - - Defines an HttpInvoker-based outbound Messaging Gateway. - - - - - - - - - - - - - - - - - Defines common configuration for gateway adapters. - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-integration-httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker.gif b/spring-integration-httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker.gif deleted file mode 100644 index 750667e608..0000000000 Binary files a/spring-integration-httpinvoker/src/main/resources/org/springframework/integration/httpinvoker/config/spring-integration-httpinvoker.gif and /dev/null differ diff --git a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java b/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java deleted file mode 100644 index ff1f4c92fe..0000000000 --- a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright 2002-2010 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.httpinvoker; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.concurrent.Executors; - -import org.junit.Test; - -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.GenericMessage; -import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.mock.web.MockHttpServletResponse; -import org.springframework.remoting.support.RemoteInvocation; -import org.springframework.remoting.support.RemoteInvocationResult; - -/** - * @author Mark Fisher - */ -@SuppressWarnings("deprecation") -public class HttpInvokerInboundGatewayTests { - - @Test - public void testRequestOnly() throws Exception { - QueueChannel channel = new QueueChannel(); - HttpInvokerInboundGateway gateway = new HttpInvokerInboundGateway(); - gateway.setRequestChannel(channel); - gateway.setExpectReply(false); - gateway.afterPropertiesSet(); - MockHttpServletRequest request = new MockHttpServletRequest(); - MockHttpServletResponse response = new MockHttpServletResponse(); - request.setContent(createRequestContent(new GenericMessage("test"))); - gateway.handleRequest(request, response); - Message message = channel.receive(500); - assertNotNull(message); - assertEquals("test", message.getPayload()); - } - - @Test - public void testRequestReply() throws Exception { - final QueueChannel channel = new QueueChannel(); - Executors.newSingleThreadExecutor().execute(new Runnable() { - public void run() { - Message message = channel.receive(); - MessageChannel replyChannel = (MessageChannel) message.getHeaders().getReplyChannel(); - replyChannel.send(new GenericMessage(message.getPayload().toString().toUpperCase())); - } - }); - HttpInvokerInboundGateway gateway = new HttpInvokerInboundGateway(); - gateway.setRequestChannel(channel); - gateway.setExpectReply(true); - gateway.afterPropertiesSet(); - MockHttpServletRequest request = new MockHttpServletRequest(); - MockHttpServletResponse response = new MockHttpServletResponse(); - request.setContent(createRequestContent(new GenericMessage("test"))); - gateway.handleRequest(request, response); - Message reply = extractMessageFromResponse(response); - assertEquals("TEST", reply.getPayload()); - } - - - private static byte[] createRequestContent(Message message) throws IOException { - RemoteInvocation invocation = new RemoteInvocation( - "exchange", new Class[] { Message.class }, new Object[] { message }); - ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); - ObjectOutputStream oos = new ObjectOutputStream(baos); - try { - oos.writeObject(invocation); - oos.flush(); - } - finally { - oos.close(); - } - return baos.toByteArray(); - } - - private static Message extractMessageFromResponse(MockHttpServletResponse response) throws IOException, ClassNotFoundException { - byte[] responseContent = response.getContentAsByteArray(); - ByteArrayInputStream bais = new ByteArrayInputStream(responseContent); - ObjectInputStream ois = new ObjectInputStream(bais); - RemoteInvocationResult remoteResult = (RemoteInvocationResult) ois.readObject(); - Object resultValue = remoteResult.getValue(); - assertTrue(resultValue instanceof Message); - return (Message) resultValue; - } - -} diff --git a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/DefaultConfigurationTests-context.xml b/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/DefaultConfigurationTests-context.xml deleted file mode 100644 index bab8a430f6..0000000000 --- a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/DefaultConfigurationTests-context.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/DefaultConfigurationTests.java b/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/DefaultConfigurationTests.java deleted file mode 100644 index d1bac26c6a..0000000000 --- a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/DefaultConfigurationTests.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2002-2009 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.httpinvoker.config; - -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.DirectFieldAccessor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.integration.channel.MessagePublishingErrorHandler; -import org.springframework.integration.channel.NullChannel; -import org.springframework.integration.channel.PublishSubscribeChannel; -import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * @author Mark Fisher - * @since 1.0.3 - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration -public class DefaultConfigurationTests { - - @Autowired - private ApplicationContext context; - - - @Test - public void verifyErrorChannel() { - Object errorChannel = context.getBean("errorChannel"); - assertNotNull(errorChannel); - assertEquals(PublishSubscribeChannel.class, errorChannel.getClass()); - } - - @Test - public void verifyNullChannel() { - Object nullChannel = context.getBean("nullChannel"); - assertNotNull(nullChannel); - assertEquals(NullChannel.class, nullChannel.getClass()); - } - - @Test - public void verifyTaskScheduler() { - Object taskScheduler = context.getBean(IntegrationContextUtils.TASK_SCHEDULER_BEAN_NAME); - assertEquals(ThreadPoolTaskScheduler.class, taskScheduler.getClass()); - Object errorHandler = new DirectFieldAccessor(taskScheduler).getPropertyValue("errorHandler"); - assertEquals(MessagePublishingErrorHandler.class, errorHandler.getClass()); - Object defaultErrorChannel = new DirectFieldAccessor(errorHandler).getPropertyValue("defaultErrorChannel"); - assertEquals(context.getBean(IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME), defaultErrorChannel); - } - -} diff --git a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParserTests.java b/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParserTests.java deleted file mode 100644 index 15f8943097..0000000000 --- a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParserTests.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2002-2010 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.httpinvoker.config; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -import org.springframework.beans.DirectFieldAccessor; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.httpinvoker.HttpInvokerInboundGateway; - -/** - * @author Mark Fisher - */ -@SuppressWarnings("deprecation") -public class HttpInvokerInboundGatewayParserTests { - - @Test - public void gatewayWithDefaults() { - ApplicationContext context = new ClassPathXmlApplicationContext( - "httpInvokerInboundGatewayParserTests.xml", this.getClass()); - MessageChannel channel = (MessageChannel) context.getBean("testChannel"); - HttpInvokerInboundGateway gateway = (HttpInvokerInboundGateway) context.getBean("gatewayWithDefaults"); - DirectFieldAccessor accessor = new DirectFieldAccessor(gateway); - assertEquals(true, accessor.getPropertyValue("expectReply")); - assertEquals(channel, accessor.getPropertyValue("requestChannel")); - MessagingTemplate template = (MessagingTemplate) - accessor.getPropertyValue("messagingTemplate"); - DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template); - assertEquals(1000L, templateAccessor.getPropertyValue("sendTimeout")); - assertEquals(1000L, templateAccessor.getPropertyValue("receiveTimeout")); - } - - @Test - public void gatewayWithName() { - ApplicationContext context = new ClassPathXmlApplicationContext( - "httpInvokerInboundGatewayParserTests.xml", this.getClass()); - MessageChannel channel = (MessageChannel) context.getBean("testChannel"); - HttpInvokerInboundGateway gateway = (HttpInvokerInboundGateway) context.getBean("/gateway/with/name"); - DirectFieldAccessor accessor = new DirectFieldAccessor(gateway); - assertEquals(true, accessor.getPropertyValue("expectReply")); - assertEquals(channel, accessor.getPropertyValue("requestChannel")); - MessagingTemplate template = (MessagingTemplate) - accessor.getPropertyValue("messagingTemplate"); - DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template); - assertEquals(1000L, templateAccessor.getPropertyValue("sendTimeout")); - assertEquals(1000L, templateAccessor.getPropertyValue("receiveTimeout")); - } - - @Test - public void gatewayWithCustomProperties() { - ApplicationContext context = new ClassPathXmlApplicationContext( - "httpInvokerInboundGatewayParserTests.xml", this.getClass()); - MessageChannel channel = (MessageChannel) context.getBean("testChannel"); - HttpInvokerInboundGateway gateway = (HttpInvokerInboundGateway) context.getBean("gatewayWithCustomProperties"); - DirectFieldAccessor accessor = new DirectFieldAccessor(gateway); - assertEquals(false, accessor.getPropertyValue("expectReply")); - assertEquals(channel, accessor.getPropertyValue("requestChannel")); - MessagingTemplate template = (MessagingTemplate) - accessor.getPropertyValue("messagingTemplate"); - DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template); - assertEquals(123L, templateAccessor.getPropertyValue("sendTimeout")); - assertEquals(456L, templateAccessor.getPropertyValue("receiveTimeout")); - } - -} diff --git a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/HttpInvokerOutboundGatewayParserTests.java b/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/HttpInvokerOutboundGatewayParserTests.java deleted file mode 100644 index 8999c5f58e..0000000000 --- a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/HttpInvokerOutboundGatewayParserTests.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2002-2010 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.httpinvoker.config; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -import org.springframework.beans.DirectFieldAccessor; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.endpoint.EventDrivenConsumer; -import org.springframework.integration.httpinvoker.HttpInvokerOutboundGateway; - -/** - * @author Mark Fisher - */ -@SuppressWarnings("deprecation") -public class HttpInvokerOutboundGatewayParserTests { - - @Test - public void testHttpInvokerOutboundGatewayParser() { - ApplicationContext context = new ClassPathXmlApplicationContext( - "httpInvokerOutboundGatewayParserTests.xml", this.getClass()); - Object endpoint = context.getBean("gateway"); - assertEquals(EventDrivenConsumer.class, endpoint.getClass()); - Object gateway = new DirectFieldAccessor(endpoint).getPropertyValue("handler"); - assertEquals(HttpInvokerOutboundGateway.class, gateway.getClass()); - } - -} diff --git a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/httpInvokerInboundGatewayParserTests.xml b/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/httpInvokerInboundGatewayParserTests.xml deleted file mode 100644 index 3d3900f39e..0000000000 --- a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/httpInvokerInboundGatewayParserTests.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/httpInvokerOutboundGatewayParserTests.xml b/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/httpInvokerOutboundGatewayParserTests.xml deleted file mode 100644 index 846883acc2..0000000000 --- a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/httpInvokerOutboundGatewayParserTests.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/spring-integration-httpinvoker/src/test/resources/.svnignore b/spring-integration-httpinvoker/src/test/resources/.svnignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/spring-integration-httpinvoker/template.mf b/spring-integration-httpinvoker/template.mf deleted file mode 100644 index 1ab28124e4..0000000000 --- a/spring-integration-httpinvoker/template.mf +++ /dev/null @@ -1,16 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration.httpinvoker -Bundle-Name: Spring Integration HttpInvoker Support -Bundle-Vendor: SpringSource -Bundle-Version: ${version} -Bundle-ManifestVersion: 2 -Import-Template: - org.springframework.integration.*;version="[2.1.0, 2.1.1)", - org.springframework.beans.*;version="[3.1.0, 4.0.0)", - org.springframework.context;version="[3.1.0, 4.0.0)", - org.springframework.core.*;version="[3.1.0, 4.0.0)", - org.springframework.remoting.*;version="[3.1.0, 4.0.0)", - org.springframework.util;version="[3.1.0, 4.0.0)", - org.springframework.web;version="[3.1.0, 4.0.0)";resolution:=optional, - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional, - org.w3c.dom.*;version="0" diff --git a/spring-integration-ip/pom.xml b/spring-integration-ip/pom.xml index ed9e529cca..8fa6faa639 100644 --- a/spring-integration-ip/pom.xml +++ b/spring-integration-ip/pom.xml @@ -130,18 +130,6 @@ 3.1.0.M2 compile - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework.integration - spring-integration-stream - 2.1.0.BUILD-SNAPSHOT - runtime - org.hamcrest hamcrest-all @@ -166,12 +154,24 @@ 2.2 test + + org.springframework.integration + spring-integration-stream + 2.1.0.BUILD-SNAPSHOT + runtime + junit junit-dep 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-jdbc/pom.xml b/spring-integration-jdbc/pom.xml index ebe428ba83..5f3b5780fe 100644 --- a/spring-integration-jdbc/pom.xml +++ b/spring-integration-jdbc/pom.xml @@ -116,12 +116,6 @@ 2.1.0.BUILD-SNAPSHOT test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-context @@ -212,6 +206,12 @@ 1.6.8 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-jms/pom.xml b/spring-integration-jms/pom.xml index 9743e8eeae..50278979e8 100644 --- a/spring-integration-jms/pom.xml +++ b/spring-integration-jms/pom.xml @@ -112,12 +112,6 @@ 2.1.0.BUILD-SNAPSHOT test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-context @@ -196,6 +190,12 @@ 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-jmx/pom.xml b/spring-integration-jmx/pom.xml index a3726b7e3f..9ac1d463e6 100644 --- a/spring-integration-jmx/pom.xml +++ b/spring-integration-jmx/pom.xml @@ -106,12 +106,6 @@ 2.1.0.BUILD-SNAPSHOT test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-context @@ -172,6 +166,12 @@ 1.6.8 compile + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-mail/pom.xml b/spring-integration-mail/pom.xml index 82b685b0db..305656b28e 100644 --- a/spring-integration-mail/pom.xml +++ b/spring-integration-mail/pom.xml @@ -106,12 +106,6 @@ 2.1.0.BUILD-SNAPSHOT test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - cglib cglib-nodep @@ -167,6 +161,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + javax.mail mail diff --git a/spring-integration-rmi/pom.xml b/spring-integration-rmi/pom.xml index ed8333eadb..7a22065d6d 100644 --- a/spring-integration-rmi/pom.xml +++ b/spring-integration-rmi/pom.xml @@ -136,12 +136,6 @@ 3.1.0.M2 compile - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.hamcrest hamcrest-all @@ -172,6 +166,12 @@ 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-security/pom.xml b/spring-integration-security/pom.xml index 5729d313a9..bb8abf628e 100644 --- a/spring-integration-security/pom.xml +++ b/spring-integration-security/pom.xml @@ -100,12 +100,6 @@ - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework.security spring-security-core @@ -184,6 +178,12 @@ 3.1.0.M2 compile + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-sftp/pom.xml b/spring-integration-sftp/pom.xml index da688cf31f..8aef64fbef 100644 --- a/spring-integration-sftp/pom.xml +++ b/spring-integration-sftp/pom.xml @@ -112,12 +112,6 @@ 2.1.0.BUILD-SNAPSHOT test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - log4j log4j @@ -130,6 +124,12 @@ 2.2 test + + org.springframework.integration + spring-integration-stream + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymock @@ -148,6 +148,12 @@ 3.1.0.M2 test + + org.springframework.integration + spring-integration-file + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-context-support @@ -167,30 +173,24 @@ 1.1 test - - org.springframework.integration - spring-integration-stream - 2.1.0.BUILD-SNAPSHOT - compile - org.mockito mockito-all 1.8.4 test - - org.springframework.integration - spring-integration-file - 2.1.0.BUILD-SNAPSHOT - compile - junit junit-dep 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-stream/pom.xml b/spring-integration-stream/pom.xml index d98f15e3ff..a852578392 100644 --- a/spring-integration-stream/pom.xml +++ b/spring-integration-stream/pom.xml @@ -124,12 +124,6 @@ 3.1.0.M2 compile - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.hamcrest hamcrest-all @@ -160,6 +154,12 @@ 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-test/pom.xml b/spring-integration-test/pom.xml index c4dc085ccf..7c46aee3a9 100644 --- a/spring-integration-test/pom.xml +++ b/spring-integration-test/pom.xml @@ -124,12 +124,6 @@ 3.1.0.M2 compile - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.hamcrest hamcrest-all @@ -160,6 +154,12 @@ 4.8.2 compile + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-twitter/pom.xml b/spring-integration-twitter/pom.xml index 83d7523b08..31d7bdee9e 100644 --- a/spring-integration-twitter/pom.xml +++ b/spring-integration-twitter/pom.xml @@ -106,12 +106,6 @@ 2.1.0.BUILD-SNAPSHOT test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.twitter4j twitter4j-core @@ -173,6 +167,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml index b77ca8f67e..aa8d5a7c87 100644 --- a/spring-integration-ws/pom.xml +++ b/spring-integration-ws/pom.xml @@ -113,12 +113,6 @@ compile true - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - log4j log4j @@ -205,6 +199,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-xml/pom.xml b/spring-integration-xml/pom.xml index 80191398f6..0edc9c5989 100644 --- a/spring-integration-xml/pom.xml +++ b/spring-integration-xml/pom.xml @@ -118,12 +118,6 @@ 1.2 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-context @@ -172,18 +166,18 @@ 3.1.0.M2 compile - - org.springframework - spring-test - 3.1.0.M2 - test - stax stax-api 1.0.1 test + + org.springframework + spring-test + 3.1.0.M2 + test + javax.activation activation @@ -209,6 +203,12 @@ 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-xmpp/pom.xml b/spring-integration-xmpp/pom.xml index dc8c77211e..22c7c1d792 100644 --- a/spring-integration-xmpp/pom.xml +++ b/spring-integration-xmpp/pom.xml @@ -106,12 +106,6 @@ 2.1.0.BUILD-SNAPSHOT test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - cglib cglib-nodep @@ -124,6 +118,12 @@ 1.2.12 test + + org.springframework.integration + spring-integration-stream + 2.1.0.BUILD-SNAPSHOT + test + org.easymock easymock @@ -167,12 +167,6 @@ 3.1.0 compile - - org.springframework.integration - spring-integration-stream - 2.1.0.BUILD-SNAPSHOT - test - org.hamcrest hamcrest-all @@ -191,6 +185,12 @@ 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8