Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrated JMS adapter and parser code from "org.springframework.integration.adapter" to the new "org.springframework.integration.jms" module, and added a dedicated spring-integration-jms-1.0.xsd schema and JmsNamespaceHandler.

Browse Source
This commit is contained in:
Mark Fisher
2008-09-20 15:37:21 +00:00
parent c0e134c4a9
commit 82630b96dc
55 changed files with 417 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
View File

@@ -65,102 +65,6 @@
</xsd:complexType>
</xsd:element>
<xsd:element name="jms-source">
<xsd:annotation>
<xsd:documentation>
Defines a JMS-based source channel adapter.
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="jmsInboundAdapterType">
<xsd:attribute name="header-mapper" type="xsd:string"/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="jms-gateway">
<xsd:annotation>
<xsd:documentation>
Defines a JMS-based gateway adapter.
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="jmsInboundAdapterType">
<xsd:attribute name="message-converter" type="xsd:string"/>
<xsd:attribute name="expect-reply" type="xsd:boolean" default="false"/>
<xsd:attribute name="request-channel" type="xsd:string" use="required"/>
<xsd:attribute name="reply-channel" type="xsd:string"/>
<xsd:attribute name="request-timeout" type="xsd:long"/>
<xsd:attribute name="reply-timeout" type="xsd:long"/>
<xsd:attribute name="transaction-manager" type="xsd:string"/>
<xsd:attribute name="concurrent-consumers" type="xsd:string"/>
<xsd:attribute name="max-concurrent-consumers" type="xsd:string"/>
<xsd:attribute name="max-messages-per-task" type="xsd:string"/>
<xsd:attribute name="idle-task-execution-limit" type="xsd:string"/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="jms-target">
<xsd:annotation>
<xsd:documentation>
Defines a target that sends JMS Messages.
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="jmsAdapterType">
<xsd:attribute name="header-mapper" type="xsd:string"/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:complexType name="jmsInboundAdapterType">
<xsd:annotation>
<xsd:documentation>
Common configuration for inbound JMS-based adapters.
</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="jmsAdapterType">
<xsd:attribute name="acknowledge" default="auto">
<xsd:annotation>
<xsd:documentation><![CDATA[
The native JMS acknowledge mode: "auto", "client", "dups-ok" or "transacted".
The latter effectively activates a locally transacted Session.
]]></xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="auto"/>
<xsd:enumeration value="client"/>
<xsd:enumeration value="dups-ok"/>
<xsd:enumeration value="transacted"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="jmsAdapterType">
<xsd:annotation>
<xsd:documentation>
Common configuration for JMS-based adapters.
</xsd:documentation>
</xsd:annotation>
<xsd:attribute name="id" type="xsd:string"/>
<xsd:attribute name="jms-template" type="xsd:string"/>
<xsd:attribute name="connection-factory" type="xsd:string"/>
<xsd:attribute name="destination" type="xsd:string"/>
<xsd:attribute name="destination-name" type="xsd:string"/>
</xsd:complexType>
<xsd:element name="rmi-gateway">
<xsd:complexType>
<xsd:annotation>

3
org.springframework.integration.adapter/src/main/resources/META-INF/spring-integration.parsers
View File

@@ -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

48
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithContainerSettings.xml
View File

@@ -1,48 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
<si:message-bus auto-startup="false"/>
<si:channel id="requestChannel">
<si:queue capacity="10"/>
</si:channel>
<si:jms-gateway id="gatewayWithConcurrentConsumers"
connection-factory="testConnectionFactory"
request-channel="requestChannel"
destination-name="test"
concurrent-consumers="3"/>
<si:jms-gateway id="gatewayWithMaxConcurrentConsumers"
connection-factory="testConnectionFactory"
request-channel="requestChannel"
destination-name="test"
max-concurrent-consumers="22"/>
<si:jms-gateway id="gatewayWithMaxMessagesPerTask"
connection-factory="testConnectionFactory"
request-channel="requestChannel"
destination-name="test"
max-messages-per-task="99"/>
<si:jms-gateway id="gatewayWithIdleTaskExecutionLimit"
connection-factory="testConnectionFactory"
request-channel="requestChannel"
destination-name="test"
idle-task-execution-limit="7"/>
<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<constructor-arg value="message-driven-test"/>
</bean>
</constructor-arg>
</bean>
</beans>

3
org.springframework.integration.jms/.classpath
View File

@@ -4,12 +4,15 @@
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-1.1.0.jar" sourcepath="/IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-sources-1.1.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.5.A/org.springframework.beans-2.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.5.A/org.springframework.beans-sources-2.5.5.A.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.5.A/org.springframework.context-2.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.5.A/org.springframework.context-sources-2.5.5.A.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.5.A/org.springframework.core-2.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.5.A/org.springframework.core-sources-2.5.5.A.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.jms/2.5.5.A/org.springframework.jms-2.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.jms/2.5.5.A/org.springframework.jms-sources-2.5.5.A.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/2.5.5.A/org.springframework.transaction-2.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/2.5.5.A/org.springframework.transaction-sources-2.5.5.A.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.adapter"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

2
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/AbstractJmsTemplateBasedAdapter.java → org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/AbstractJmsTemplateBasedAdapter.java
View File

@@ -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;

2
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java → org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.adapter.jms;
package org.springframework.integration.jms;
import javax.jms.MessageListener;

2
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapper.java → org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java
View File

@@ -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;

2
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/HeaderMappingMessageConverter.java → org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/HeaderMappingMessageConverter.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.adapter.jms;
package org.springframework.integration.jms;
import java.util.Map;

2
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsGateway.java → org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsGateway.java
View File

@@ -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;

2
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsHeaders.java → org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsHeaders.java
View File

@@ -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

2
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsSource.java → org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSource.java
View File

@@ -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;

2
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/JmsTarget.java → org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsTarget.java
View File

@@ -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;

2
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsAdapterParserUtils.java → org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsAdapterParserUtils.java
View File

@@ -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;

4
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsGatewayParser.java → org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsGatewayParser.java
View File

@@ -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;
/**

34
org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsNamespaceHandler.java Normal file
View File

@@ -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 <em>jms</em> 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());
}
}

4
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsSourceParser.java → org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsSourceParser.java
View File

@@ -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;
/**

4
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/jms/config/JmsTargetParser.java → org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsTargetParser.java
View File

@@ -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;
/**

114
org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd Normal file
View File

@@ -0,0 +1,114 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://www.springframework.org/schema/integration/jms"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:tool="http://www.springframework.org/schema/tool"
targetNamespace="http://www.springframework.org/schema/integration/jms"
elementFormDefault="qualified"
attributeFormDefault="unqualified">
<xsd:import namespace="http://www.springframework.org/schema/beans"/>
<xsd:import namespace="http://www.springframework.org/schema/tool"/>
<xsd:annotation>
<xsd:documentation><![CDATA[
Defines the configuration elements for Spring Integration's JMS adapters.
]]></xsd:documentation>
</xsd:annotation>
<xsd:element name="jms-source">
<xsd:annotation>
<xsd:documentation>
Defines a JMS-based source channel adapter.
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="jmsInboundAdapterType">
<xsd:attribute name="header-mapper" type="xsd:string"/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="jms-gateway">
<xsd:annotation>
<xsd:documentation>
Defines a JMS-based gateway adapter.
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="jmsInboundAdapterType">
<xsd:attribute name="message-converter" type="xsd:string"/>
<xsd:attribute name="expect-reply" type="xsd:boolean" default="false"/>
<xsd:attribute name="request-channel" type="xsd:string" use="required"/>
<xsd:attribute name="reply-channel" type="xsd:string"/>
<xsd:attribute name="request-timeout" type="xsd:long"/>
<xsd:attribute name="reply-timeout" type="xsd:long"/>
<xsd:attribute name="transaction-manager" type="xsd:string"/>
<xsd:attribute name="concurrent-consumers" type="xsd:string"/>
<xsd:attribute name="max-concurrent-consumers" type="xsd:string"/>
<xsd:attribute name="max-messages-per-task" type="xsd:string"/>
<xsd:attribute name="idle-task-execution-limit" type="xsd:string"/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="jms-target">
<xsd:annotation>
<xsd:documentation>
Defines a target that sends JMS Messages.
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="jmsAdapterType">
<xsd:attribute name="header-mapper" type="xsd:string"/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
<xsd:complexType name="jmsInboundAdapterType">
<xsd:annotation>
<xsd:documentation>
Common configuration for inbound JMS-based adapters.
</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="jmsAdapterType">
<xsd:attribute name="acknowledge" default="auto">
<xsd:annotation>
<xsd:documentation><![CDATA[
The native JMS acknowledge mode: "auto", "client", "dups-ok" or "transacted".
The latter effectively activates a locally transacted Session.
]]></xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="auto"/>
<xsd:enumeration value="client"/>
<xsd:enumeration value="dups-ok"/>
<xsd:enumeration value="transacted"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="jmsAdapterType">
<xsd:annotation>
<xsd:documentation>
Common configuration for JMS-based adapters.
</xsd:documentation>
</xsd:annotation>
<xsd:attribute name="id" type="xsd:string"/>
<xsd:attribute name="jms-template" type="xsd:string"/>
<xsd:attribute name="connection-factory" type="xsd:string"/>
<xsd:attribute name="destination" type="xsd:string"/>
<xsd:attribute name="destination-name" type="xsd:string"/>
</xsd:complexType>
</xsd:schema>

1
org.springframework.integration.jms/src/main/resources/META-INF/spring.handlers Normal file
View File

@@ -0,0 +1 @@
http\://www.springframework.org/schema/integration/jms=org.springframework.integration.jms.config.JmsNamespaceHandler

1
org.springframework.integration.jms/src/main/resources/META-INF/spring.schemas Normal file
View File

@@ -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

5
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapperTests.java → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java
View File

@@ -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;

2
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubConnection.java → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubConnection.java
View File

@@ -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;

2
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubConsumer.java → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubConsumer.java
View File

@@ -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;

2
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubDestination.java → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubDestination.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.adapter.jms;
package org.springframework.integration.jms;
import javax.jms.Destination;

2
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubSession.java → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubSession.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.adapter.jms;
package org.springframework.integration.jms;
import java.io.Serializable;

2
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/StubTextMessage.java → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubTextMessage.java
View File

@@ -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;

4
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsGatewayParserTests.java → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsGatewayParserTests.java
View File

@@ -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;

4
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsSourceParserTests.java → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsSourceParserTests.java
View File

@@ -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;
/**

4
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/JmsTargetParserTests.java → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsTargetParserTests.java
View File

@@ -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

2
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageConverter.java → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/TestMessageConverter.java
View File

@@ -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;

2
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/TestMessageHeaderMapper.java → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/TestMessageHeaderMapper.java
View File

@@ -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;

29
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayTransactionManagerTests.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml
View File

@@ -1,24 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
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">
<si:channel id="requestChannel"/>
<si:jms-gateway id="gatewayWithoutTransactionManager"
connection-factory="testConnectionFactory"
destination="testDestination"
request-channel="requestChannel"/>
<jms:jms-gateway id="gatewayWithoutTransactionManager"
connection-factory="testConnectionFactory"
destination="testDestination"
request-channel="requestChannel"/>
<si:jms-gateway id="gatewayWithTransactionManager"
connection-factory="testConnectionFactory"
destination="testDestination"
request-channel="requestChannel"
transaction-manager="txManager"/>
<jms:jms-gateway id="gatewayWithTransactionManager"
connection-factory="testConnectionFactory"
destination="testDestination"
request-channel="requestChannel"
transaction-manager="txManager"/>
<bean id="txManager" class="org.springframework.jms.connection.JmsTransactionManager">
<property name="connectionFactory" ref="testConnectionFactory"/>
@@ -26,12 +29,12 @@
<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="message-driven-test"/>
</bean>
</constructor-arg>
</bean>
<bean id="testDestination" class="org.springframework.integration.adapter.jms.StubDestination"/>
<bean id="testDestination" class="org.springframework.integration.jms.StubDestination"/>
</beans>

19
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml
View File

@@ -1,27 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
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">
<si:channel id="requestChannel"/>
<si:jms-gateway id="jmsGateway"
connection-factory="testConnectionFactory"
destination="testDestination"
request-channel="requestChannel"/>
<jms:jms-gateway id="jmsGateway"
connection-factory="testConnectionFactory"
destination="testDestination"
request-channel="requestChannel"/>
<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="message-driven-test"/>
</bean>
</constructor-arg>
</bean>
<bean id="testDestination" class="org.springframework.integration.adapter.jms.StubDestination"/>
<bean id="testDestination" class="org.springframework.integration.jms.StubDestination"/>
</beans>

15
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
View File

@@ -2,23 +2,26 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
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">
<si:message-bus/>
<si:channel id="requestChannel"/>
<si:jms-gateway id="jmsGateway"
connection-factory="testConnectionFactory"
destination-name="testDestinationName"
request-channel="requestChannel"/>
<jms:jms-gateway id="jmsGateway"
connection-factory="testConnectionFactory"
destination-name="testDestinationName"
request-channel="requestChannel"/>
<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="message-driven-test"/>
</bean>
</constructor-arg>

13
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryOnly.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml
View File

@@ -2,22 +2,25 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
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">
<si:message-bus/>
<si:channel id="requestChannel"/>
<si:jms-gateway id="jmsGateway"
connection-factory="testConnectionFactory"
request-channel="requestChannel"/>
<jms:jms-gateway id="jmsGateway"
connection-factory="testConnectionFactory"
request-channel="requestChannel"/>
<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="message-driven-test"/>
</bean>
</constructor-arg>

51
org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml Normal file
View File

@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
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">
<si:message-bus auto-startup="false"/>
<si:channel id="requestChannel">
<si:queue capacity="10"/>
</si:channel>
<jms:jms-gateway id="gatewayWithConcurrentConsumers"
connection-factory="testConnectionFactory"
request-channel="requestChannel"
destination-name="test"
concurrent-consumers="3"/>
<jms:jms-gateway id="gatewayWithMaxConcurrentConsumers"
connection-factory="testConnectionFactory"
request-channel="requestChannel"
destination-name="test"
max-concurrent-consumers="22"/>
<jms:jms-gateway id="gatewayWithMaxMessagesPerTask"
connection-factory="testConnectionFactory"
request-channel="requestChannel"
destination-name="test"
max-messages-per-task="99"/>
<jms:jms-gateway id="gatewayWithIdleTaskExecutionLimit"
connection-factory="testConnectionFactory"
request-channel="requestChannel"
destination-name="test"
idle-task-execution-limit="7"/>
<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="message-driven-test"/>
</bean>
</constructor-arg>
</bean>
</beans>

13
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithDefaultConnectionFactory.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
View File

@@ -2,22 +2,25 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
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">
<si:message-bus/>
<si:channel id="requestChannel"/>
<si:jms-gateway id="jmsGateway"
destination-name="testDestinationName"
request-channel="requestChannel"/>
<jms:jms-gateway id="jmsGateway"
destination-name="testDestinationName"
request-channel="requestChannel"/>
<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="message-driven-test"/>
</bean>
</constructor-arg>

13
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithEmptyConnectionFactory.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml
View File

@@ -2,16 +2,19 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
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">
<si:channel id="requestChannel"/>
<si:jms-gateway id="jmsGateway"
connection-factory=""
destination-name="testDestinationName"
request-channel="requestChannel"/>
<jms:jms-gateway id="jmsGateway"
connection-factory=""
destination-name="testDestinationName"
request-channel="requestChannel"/>
</beans>

21
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithMessageConverter.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml
View File

@@ -2,31 +2,34 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
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">
<si:message-bus/>
<si:channel id="requestChannel"/>
<si:jms-gateway id="jmsGateway"
connection-factory="testConnectionFactory"
destination="testDestination"
message-converter="converter"
request-channel="requestChannel"/>
<jms:jms-gateway id="jmsGateway"
connection-factory="testConnectionFactory"
destination="testDestination"
message-converter="converter"
request-channel="requestChannel"/>
<bean id="converter" class="org.springframework.integration.adapter.jms.config.TestMessageConverter"/>
<bean id="converter" class="org.springframework.integration.jms.config.TestMessageConverter"/>
<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="test-message"/>
</bean>
</constructor-arg>
</bean>
<bean id="testDestination" class="org.springframework.integration.adapter.jms.StubDestination"/>
<bean id="testDestination" class="org.springframework.integration.jms.StubDestination"/>
</beans>

31
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewaysWithExpectReplyAttributes.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExpectReplyAttributes.xml
View File

@@ -2,10 +2,13 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
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">
<si:message-bus auto-startup="false"/>
@@ -13,28 +16,28 @@
<si:queue capacity="10"/>
</si:channel>
<si:jms-gateway id="defaultGateway"
destination="testDestination"
request-channel="requestChannel"/>
<jms:jms-gateway id="defaultGateway"
destination="testDestination"
request-channel="requestChannel"/>
<si:jms-gateway id="gatewayNotExpectingReply"
destination="testDestination"
request-channel="requestChannel"
expect-reply="false"/>
<jms:jms-gateway id="gatewayNotExpectingReply"
destination="testDestination"
request-channel="requestChannel"
expect-reply="false"/>
<si:jms-gateway id="gatewayExpectingReply"
destination="testDestination"
request-channel="requestChannel"
expect-reply="true"/>
<jms:jms-gateway id="gatewayExpectingReply"
destination="testDestination"
request-channel="requestChannel"
expect-reply="true"/>
<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="test-message"/>
</bean>
</constructor-arg>
</bean>
<bean id="testDestination" class="org.springframework.integration.adapter.jms.StubDestination"/>
<bean id="testDestination" class="org.springframework.integration.jms.StubDestination"/>
</beans>

9
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceEndpoint.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceEndpoint.xml
View File

@@ -2,10 +2,13 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
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">
<si:message-bus/>
@@ -17,7 +20,7 @@
<si:poller period="5000" initial-delay="0" max-messages-per-poll="1"/>
</si:channel-adapter>
<si:jms-source id="jmsSource" jms-template="jmsTemplate"/>
<jms:jms-source id="jmsSource" jms-template="jmsTemplate"/>
<bean id="jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
<property name="connectionFactory" ref="connectionFactory"/>
@@ -26,7 +29,7 @@
<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="polling-test"/>
</bean>
</constructor-arg>

16
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestination.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithConnectionFactoryAndDestination.xml
View File

@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
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">
<si:jms-source id="jmsSource"
connection-factory="testConnectionFactory"
destination="testDestination"/>
<jms:jms-source id="jmsSource"
connection-factory="testConnectionFactory"
destination="testDestination"/>
<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="polling-test"/>
</bean>
</constructor-arg>
</bean>
<bean id="testDestination" class="org.springframework.integration.adapter.jms.StubDestination"/>
<bean id="testDestination" class="org.springframework.integration.jms.StubDestination"/>
</beans>

14
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryAndDestinationName.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithConnectionFactoryAndDestinationName.xml
View File

@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
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">
<si:jms-source id="jmsSource"
connection-factory="testConnectionFactory"
destination-name="testDestinationName"/>
<jms:jms-source id="jmsSource"
connection-factory="testConnectionFactory"
destination-name="testDestinationName"/>
<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="polling-test"/>
</bean>
</constructor-arg>

10
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithConnectionFactoryOnly.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithConnectionFactoryOnly.xml
View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
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">
<si:jms-source id="adapter" connection-factory="testConnectionFactory"/>
<jms:jms-source id="adapter" connection-factory="testConnectionFactory"/>
<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="polling-test"/>
</bean>
</constructor-arg>

12
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationAndDefaultConnectionFactory.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationAndDefaultConnectionFactory.xml
View File

@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
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">
<si:jms-source id="jmsSource" destination="testDestination"/>
<jms:jms-source id="jmsSource" destination="testDestination"/>
<bean id="testDestination" class="org.springframework.integration.adapter.jms.StubDestination"/>
<bean id="testDestination" class="org.springframework.integration.jms.StubDestination"/>
<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="polling-test"/>
</bean>
</constructor-arg>

10
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameAndDefaultConnectionFactory.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationNameAndDefaultConnectionFactory.xml
View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
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">
<si:jms-source id="jmsSource" destination-name="testDestinationName"/>
<jms:jms-source id="jmsSource" destination-name="testDestinationName"/>
<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="polling-test"/>
</bean>
</constructor-arg>

8
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationNameOnly.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationNameOnly.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
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">
<si:jms-source id="jmsSource" destination-name="testDestinationName"/>
<jms:jms-source id="jmsSource" destination-name="testDestinationName"/>
</beans>

10
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithDestinationOnly.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithDestinationOnly.xml
View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
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">
<si:jms-source id="jmsSource" destination="testDestination"/>
<jms:jms-source id="jmsSource" destination="testDestination"/>
<bean id="testDestination" class="org.springframework.integration.adapter.jms.StubDestination"/>
<bean id="testDestination" class="org.springframework.integration.jms.StubDestination"/>
</beans>

12
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithHeaderMapper.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithHeaderMapper.xml
View File

@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
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">
<si:jms-source id="jmsSource" jms-template="jmsTemplate" header-mapper="mapper"/>
<jms:jms-source id="jmsSource" jms-template="jmsTemplate" header-mapper="mapper"/>
<bean id="mapper" class="org.springframework.integration.adapter.jms.config.TestMessageHeaderMapper"/>
<bean id="mapper" class="org.springframework.integration.jms.config.TestMessageHeaderMapper"/>
<bean id="jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
<property name="connectionFactory" ref="connectionFactory"/>
@@ -18,7 +18,7 @@
<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="polling-test"/>
</bean>
</constructor-arg>

10
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/jmsSourceWithJmsTemplate.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsSourceWithJmsTemplate.xml
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
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">
<si:jms-source id="jmsSource" jms-template="jmsTemplate"/>
<jms:jms-source id="jmsSource" jms-template="jmsTemplate"/>
<bean id="jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
<property name="connectionFactory" ref="connectionFactory"/>
@@ -16,7 +16,7 @@
<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="polling-test"/>
</bean>
</constructor-arg>

16
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestination.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithConnectionFactoryAndDestination.xml
View File

@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
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">
<si:jms-target id="target"
connection-factory="testConnectionFactory"
destination="testDestination"/>
<jms:jms-target id="target"
connection-factory="testConnectionFactory"
destination="testDestination"/>
<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="target-test"/>
</bean>
</constructor-arg>
</bean>
<bean id="testDestination" class="org.springframework.integration.adapter.jms.StubDestination"/>
<bean id="testDestination" class="org.springframework.integration.jms.StubDestination"/>
</beans>

14
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithConnectionFactoryAndDestinationName.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithConnectionFactoryAndDestinationName.xml
View File

@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
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">
<si:jms-target id="target"
connection-factory="testConnectionFactory"
destination-name="queue.test"/>
<jms:jms-target id="target"
connection-factory="testConnectionFactory"
destination-name="queue.test"/>
<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="target-test"/>
</bean>
</constructor-arg>

12
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithDefaultConnectionFactory.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithDefaultConnectionFactory.xml
View File

@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
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">
<si:jms-target id="target" destination="testDestination"/>
<jms:jms-target id="target" destination="testDestination"/>
<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="target-test"/>
</bean>
</constructor-arg>
</bean>
<bean id="testDestination" class="org.springframework.integration.adapter.jms.StubDestination"/>
<bean id="testDestination" class="org.springframework.integration.jms.StubDestination"/>
</beans>

14
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithEmptyConnectionFactory.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithEmptyConnectionFactory.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
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">
<si:jms-target id="target"
connection-factory=""
destination="testDestination"/>
<jms:jms-target id="target"
connection-factory=""
destination="testDestination"/>
<bean id="testDestination" class="org.springframework.integration.adapter.jms.StubDestination"/>
<bean id="testDestination" class="org.springframework.integration.jms.StubDestination"/>
</beans>

14
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/config/targetWithHeaderMapper.xml → org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/targetWithHeaderMapper.xml
View File

@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:si="http://www.springframework.org/schema/integration"
xmlns:jms="http://www.springframework.org/schema/integration/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
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">
<si:jms-target id="target" destination="testDestination" header-mapper="mapper"/>
<jms:jms-target id="target" destination="testDestination" header-mapper="mapper"/>
<bean id="mapper" class="org.springframework.integration.adapter.jms.config.TestMessageHeaderMapper"/>
<bean id="mapper" class="org.springframework.integration.jms.config.TestMessageHeaderMapper"/>
<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
<constructor-arg>
<bean class="org.springframework.integration.adapter.jms.StubConnection">
<bean class="org.springframework.integration.jms.StubConnection">
<constructor-arg value="target-test"/>
</bean>
</constructor-arg>
</bean>
<bean id="testDestination" class="org.springframework.integration.adapter.jms.StubDestination"/>
<bean id="testDestination" class="org.springframework.integration.jms.StubDestination"/>
</beans>