diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelParser.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelParser.java index 0042460927..d533d353e1 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelParser.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelParser.java @@ -52,11 +52,8 @@ public class JmsChannelParser extends AbstractChannelParser { if (StringUtils.hasText(messageDriven)) { builder.addConstructorArgValue(messageDriven); } - String connectionFactory = element.getAttribute("connection-factory"); - if (!StringUtils.hasText(connectionFactory)) { - connectionFactory = "connectionFactory"; - } - builder.addPropertyReference("connectionFactory", connectionFactory); + builder.addPropertyReference(JmsParserUtils.CONNECTION_FACTORY_PROPERTY, + JmsParserUtils.determineConnectionFactoryBeanName(element, parserContext)); if ("channel".equals(element.getLocalName())) { this.parseDestination(element, parserContext, builder, "queue"); } diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParser.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParser.java index b6cad184ff..ce442cef2a 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParser.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParser.java @@ -51,19 +51,19 @@ public class JmsInboundChannelAdapterParser extends AbstractPollingInboundChanne if (StringUtils.hasText(componentName)) { builder.addPropertyValue("componentName", componentName); } - String jmsTemplate = element.getAttribute(JmsAdapterParserUtils.JMS_TEMPLATE_ATTRIBUTE); - String destination = element.getAttribute(JmsAdapterParserUtils.DESTINATION_ATTRIBUTE); - String destinationName = element.getAttribute(JmsAdapterParserUtils.DESTINATION_NAME_ATTRIBUTE); - String headerMapper = element.getAttribute(JmsAdapterParserUtils.HEADER_MAPPER_ATTRIBUTE); + String jmsTemplate = element.getAttribute(JmsParserUtils.JMS_TEMPLATE_ATTRIBUTE); + String destination = element.getAttribute(JmsParserUtils.DESTINATION_ATTRIBUTE); + String destinationName = element.getAttribute(JmsParserUtils.DESTINATION_NAME_ATTRIBUTE); + String headerMapper = element.getAttribute(JmsParserUtils.HEADER_MAPPER_ATTRIBUTE); boolean hasJmsTemplate = StringUtils.hasText(jmsTemplate); boolean hasDestinationRef = StringUtils.hasText(destination); boolean hasDestinationName = StringUtils.hasText(destinationName); if (hasJmsTemplate) { - JmsAdapterParserUtils.verifyNoJmsTemplateAttributes(element, parserContext); + JmsParserUtils.verifyNoJmsTemplateAttributes(element, parserContext); builder.addConstructorArgReference(jmsTemplate); } else { - builder.addConstructorArgValue(JmsAdapterParserUtils.parseJmsTemplateBeanDefinition(element, parserContext)); + builder.addConstructorArgValue(JmsParserUtils.parseJmsTemplateBeanDefinition(element, parserContext)); } IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "acknowledge", "sessionAcknowledgeMode"); if (hasDestinationRef || hasDestinationName) { @@ -72,20 +72,20 @@ public class JmsInboundChannelAdapterParser extends AbstractPollingInboundChanne parserContext.getReaderContext().error("The 'destination-name' " + "and 'destination' attributes are mutually exclusive.", parserContext.extractSource(element)); } - builder.addPropertyReference(JmsAdapterParserUtils.DESTINATION_PROPERTY, destination); + builder.addPropertyReference(JmsParserUtils.DESTINATION_PROPERTY, destination); } else if (hasDestinationName) { - builder.addPropertyValue(JmsAdapterParserUtils.DESTINATION_NAME_PROPERTY, destinationName); + builder.addPropertyValue(JmsParserUtils.DESTINATION_NAME_PROPERTY, destinationName); } } else if (!hasJmsTemplate) { - parserContext.getReaderContext().error("either a '" + JmsAdapterParserUtils.JMS_TEMPLATE_ATTRIBUTE + - "' or one of '" + JmsAdapterParserUtils.DESTINATION_ATTRIBUTE + "' or '" - + JmsAdapterParserUtils.DESTINATION_NAME_ATTRIBUTE + + parserContext.getReaderContext().error("either a '" + JmsParserUtils.JMS_TEMPLATE_ATTRIBUTE + + "' or one of '" + JmsParserUtils.DESTINATION_ATTRIBUTE + "' or '" + + JmsParserUtils.DESTINATION_NAME_ATTRIBUTE + "' attributes must be provided for a polling JMS adapter", parserContext.extractSource(element)); } if (StringUtils.hasText(headerMapper)) { - builder.addPropertyReference(JmsAdapterParserUtils.HEADER_MAPPER_PROPERTY, headerMapper); + builder.addPropertyReference(JmsParserUtils.HEADER_MAPPER_PROPERTY, headerMapper); } IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "selector", "messageSelector"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "extract-payload"); diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointParser.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointParser.java index 9baa236c7b..60edf9eb67 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointParser.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointParser.java @@ -59,9 +59,9 @@ public class JmsMessageDrivenEndpointParser extends AbstractSingleBeanDefinition private static String[] containerAttributes = new String[] { - JmsAdapterParserUtils.CONNECTION_FACTORY_PROPERTY, - JmsAdapterParserUtils.DESTINATION_ATTRIBUTE, - JmsAdapterParserUtils.DESTINATION_NAME_ATTRIBUTE, + JmsParserUtils.CONNECTION_FACTORY_PROPERTY, + JmsParserUtils.DESTINATION_ATTRIBUTE, + JmsParserUtils.DESTINATION_NAME_ATTRIBUTE, "destination-resolver", "transaction-manager", "concurrent-consumers", "max-concurrent-consumers", "acknowledge", @@ -168,8 +168,8 @@ public class JmsMessageDrivenEndpointParser extends AbstractSingleBeanDefinition "Exactly one of '" + destinationAttribute + "' or '" + destinationNameAttribute + "' is required.", element); } - builder.addPropertyReference(JmsAdapterParserUtils.CONNECTION_FACTORY_PROPERTY, - JmsAdapterParserUtils.determineConnectionFactoryBeanName(element, parserContext)); + builder.addPropertyReference(JmsParserUtils.CONNECTION_FACTORY_PROPERTY, + JmsParserUtils.determineConnectionFactoryBeanName(element, parserContext)); if (hasDestination) { builder.addPropertyReference("destination", destination); } diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundChannelAdapterParser.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundChannelAdapterParser.java index d10151e070..cac350bd6f 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundChannelAdapterParser.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundChannelAdapterParser.java @@ -38,21 +38,21 @@ public class JmsOutboundChannelAdapterParser extends AbstractOutboundChannelAdap @Override protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(JmsSendingMessageHandler.class); - String jmsTemplate = element.getAttribute(JmsAdapterParserUtils.JMS_TEMPLATE_ATTRIBUTE); - String destination = element.getAttribute(JmsAdapterParserUtils.DESTINATION_ATTRIBUTE); - String destinationName = element.getAttribute(JmsAdapterParserUtils.DESTINATION_NAME_ATTRIBUTE); - String destinationExpression = element.getAttribute(JmsAdapterParserUtils.DESTINATION_EXPRESSION_ATTRIBUTE); - String headerMapper = element.getAttribute(JmsAdapterParserUtils.HEADER_MAPPER_ATTRIBUTE); + String jmsTemplate = element.getAttribute(JmsParserUtils.JMS_TEMPLATE_ATTRIBUTE); + String destination = element.getAttribute(JmsParserUtils.DESTINATION_ATTRIBUTE); + String destinationName = element.getAttribute(JmsParserUtils.DESTINATION_NAME_ATTRIBUTE); + String destinationExpression = element.getAttribute(JmsParserUtils.DESTINATION_EXPRESSION_ATTRIBUTE); + String headerMapper = element.getAttribute(JmsParserUtils.HEADER_MAPPER_ATTRIBUTE); boolean hasJmsTemplate = StringUtils.hasText(jmsTemplate); boolean hasDestinationRef = StringUtils.hasText(destination); boolean hasDestinationName = StringUtils.hasText(destinationName); boolean hasDestinationExpression = StringUtils.hasText(destinationExpression); if (hasJmsTemplate) { - JmsAdapterParserUtils.verifyNoJmsTemplateAttributes(element, parserContext); + JmsParserUtils.verifyNoJmsTemplateAttributes(element, parserContext); builder.addConstructorArgReference(jmsTemplate); } else { - builder.addConstructorArgValue(JmsAdapterParserUtils.parseJmsTemplateBeanDefinition(element, parserContext)); + builder.addConstructorArgValue(JmsParserUtils.parseJmsTemplateBeanDefinition(element, parserContext)); } if (hasDestinationRef || hasDestinationName || hasDestinationExpression) { @@ -61,26 +61,26 @@ public class JmsOutboundChannelAdapterParser extends AbstractOutboundChannelAdap "'destination-expression' attributes are mutually exclusive.", parserContext.extractSource(element)); } if (hasDestinationRef) { - builder.addPropertyReference(JmsAdapterParserUtils.DESTINATION_PROPERTY, destination); + builder.addPropertyReference(JmsParserUtils.DESTINATION_PROPERTY, destination); } else if (hasDestinationName) { - builder.addPropertyValue(JmsAdapterParserUtils.DESTINATION_NAME_PROPERTY, destinationName); + builder.addPropertyValue(JmsParserUtils.DESTINATION_NAME_PROPERTY, destinationName); } else if (hasDestinationExpression) { BeanDefinitionBuilder expressionBuilder = BeanDefinitionBuilder.genericBeanDefinition(ExpressionFactoryBean.class); expressionBuilder.addConstructorArgValue(destinationExpression); - builder.addPropertyValue(JmsAdapterParserUtils.DESTINATION_EXPRESSION_PROPERTY, expressionBuilder.getBeanDefinition()); + builder.addPropertyValue(JmsParserUtils.DESTINATION_EXPRESSION_PROPERTY, expressionBuilder.getBeanDefinition()); } } else if (!hasJmsTemplate) { - parserContext.getReaderContext().error("either a '" + JmsAdapterParserUtils.JMS_TEMPLATE_ATTRIBUTE + - "' or one of '" + JmsAdapterParserUtils.DESTINATION_ATTRIBUTE + "', '" - + JmsAdapterParserUtils.DESTINATION_NAME_ATTRIBUTE + "', or '" + - JmsAdapterParserUtils.DESTINATION_EXPRESSION_ATTRIBUTE + + parserContext.getReaderContext().error("either a '" + JmsParserUtils.JMS_TEMPLATE_ATTRIBUTE + + "' or one of '" + JmsParserUtils.DESTINATION_ATTRIBUTE + "', '" + + JmsParserUtils.DESTINATION_NAME_ATTRIBUTE + "', or '" + + JmsParserUtils.DESTINATION_EXPRESSION_ATTRIBUTE + "' attributes must be provided", parserContext.extractSource(element)); } if (StringUtils.hasText(headerMapper)) { - builder.addPropertyReference(JmsAdapterParserUtils.HEADER_MAPPER_PROPERTY, headerMapper); + builder.addPropertyReference(JmsParserUtils.HEADER_MAPPER_PROPERTY, headerMapper); } IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "extract-payload"); return builder.getBeanDefinition(); diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java index c1e670eef1..9ed5712fef 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java @@ -45,7 +45,8 @@ public class JmsOutboundGatewayParser extends AbstractConsumerEndpointParser { @Override protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(JmsOutboundGateway.class); - builder.addPropertyReference("connectionFactory", element.getAttribute("connection-factory")); + builder.addPropertyReference(JmsParserUtils.CONNECTION_FACTORY_PROPERTY, + JmsParserUtils.determineConnectionFactoryBeanName(element, parserContext)); parseDestination(element, parserContext, builder, "request-destination", "request-destination-name", "request-destination-expression", "requestDestination", "requestDestinationName", "requestDestinationExpression", true); diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsAdapterParserUtils.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsParserUtils.java similarity index 94% rename from spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsAdapterParserUtils.java rename to spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsParserUtils.java index 6d2a272c50..9a703063b0 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsAdapterParserUtils.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsParserUtils.java @@ -17,6 +17,7 @@ package org.springframework.integration.jms.config; import org.w3c.dom.Element; + import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; @@ -31,7 +32,7 @@ import org.springframework.util.StringUtils; * @author Mark Fisher * @author Gary Russell */ -abstract class JmsAdapterParserUtils { +abstract class JmsParserUtils { static final String JMS_TEMPLATE_ATTRIBUTE = "jms-template"; @@ -68,7 +69,7 @@ abstract class JmsAdapterParserUtils { }; static String determineConnectionFactoryBeanName(Element element, ParserContext parserContext) { - String connectionFactoryBeanName = "connectionFactory"; + String connectionFactoryBeanName = "jmsConnectionFactory"; if (element.hasAttribute(CONNECTION_FACTORY_ATTRIBUTE)) { connectionFactoryBeanName = element.getAttribute(CONNECTION_FACTORY_ATTRIBUTE); if (!StringUtils.hasText(connectionFactoryBeanName)) { @@ -81,8 +82,8 @@ abstract class JmsAdapterParserUtils { static BeanDefinition parseJmsTemplateBeanDefinition(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(DynamicJmsTemplate.class); - builder.addPropertyReference(JmsAdapterParserUtils.CONNECTION_FACTORY_PROPERTY, - JmsAdapterParserUtils.determineConnectionFactoryBeanName(element, parserContext)); + builder.addPropertyReference(JmsParserUtils.CONNECTION_FACTORY_PROPERTY, + determineConnectionFactoryBeanName(element, parserContext)); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "message-converter"); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "destination-resolver"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "pub-sub-domain"); diff --git a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.0.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.0.xsd index a7adc0e1de..e66b5b2d75 100644 --- a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.0.xsd +++ b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.0.xsd @@ -151,7 +151,7 @@ Reference to a JMS ConnectionFactory. If none is provided, the default - bean name for the reference will be "connectionFactory". + bean name for the reference will be "jmsConnectionFactory". @@ -1009,7 +1009,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests.java index 0f728727ba..12311afae4 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests.java @@ -63,7 +63,7 @@ public class JmsInboundChannelAdapterTests extends ActiveMQMultiContextTests { public static class CFConfig { @Bean - public ConnectionFactory connectionFactory() { + public ConnectionFactory jmsConnectionFactory() { return amqFactory; } } diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests-context.xml index cf4eb39e79..a6284385ea 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests-context.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests-context.xml @@ -8,14 +8,14 @@ http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd"> diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests.java index cd3bef2e49..5f7cd6a766 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests.java @@ -69,7 +69,7 @@ public class JmsOutboundChannelAdapterTests extends ActiveMQMultiContextTests { public static class CFConfig { @Bean - public ConnectionFactory connectionFactory() { + public ConnectionFactory jmsConnectionFactory() { return connectionFactory; } } diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundInsideChainTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundInsideChainTests-context.xml index 3798f0686b..d33e5698ac 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundInsideChainTests-context.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundInsideChainTests-context.xml @@ -44,7 +44,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/DefaultConfigurationTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/DefaultConfigurationTests-context.xml index a1f879bb39..8de165e417 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/DefaultConfigurationTests-context.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/DefaultConfigurationTests-context.xml @@ -9,7 +9,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/Exception-nonSiProducer-siConsumer.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/Exception-nonSiProducer-siConsumer.xml index 7e9684c434..1b4bdf06ab 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/Exception-nonSiProducer-siConsumer.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/Exception-nonSiProducer-siConsumer.xml @@ -71,7 +71,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java index ddd917e87f..1fe9029f07 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java @@ -43,11 +43,12 @@ public class ExceptionHandlingSiConsumerTests { public void nonSiProducer_siConsumer_sync_withReturn() throws Exception { ActiveMqTestUtils.prepare(); ConfigurableApplicationContext applicationContext = new ClassPathXmlApplicationContext("Exception-nonSiProducer-siConsumer.xml", ExceptionHandlingSiConsumerTests.class); - JmsTemplate jmsTemplate = new JmsTemplate(applicationContext.getBean("connectionFactory", ConnectionFactory.class)); + JmsTemplate jmsTemplate = new JmsTemplate(applicationContext.getBean("jmsConnectionFactory", ConnectionFactory.class)); Destination request = applicationContext.getBean("requestQueueA", Destination.class); final Destination reply = applicationContext.getBean("replyQueueA", Destination.class); jmsTemplate.send(request, new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { TextMessage message = session.createTextMessage(); message.setText("echoChannel"); @@ -64,11 +65,12 @@ public class ExceptionHandlingSiConsumerTests { public void nonSiProducer_siConsumer_sync_withReturnNoException() throws Exception { ActiveMqTestUtils.prepare(); ConfigurableApplicationContext applicationContext = new ClassPathXmlApplicationContext("Exception-nonSiProducer-siConsumer.xml", ExceptionHandlingSiConsumerTests.class); - JmsTemplate jmsTemplate = new JmsTemplate(applicationContext.getBean("connectionFactory", ConnectionFactory.class)); + JmsTemplate jmsTemplate = new JmsTemplate(applicationContext.getBean("jmsConnectionFactory", ConnectionFactory.class)); Destination request = applicationContext.getBean("requestQueueB", Destination.class); final Destination reply = applicationContext.getBean("replyQueueB", Destination.class); jmsTemplate.send(request, new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { TextMessage message = session.createTextMessage(); message.setText("echoWithExceptionChannel"); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests-context.xml index a5a8bc71f7..2db41f2ac0 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests-context.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests-context.xml @@ -32,7 +32,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/GlobalChannelInterceptorTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/GlobalChannelInterceptorTests-context.xml index d59d01fc71..dbb4c1d018 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/GlobalChannelInterceptorTests-context.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/GlobalChannelInterceptorTests-context.xml @@ -25,7 +25,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests-context.xml index de629c8d74..6f7535053a 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests-context.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests-context.xml @@ -32,14 +32,14 @@ - + - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests.java index b3aed9b8f0..a5ac09500d 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests.java @@ -31,11 +31,11 @@ import javax.jms.Session; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.jms.core.JmsTemplate; +import org.springframework.jms.core.MessageCreator; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.PollableChannel; -import org.springframework.jms.core.JmsTemplate; -import org.springframework.jms.core.MessageCreator; import org.springframework.util.ErrorHandler; /** @@ -46,9 +46,10 @@ public class InboundOneWayErrorTests { @Test public void noErrorChannel() throws Exception { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("InboundOneWayErrorTests-context.xml", getClass()); - JmsTemplate jmsTemplate = new JmsTemplate(context.getBean("connectionFactory", ConnectionFactory.class)); + JmsTemplate jmsTemplate = new JmsTemplate(context.getBean("jmsConnectionFactory", ConnectionFactory.class)); Destination queue = context.getBean("queueA", Destination.class); jmsTemplate.send(queue, new MessageCreator() { + @Override public javax.jms.Message createMessage(Session session) throws JMSException { return session.createTextMessage("test-A"); } @@ -66,9 +67,10 @@ public class InboundOneWayErrorTests { @Test public void errorChannel() throws Exception { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("InboundOneWayErrorTests-context.xml", getClass()); - JmsTemplate jmsTemplate = new JmsTemplate(context.getBean("connectionFactory", ConnectionFactory.class)); + JmsTemplate jmsTemplate = new JmsTemplate(context.getBean("jmsConnectionFactory", ConnectionFactory.class)); Destination queue = context.getBean("queueB", Destination.class); jmsTemplate.send(queue, new MessageCreator() { + @Override public javax.jms.Message createMessage(Session session) throws JMSException { return session.createTextMessage("test-B"); } @@ -107,6 +109,7 @@ public class InboundOneWayErrorTests { private volatile Throwable lastError; + @Override public void handleError(Throwable t) { this.lastError = t; this.latch.countDown(); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests-context.xml index d6bc25e33e..22c5e3c837 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests-context.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests-context.xml @@ -21,7 +21,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests-context.xml index 33bc1d46b8..346a822b45 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests-context.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests-context.xml @@ -63,13 +63,13 @@ - + - + - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsDynamicDestinationTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsDynamicDestinationTests-context.xml index b404f51ed0..6663afeb26 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsDynamicDestinationTests-context.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsDynamicDestinationTests-context.xml @@ -27,7 +27,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsPriorityTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsPriorityTests-context.xml index a18613b8c2..f553df389d 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsPriorityTests-context.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsPriorityTests-context.xml @@ -21,7 +21,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsWithMarshallingMessageConverterTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsWithMarshallingMessageConverterTests-context.xml index ec42217af4..8694dd9d71 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsWithMarshallingMessageConverterTests-context.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsWithMarshallingMessageConverterTests-context.xml @@ -47,7 +47,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-context.xml index ca6d7153f8..2c790caa45 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-context.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-context.xml @@ -32,7 +32,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-gateways.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-gateways.xml index cf33d4183d..43b708cebb 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-gateways.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-gateways.xml @@ -32,7 +32,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-withHeaderMapper.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-withHeaderMapper.xml index c47b156454..7f66f32124 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-withHeaderMapper.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-withHeaderMapper.xml @@ -28,7 +28,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/gatewayMaintainsReplyChannel.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/gatewayMaintainsReplyChannel.xml index 9f0af69626..146fea8682 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/gatewayMaintainsReplyChannel.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/gatewayMaintainsReplyChannel.xml @@ -23,7 +23,7 @@ @@ -32,7 +32,7 @@ @@ -41,7 +41,7 @@ @@ -52,7 +52,7 @@ @@ -69,7 +69,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayDefault.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayDefault.xml index 1dc63b9d7c..da6a6b9acb 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayDefault.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayDefault.xml @@ -18,7 +18,7 @@ request-destination-name="testDestinationName" request-channel="requestChannel"/> - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayWithDurableSubscription.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayWithDurableSubscription.xml index 2a68c5f5f2..38074fb1ef 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayWithDurableSubscription.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayWithDurableSubscription.xml @@ -24,7 +24,7 @@ subscription-shared="true" client-id="testClientId" /> - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayWithMessageSelector.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayWithMessageSelector.xml index 34e08f3542..44f463ed97 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayWithMessageSelector.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayWithMessageSelector.xml @@ -19,7 +19,7 @@ request-channel="requestChannel" selector="TestProperty = 'foo'"/> - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayWithReplyQos.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayWithReplyQos.xml index 18ca2dd35f..5c2a4c05ce 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayWithReplyQos.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/inboundGatewayWithReplyQos.xml @@ -22,7 +22,7 @@ reply-delivery-persistent="false" explicit-qos-enabled-for-replies="true"/> - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml index 357bd75936..1265b41645 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml @@ -18,7 +18,7 @@ request-destination-name="testDestinationName" request-channel="requestChannel"/> - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithPubSubDomain.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithPubSubDomain.xml index 6a07a9946f..f2ca1263c2 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithPubSubDomain.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithPubSubDomain.xml @@ -20,7 +20,7 @@ request-channel="output" auto-startup="false"/> - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithReplyChannel.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithReplyChannel.xml index 957fc1c18f..555811663b 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithReplyChannel.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithReplyChannel.xml @@ -29,7 +29,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExtractPayloadAttributes.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExtractPayloadAttributes.xml index 3ab0b8d71f..206b81a4d6 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExtractPayloadAttributes.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExtractPayloadAttributes.xml @@ -44,7 +44,7 @@ extract-request-payload="false" auto-startup="false"/> - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationAndDefaultConnectionFactory.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationAndDefaultConnectionFactory.xml index 06c7524d5e..142ba78245 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationAndDefaultConnectionFactory.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationAndDefaultConnectionFactory.xml @@ -18,7 +18,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationNameAndDefaultConnectionFactory.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationNameAndDefaultConnectionFactory.xml index f2204a253f..43c1986fc1 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationNameAndDefaultConnectionFactory.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationNameAndDefaultConnectionFactory.xml @@ -16,7 +16,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDurableSubscription.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDurableSubscription.xml index c047609c57..48c58049d5 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDurableSubscription.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDurableSubscription.xml @@ -24,7 +24,7 @@ client-id="testClientId" channel="output"/> - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithHeaderMapper.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithHeaderMapper.xml index 43e6a3e73d..00dbd253b5 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithHeaderMapper.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithHeaderMapper.xml @@ -19,11 +19,11 @@ - + - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml index 8f4ce253d0..7f9753a098 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml @@ -25,11 +25,11 @@ - + - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageConverter.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageConverter.xml index f1e0157535..34b0d7de90 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageConverter.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageConverter.xml @@ -22,7 +22,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageSelector.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageSelector.xml index c13349b119..608bafa49a 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageSelector.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithMessageSelector.xml @@ -34,7 +34,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithPubSubDomain.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithPubSubDomain.xml index 66f8b070ea..a1b94947dd 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithPubSubDomain.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithPubSubDomain.xml @@ -22,7 +22,7 @@ channel="output"/> - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithReceiveTimeout.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithReceiveTimeout.xml index 4514204e43..83a374325d 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithReceiveTimeout.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithReceiveTimeout.xml @@ -16,7 +16,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayReplyDestOptions-fail.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayReplyDestOptions-fail.xml index e04d4849f1..be46ff5a26 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayReplyDestOptions-fail.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayReplyDestOptions-fail.xml @@ -18,7 +18,7 @@ reply-destination="replyQueue" reply-destination-expression="'foo'"/> - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayReplyDestOptions.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayReplyDestOptions.xml index a733c741e7..d50c5a0f4b 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayReplyDestOptions.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayReplyDestOptions.xml @@ -32,7 +32,7 @@ request-channel="requestChannel" reply-destination-expression="@replyQueue"/> - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithConverter.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithConverter.xml index 4820294779..8d982f23c9 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithConverter.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithConverter.xml @@ -21,7 +21,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithDeliveryPersistent.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithDeliveryPersistent.xml index 608f1bc1f3..fcf74e2a35 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithDeliveryPersistent.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithDeliveryPersistent.xml @@ -49,7 +49,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithOrder.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithOrder.xml index def46dfc37..16eacc254c 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithOrder.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithOrder.xml @@ -17,7 +17,7 @@ request-channel="requestChannel" order="99" requires-reply="true"/> - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithPubSubSettings.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithPubSubSettings.xml index ea1d6c74f2..02fa44e5a3 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithPubSubSettings.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundGatewayWithPubSubSettings.xml @@ -24,7 +24,7 @@ reply-pub-sub-domain="true" request-channel="requestChannel"/> - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithDefaultConnectionFactory.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithDefaultConnectionFactory.xml index 26d635a65a..0dabc4fe1a 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithDefaultConnectionFactory.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithDefaultConnectionFactory.xml @@ -15,7 +15,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithHeaderMapper.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithHeaderMapper.xml index 228db8cd3e..c74f4818b0 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithHeaderMapper.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithHeaderMapper.xml @@ -19,7 +19,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithMessageConverter.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithMessageConverter.xml index f3b8f103db..89979c60bb 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithMessageConverter.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithMessageConverter.xml @@ -19,7 +19,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithOrder.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithOrder.xml index 0a33fd53e8..ff3124a964 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithOrder.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithOrder.xml @@ -15,7 +15,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithQos.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithQos.xml index abf44eb27b..c9db12ab71 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithQos.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsOutboundWithQos.xml @@ -19,7 +19,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/GatewaySerializedReplyChannelTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/GatewaySerializedReplyChannelTests-context.xml index 1b6454fe76..2504845086 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/GatewaySerializedReplyChannelTests-context.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/GatewaySerializedReplyChannelTests-context.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd"> - + @@ -18,12 +18,12 @@ + connection-factory="jmsConnectionFactory"/> diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java index bb1dd88f6a..2f59cddda5 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java @@ -216,7 +216,7 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti try { RequestReplyExchanger gateway = context.getBean("correlationPropagatingConsumerWithOptimizationDelayFirstReply", RequestReplyExchanger.class); - final ConnectionFactory connectionFactory = context.getBean("connectionFactory", ConnectionFactory.class); + final ConnectionFactory connectionFactory = context.getBean("jmsConnectionFactory", ConnectionFactory.class); final Destination requestDestination = context.getBean("siOutQueueE", Destination.class); final Destination replyDestination = context.getBean("siInQueueE", Destination.class); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/StopStartTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/StopStartTests-context.xml index 9b0a2537ac..e927088851 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/StopStartTests-context.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/StopStartTests-context.xml @@ -12,7 +12,7 @@ @@ -20,13 +20,13 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/broken-broker.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/broken-broker.xml index c69a11b28b..e6bd47138a 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/broken-broker.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/broken-broker.xml @@ -12,14 +12,14 @@ @@ -29,7 +29,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/explicit-correlation-key.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/explicit-correlation-key.xml index 9e47c354e8..f971aba49a 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/explicit-correlation-key.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/explicit-correlation-key.xml @@ -9,7 +9,7 @@ @@ -20,7 +20,7 @@ + connection-factory="jmsConnectionFactory"/> @@ -29,7 +29,7 @@ @@ -40,7 +40,7 @@ + connection-factory="jmsConnectionFactory"/> @@ -49,7 +49,7 @@ @@ -60,7 +60,7 @@ + connection-factory="jmsConnectionFactory"/> @@ -74,7 +74,7 @@ + connection-factory="jmsConnectionFactory"/> - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/honor-timeout.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/honor-timeout.xml index 1d6b6d0645..3f0143eb5d 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/honor-timeout.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/honor-timeout.xml @@ -10,13 +10,13 @@ @@ -28,7 +28,7 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/mult-producer-and-consumers-temp-reply.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/mult-producer-and-consumers-temp-reply.xml index 5d4d75d9c2..00fdd7b0c9 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/mult-producer-and-consumers-temp-reply.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/mult-producer-and-consumers-temp-reply.xml @@ -17,13 +17,13 @@ @@ -35,7 +35,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-01.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-01.xml index 98fd426d53..7f277fa08b 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-01.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-01.xml @@ -10,7 +10,7 @@ @@ -18,7 +18,7 @@ @@ -31,7 +31,7 @@ @@ -39,13 +39,13 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-02.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-02.xml index e83340c794..30a0ec3585 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-02.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-02.xml @@ -10,7 +10,7 @@ @@ -19,7 +19,7 @@ @@ -32,7 +32,7 @@ @@ -40,13 +40,13 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-03.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-03.xml index 2d4ff9e50b..63110c9b68 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-03.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-03.xml @@ -10,7 +10,7 @@ @@ -19,7 +19,7 @@ @@ -32,7 +32,7 @@ @@ -41,13 +41,13 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-04.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-04.xml index fe2c1c1f5f..a04609ce26 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-04.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-04.xml @@ -10,7 +10,7 @@ @@ -18,7 +18,7 @@ @@ -31,7 +31,7 @@ @@ -40,13 +40,13 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-05.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-05.xml index 6303d059c5..ec46798122 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-05.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-05.xml @@ -10,7 +10,7 @@ @@ -19,7 +19,7 @@ @@ -33,7 +33,7 @@ @@ -41,13 +41,13 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-06.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-06.xml index 7fa2dd20b0..84c197f6b5 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-06.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-06.xml @@ -10,7 +10,7 @@ @@ -18,7 +18,7 @@ @@ -31,7 +31,7 @@ @@ -40,14 +40,14 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-07.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-07.xml index 949cfc415d..7881c5065a 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-07.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-07.xml @@ -10,7 +10,7 @@ @@ -19,7 +19,7 @@ @@ -32,7 +32,7 @@ @@ -41,14 +41,14 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-08.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-08.xml index d37ed80f1a..fdfdc57021 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-08.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-08.xml @@ -10,7 +10,7 @@ @@ -19,7 +19,7 @@ @@ -33,7 +33,7 @@ @@ -42,13 +42,13 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-09.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-09.xml index 43c323d924..2638fe55ad 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-09.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-09.xml @@ -10,7 +10,7 @@ @@ -19,7 +19,7 @@ @@ -33,7 +33,7 @@ @@ -42,14 +42,14 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-01.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-01.xml index 8228272a18..01268543b1 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-01.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-01.xml @@ -10,7 +10,7 @@ @@ -19,7 +19,7 @@ @@ -32,20 +32,20 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02.xml index db0248500d..34f36620b7 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02.xml @@ -10,7 +10,7 @@ @@ -34,7 +34,7 @@ @@ -61,13 +61,13 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02a.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02a.xml index a4654b5d42..12fb81d86c 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02a.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-02a.xml @@ -10,7 +10,7 @@ @@ -34,7 +34,7 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03.xml index ea65cf44ab..99e448ff9a 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03.xml @@ -10,7 +10,7 @@ @@ -33,7 +33,7 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03a.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03a.xml index b9a3f39036..722d67d1a0 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03a.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-03a.xml @@ -11,7 +11,7 @@ @@ -43,7 +43,7 @@ @@ -71,7 +71,7 @@ @@ -86,7 +86,7 @@ @@ -95,7 +95,7 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-04.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-04.xml index f2f1106496..ed1900ab41 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-04.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-04.xml @@ -11,7 +11,7 @@ @@ -44,7 +44,7 @@ @@ -58,7 +58,7 @@ @@ -67,7 +67,7 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-05.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-05.xml index cd79a528a0..8cb74b3a37 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-05.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-05.xml @@ -10,7 +10,7 @@ @@ -34,7 +34,7 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-06.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-06.xml index 587c38d3f7..ce6fbe4fd4 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-06.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-06.xml @@ -10,7 +10,7 @@ @@ -34,7 +34,7 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-07.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-07.xml index 0e79d0536b..e9ffed16e8 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-07.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/pipeline-named-queue-07.xml @@ -10,7 +10,7 @@ @@ -34,7 +34,7 @@ - diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml index 7537227ccf..dccb86d310 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml @@ -9,7 +9,7 @@ @@ -51,7 +51,7 @@ @@ -71,7 +71,7 @@ @@ -90,7 +90,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-no-cached-consumers.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-no-cached-consumers.xml index 7ab6857fba..d499f47cc4 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-no-cached-consumers.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-no-cached-consumers.xml @@ -9,7 +9,7 @@ @@ -50,7 +50,7 @@ @@ -86,7 +86,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-temp-reply-consumers.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-temp-reply-consumers.xml index f58cf6cb99..609e373e7a 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-temp-reply-consumers.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-temp-reply-consumers.xml @@ -9,7 +9,7 @@ @@ -19,7 +19,7 @@ - + diff --git a/src/reference/asciidoc/jms.adoc b/src/reference/asciidoc/jms.adoc index cfcfef7152..17e73b9022 100644 --- a/src/reference/asciidoc/jms.adoc +++ b/src/reference/asciidoc/jms.adoc @@ -37,7 +37,7 @@ That means that it invokes `receive()` when triggered. This should only be used in situations where polling is done relatively infrequently and timeliness is not important. For all other situations (a vast majority of JMS-based use-cases), the _message-driven-channel-adapter_ described below is a better option. -NOTE: All of the JMS adapters that require a reference to the `ConnectionFactory` will automatically look for a bean named "connectionFactory" by default. +NOTE: All of the JMS adapters that require a reference to the `ConnectionFactory` will automatically look for a bean named `jmsConnectionFactory` by default. That is why you don't see a "connection-factory" attribute in many of the examples. However, if your JMS `ConnectionFactory` has a different bean name, then you will need to provide that attribute. @@ -135,7 +135,7 @@ If no 'error-channel' is defined, the exception is thrown back to the container, === Outbound Channel Adapter The `JmsSendingMessageHandler` implements the `MessageHandler` interface and is capable of converting Spring Integration `Messages` to JMS messages and then sending to a JMS destination. -It requires either a 'jmsTemplate' reference or both 'connectionFactory' and 'destination' references (again, the 'destinationName' may be provided in place of the 'destination'). +It requires either a `jmsTemplate` reference or both `jmsConnectionFactory` and `destination` references (again, the `destinationName` may be provided in place of the `destination`). As with the inbound Channel Adapter, the easiest way to configure this adapter is with the namespace support. The following configuration will produce an adapter that receives Spring Integration Messages from the "exampleChannel" and then converts those into JMS Messages and sends them to the JMS Destination reference whose bean name is "outQueue". [source,xml] @@ -450,7 +450,7 @@ If either of these conditions are not met, `async` is ignored. ---- -<1> Reference to a `javax.jms.ConnectionFactory`; default `connectionFactory`. +<1> Reference to a `javax.jms.ConnectionFactory`; default `jmsConnectionFactory`. <2> The name of a property that will contain correlation data to correlate responses with replies. @@ -663,7 +663,7 @@ For either type of JMS-backed channel, the name of the destination may be provid ---- In the examples above, the Destination names would be resolved by Spring's default `DynamicDestinationResolver` implementation, but any implementation of the `DestinationResolver` interface could be provided. -Also, the JMS `ConnectionFactory` is a required property of the channel, but by default the expected bean name would be "connectionFactory". +Also, the JMS `ConnectionFactory` is a required property of the channel, but by default the expected bean name would be `jmsConnectionFactory`. The example below provides both a custom instance for resolution of the JMS Destination names and a different name for the ConnectionFactory. [source,xml] ---- diff --git a/src/reference/asciidoc/whats-new.adoc b/src/reference/asciidoc/whats-new.adoc index 8bbdda5a46..8829ab0211 100644 --- a/src/reference/asciidoc/whats-new.adoc +++ b/src/reference/asciidoc/whats-new.adoc @@ -14,3 +14,10 @@ development process. === General Changes ==== Core Changes + +==== JMS Changes + +Previously, Spring Integration JMS XML configuration used a default bean name `connectionFactory` for the JMS Connection Factory, allowing the property to be omitted from component definitions. +It has now been renamed to `jmsConnectionFactory`, which is the bean name used by Spring Boot to auto-configure the JMS Connection Factory bean. + +If your application is relying on the previous behavior, rename your `connectionFactory` bean to `jmsConnectionFactory`, or specifically configure your components to use your bean using its current name.