diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd index 61c714c11b..98ba17c6d8 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd +++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd @@ -65,102 +65,6 @@ - - - - Defines a JMS-based source channel adapter. - - - - - - - - - - - - - - - Defines a JMS-based gateway adapter. - - - - - - - - - - - - - - - - - - - - - - - - - Defines a target that sends JMS Messages. - - - - - - - - - - - - - - - Common configuration for inbound JMS-based adapters. - - - - - - - - - - - - - - - - - - - - - - - - - Common configuration for JMS-based adapters. - - - - - - - - - diff --git a/org.springframework.integration.adapter/src/main/resources/META-INF/spring-integration.parsers b/org.springframework.integration.adapter/src/main/resources/META-INF/spring-integration.parsers index 739e597bd2..2fce06ed96 100644 --- a/org.springframework.integration.adapter/src/main/resources/META-INF/spring-integration.parsers +++ b/org.springframework.integration.adapter/src/main/resources/META-INF/spring-integration.parsers @@ -3,9 +3,6 @@ file-target=org.springframework.integration.adapter.file.config.FileTargetParser ftp-source=org.springframework.integration.adapter.ftp.config.FtpSourceParser httpinvoker-gateway=org.springframework.integration.adapter.httpinvoker.config.HttpInvokerGatewayParser httpinvoker-handler=org.springframework.integration.adapter.httpinvoker.config.HttpInvokerHandlerParser -jms-gateway=org.springframework.integration.adapter.jms.config.JmsGatewayParser -jms-source=org.springframework.integration.adapter.jms.config.JmsSourceParser -jms-target=org.springframework.integration.adapter.jms.config.JmsTargetParser mail-target=org.springframework.integration.adapter.mail.config.MailTargetParser polling-mail-source=org.springframework.integration.adapter.mail.config.PollingMailSourceParser imap-idle-mail-source=org.springframework.integration.adapter.mail.config.SubscribableImapIdleMailSourceParser diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithContainerSettings.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithContainerSettings.xml deleted file mode 100644 index 44da4e1999..0000000000 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithContainerSettings.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.integration.jms/.classpath b/org.springframework.integration.jms/.classpath index c3684a5a4c..c61c61bfdb 100644 --- a/org.springframework.integration.jms/.classpath +++ b/org.springframework.integration.jms/.classpath @@ -4,12 +4,15 @@ + + + diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/AbstractJmsTemplateBasedAdapter.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/AbstractJmsTemplateBasedAdapter.java similarity index 98% rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/AbstractJmsTemplateBasedAdapter.java rename to org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/AbstractJmsTemplateBasedAdapter.java index f8c9b1ff63..cb2d3a9981 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/AbstractJmsTemplateBasedAdapter.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/AbstractJmsTemplateBasedAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms; +package org.springframework.integration.jms; import javax.jms.ConnectionFactory; import javax.jms.Destination; diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java similarity index 97% rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java rename to org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java index ac9a02a2b3..2dc5a6e877 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms; +package org.springframework.integration.jms; import javax.jms.MessageListener; diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapper.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java similarity index 98% rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapper.java rename to org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java index b9a8368361..8d2887022b 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapper.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms; +package org.springframework.integration.jms; import java.util.Arrays; import java.util.Enumeration; diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/HeaderMappingMessageConverter.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/HeaderMappingMessageConverter.java similarity index 98% rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/HeaderMappingMessageConverter.java rename to org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/HeaderMappingMessageConverter.java index 80bc0a9b2c..1927020df3 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/HeaderMappingMessageConverter.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/HeaderMappingMessageConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms; +package org.springframework.integration.jms; import java.util.Map; diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsGateway.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsGateway.java similarity index 99% rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsGateway.java rename to org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsGateway.java index 3f5ed697ec..2702eb201b 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsGateway.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsGateway.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms; +package org.springframework.integration.jms; import javax.jms.ConnectionFactory; import javax.jms.Destination; diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsHeaders.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsHeaders.java similarity index 96% rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsHeaders.java rename to org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsHeaders.java index 239f42c5d2..98f9f57ba4 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsHeaders.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsHeaders.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms; +package org.springframework.integration.jms; /** * Pre-defined names and prefixes to be used for setting and/or retrieving JMS attributes diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsSource.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSource.java similarity index 97% rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsSource.java rename to org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSource.java index e1e86aeb9c..93a224233e 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsSource.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms; +package org.springframework.integration.jms; import javax.jms.ConnectionFactory; import javax.jms.Destination; diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsTarget.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsTarget.java similarity index 95% rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsTarget.java rename to org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsTarget.java index d8f9b468fd..bab464c6f2 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsTarget.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsTarget.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms; +package org.springframework.integration.jms; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageConsumer; diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsAdapterParserUtils.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsAdapterParserUtils.java similarity index 98% rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsAdapterParserUtils.java rename to org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsAdapterParserUtils.java index 952457283c..d525a8d02f 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsAdapterParserUtils.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsAdapterParserUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms.config; +package org.springframework.integration.jms.config; import javax.jms.Session; diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsGatewayParser.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsGatewayParser.java similarity index 97% rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsGatewayParser.java rename to org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsGatewayParser.java index 6efd6eaa2b..4937d27992 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsGatewayParser.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsGatewayParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms.config; +package org.springframework.integration.jms.config; import javax.jms.Session; @@ -24,8 +24,8 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.adapter.jms.JmsGateway; import org.springframework.integration.config.IntegrationNamespaceUtils; +import org.springframework.integration.jms.JmsGateway; import org.springframework.util.StringUtils; /** diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsNamespaceHandler.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsNamespaceHandler.java new file mode 100644 index 0000000000..dd93296c6b --- /dev/null +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsNamespaceHandler.java @@ -0,0 +1,34 @@ +/* + * Copyright 2002-2008 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.jms.config; + +import org.springframework.beans.factory.xml.NamespaceHandlerSupport; + +/** + * Namespace handler for Spring Integration's jms namespace. + * + * @author Mark Fisher + */ +public class JmsNamespaceHandler extends NamespaceHandlerSupport { + + public void init() { + this.registerBeanDefinitionParser("jms-gateway", new JmsGatewayParser()); + this.registerBeanDefinitionParser("jms-source", new JmsSourceParser()); + this.registerBeanDefinitionParser("jms-target", new JmsTargetParser()); + } + +} diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsSourceParser.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsSourceParser.java similarity index 96% rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsSourceParser.java rename to org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsSourceParser.java index aa9e94517b..82713ccd08 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsSourceParser.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsSourceParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms.config; +package org.springframework.integration.jms.config; import org.w3c.dom.Element; @@ -23,7 +23,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.adapter.jms.JmsSource; +import org.springframework.integration.jms.JmsSource; import org.springframework.util.StringUtils; /** diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsTargetParser.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsTargetParser.java similarity index 96% rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsTargetParser.java rename to org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsTargetParser.java index a6f321fafd..56f63e8a94 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsTargetParser.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsTargetParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms.config; +package org.springframework.integration.jms.config; import org.w3c.dom.Element; @@ -22,7 +22,7 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.adapter.jms.JmsTarget; +import org.springframework.integration.jms.JmsTarget; import org.springframework.util.StringUtils; /** diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd new file mode 100644 index 0000000000..d3450bc257 --- /dev/null +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd @@ -0,0 +1,114 @@ + + + + + + + + + + + + + Defines a JMS-based source channel adapter. + + + + + + + + + + + + + + + Defines a JMS-based gateway adapter. + + + + + + + + + + + + + + + + + + + + + + + + + Defines a target that sends JMS Messages. + + + + + + + + + + + + + + + Common configuration for inbound JMS-based adapters. + + + + + + + + + + + + + + + + + + + + + + + + + Common configuration for JMS-based adapters. + + + + + + + + + + \ No newline at end of file diff --git a/org.springframework.integration.jms/src/main/resources/META-INF/spring.handlers b/org.springframework.integration.jms/src/main/resources/META-INF/spring.handlers new file mode 100644 index 0000000000..0e33183bd5 --- /dev/null +++ b/org.springframework.integration.jms/src/main/resources/META-INF/spring.handlers @@ -0,0 +1 @@ +http\://www.springframework.org/schema/integration/jms=org.springframework.integration.jms.config.JmsNamespaceHandler \ No newline at end of file diff --git a/org.springframework.integration.jms/src/main/resources/META-INF/spring.schemas b/org.springframework.integration.jms/src/main/resources/META-INF/spring.schemas new file mode 100644 index 0000000000..6923abfedc --- /dev/null +++ b/org.springframework.integration.jms/src/main/resources/META-INF/spring.schemas @@ -0,0 +1 @@ +http\://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd=org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd \ No newline at end of file diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapperTests.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java similarity index 98% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapperTests.java rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java index 158aa82a46..d54cd2c673 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapperTests.java +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms; +package org.springframework.integration.jms; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -27,6 +27,9 @@ import javax.jms.Destination; import javax.jms.JMSException; import org.junit.Test; + +import org.springframework.integration.jms.DefaultJmsHeaderMapper; +import org.springframework.integration.jms.JmsHeaders; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubConnection.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubConnection.java similarity index 97% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubConnection.java rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubConnection.java index abec6a3bef..c1c6a52164 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubConnection.java +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubConnection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms; +package org.springframework.integration.jms; import javax.jms.Connection; import javax.jms.ConnectionConsumer; diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubConsumer.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubConsumer.java similarity index 96% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubConsumer.java rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubConsumer.java index e659ef9f14..4e69c78f26 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubConsumer.java +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubConsumer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms; +package org.springframework.integration.jms; import javax.jms.JMSException; import javax.jms.Message; diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubDestination.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubDestination.java similarity index 93% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubDestination.java rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubDestination.java index e23331e733..40a942d537 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubDestination.java +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubDestination.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms; +package org.springframework.integration.jms; import javax.jms.Destination; diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubSession.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubSession.java similarity index 98% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubSession.java rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubSession.java index dc6088e76e..a31b49ad3e 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubSession.java +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubSession.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms; +package org.springframework.integration.jms; import java.io.Serializable; diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubTextMessage.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubTextMessage.java similarity index 98% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubTextMessage.java rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubTextMessage.java index 4ed67a32e5..90dd8a55bf 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubTextMessage.java +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubTextMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms; +package org.springframework.integration.jms; import java.util.Enumeration; import java.util.concurrent.ConcurrentHashMap; diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsGatewayParserTests.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsGatewayParserTests.java similarity index 98% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsGatewayParserTests.java rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsGatewayParserTests.java index f84c6f8243..6b275d8063 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsGatewayParserTests.java +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsGatewayParserTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms.config; +package org.springframework.integration.jms.config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -26,8 +26,8 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.adapter.jms.JmsGateway; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.jms.JmsGateway; import org.springframework.integration.message.Message; import org.springframework.jms.connection.JmsTransactionManager; import org.springframework.jms.listener.AbstractMessageListenerContainer; diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsSourceParserTests.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsSourceParserTests.java similarity index 97% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsSourceParserTests.java rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsSourceParserTests.java index a929b441cb..6775d498c9 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsSourceParserTests.java +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsSourceParserTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms.config; +package org.springframework.integration.jms.config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -25,8 +25,8 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.adapter.jms.JmsSource; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.jms.JmsSource; import org.springframework.integration.message.Message; /** diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsTargetParserTests.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsTargetParserTests.java similarity index 96% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsTargetParserTests.java rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsTargetParserTests.java index d50a2dbe77..fe14a8d6a3 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsTargetParserTests.java +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsTargetParserTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms.config; +package org.springframework.integration.jms.config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -26,7 +26,7 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.adapter.MessageHeaderMapper; -import org.springframework.integration.adapter.jms.JmsTarget; +import org.springframework.integration.jms.JmsTarget; /** * @author Mark Fisher diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageConverter.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/TestMessageConverter.java similarity index 95% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageConverter.java rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/TestMessageConverter.java index 66148cc481..ace41e2288 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageConverter.java +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/TestMessageConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms.config; +package org.springframework.integration.jms.config; import javax.jms.JMSException; import javax.jms.Message; diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageHeaderMapper.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/TestMessageHeaderMapper.java similarity index 95% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageHeaderMapper.java rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/TestMessageHeaderMapper.java index 8ef71a3ac3..89caffadd5 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageHeaderMapper.java +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/TestMessageHeaderMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.jms.config; +package org.springframework.integration.jms.config; import java.util.HashMap; import java.util.Map; diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayTransactionManagerTests.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml similarity index 54% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayTransactionManagerTests.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml index dabe2ee604..43c6990098 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayTransactionManagerTests.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml @@ -1,24 +1,27 @@ - + http://www.springframework.org/schema/integration/spring-integration-1.0.xsd + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + @@ -26,12 +29,12 @@ - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml similarity index 60% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml index 979a2d0e5e..8cd68141dd 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml @@ -1,27 +1,30 @@ - + http://www.springframework.org/schema/integration/spring-integration-1.0.xsd + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml similarity index 59% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml index 5463f619a4..ac8c8f21ef 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml @@ -2,23 +2,26 @@ + http://www.springframework.org/schema/integration/spring-integration-1.0.xsd + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryOnly.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml similarity index 63% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryOnly.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml index 58d3665816..94eae4c2e8 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryOnly.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml @@ -2,22 +2,25 @@ + http://www.springframework.org/schema/integration/spring-integration-1.0.xsd + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml new file mode 100644 index 0000000000..8fd6fa5888 --- /dev/null +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithDefaultConnectionFactory.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml similarity index 63% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithDefaultConnectionFactory.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml index a5850cb612..c6b14d9aff 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithDefaultConnectionFactory.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml @@ -2,22 +2,25 @@ + http://www.springframework.org/schema/integration/spring-integration-1.0.xsd + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithEmptyConnectionFactory.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml similarity index 57% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithEmptyConnectionFactory.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml index c072501ef1..7b98dc7966 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithEmptyConnectionFactory.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml @@ -2,16 +2,19 @@ + http://www.springframework.org/schema/integration/spring-integration-1.0.xsd + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithMessageConverter.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml similarity index 54% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithMessageConverter.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml index 3b50f36dc6..cd4080b27c 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithMessageConverter.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml @@ -2,31 +2,34 @@ + http://www.springframework.org/schema/integration/spring-integration-1.0.xsd + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewaysWithExpectReplyAttributes.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExpectReplyAttributes.xml similarity index 50% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewaysWithExpectReplyAttributes.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExpectReplyAttributes.xml index 1b6a7af7ba..5b8ae9a80d 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewaysWithExpectReplyAttributes.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExpectReplyAttributes.xml @@ -2,10 +2,13 @@ + http://www.springframework.org/schema/integration/spring-integration-1.0.xsd + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> @@ -13,28 +16,28 @@ - + - + - + - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceEndpoint.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceEndpoint.xml similarity index 75% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceEndpoint.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceEndpoint.xml index 6f8bca8b9d..f6a540c7e9 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceEndpoint.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceEndpoint.xml @@ -2,10 +2,13 @@ + http://www.springframework.org/schema/integration/spring-integration-1.0.xsd + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> @@ -17,7 +20,7 @@ - + @@ -26,7 +29,7 @@ - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestination.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithConnectionFactoryAndDestination.xml similarity index 55% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestination.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithConnectionFactoryAndDestination.xml index 22a477f1e8..f2dc964a66 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestination.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithConnectionFactoryAndDestination.xml @@ -1,24 +1,24 @@ + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestinationName.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithConnectionFactoryAndDestinationName.xml similarity index 53% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestinationName.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithConnectionFactoryAndDestinationName.xml index 4f02f499ec..2acadcc0c0 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestinationName.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithConnectionFactoryAndDestinationName.xml @@ -1,19 +1,19 @@ + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryOnly.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithConnectionFactoryOnly.xml similarity index 58% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryOnly.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithConnectionFactoryOnly.xml index cc84238006..6e1e07e3c9 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryOnly.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithConnectionFactoryOnly.xml @@ -1,17 +1,17 @@ + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationAndDefaultConnectionFactory.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationAndDefaultConnectionFactory.xml similarity index 60% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationAndDefaultConnectionFactory.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationAndDefaultConnectionFactory.xml index 3f60385461..6eeba9de12 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationAndDefaultConnectionFactory.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationAndDefaultConnectionFactory.xml @@ -1,19 +1,19 @@ + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameAndDefaultConnectionFactory.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationNameAndDefaultConnectionFactory.xml similarity index 58% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameAndDefaultConnectionFactory.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationNameAndDefaultConnectionFactory.xml index d28cbb76c0..cf0183e55b 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameAndDefaultConnectionFactory.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationNameAndDefaultConnectionFactory.xml @@ -1,17 +1,17 @@ + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameOnly.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationNameOnly.xml similarity index 50% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameOnly.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationNameOnly.xml index 3ecb8db83f..4092d60e02 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameOnly.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationNameOnly.xml @@ -1,12 +1,12 @@ + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationOnly.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationOnly.xml similarity index 54% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationOnly.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationOnly.xml index 0b23445fc7..bdd21848bf 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationOnly.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationOnly.xml @@ -1,14 +1,14 @@ + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithHeaderMapper.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithHeaderMapper.xml similarity index 60% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithHeaderMapper.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithHeaderMapper.xml index 71097a93a6..8d7a146ded 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithHeaderMapper.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithHeaderMapper.xml @@ -1,15 +1,15 @@ + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + @@ -18,7 +18,7 @@ - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithJmsTemplate.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithJmsTemplate.xml similarity index 67% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithJmsTemplate.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithJmsTemplate.xml index 9a96444d8a..10d3795d4d 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithJmsTemplate.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithJmsTemplate.xml @@ -1,13 +1,13 @@ + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + @@ -16,7 +16,7 @@ - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestination.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithConnectionFactoryAndDestination.xml similarity index 56% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestination.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithConnectionFactoryAndDestination.xml index 892d81da6d..e1ddefbb68 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestination.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithConnectionFactoryAndDestination.xml @@ -1,24 +1,24 @@ + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestinationName.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithConnectionFactoryAndDestinationName.xml similarity index 54% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestinationName.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithConnectionFactoryAndDestinationName.xml index 4c4bf52f81..daa0782829 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestinationName.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithConnectionFactoryAndDestinationName.xml @@ -1,19 +1,19 @@ + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithDefaultConnectionFactory.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithDefaultConnectionFactory.xml similarity index 60% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithDefaultConnectionFactory.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithDefaultConnectionFactory.xml index 60f241e5d8..e237f3f745 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithDefaultConnectionFactory.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithDefaultConnectionFactory.xml @@ -1,22 +1,22 @@ + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithEmptyConnectionFactory.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithEmptyConnectionFactory.xml similarity index 50% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithEmptyConnectionFactory.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithEmptyConnectionFactory.xml index 3a3309b383..eaccecfa18 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithEmptyConnectionFactory.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithEmptyConnectionFactory.xml @@ -1,16 +1,16 @@ + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithHeaderMapper.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithHeaderMapper.xml similarity index 53% rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithHeaderMapper.xml rename to org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithHeaderMapper.xml index a7534b6916..e27fcd107b 100644 --- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithHeaderMapper.xml +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithHeaderMapper.xml @@ -1,24 +1,24 @@ + http://www.springframework.org/schema/integration/jms + http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd"> - + - + - + - +