From 46925cf3e409861cfcb585173d952f56b6a81c1e Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 31 Aug 2011 06:08:53 -0400 Subject: [PATCH 1/2] removed deprecated trigger sub-elements from core --- .../integration/config/xml/PollerParser.java | 80 +++---------------- .../config/xml/spring-integration-2.1.xsd | 21 ----- .../AggregatorIntegrationTests-context.xml | 7 +- ...sageAggregatorIntegrationTests-context.xml | 4 +- .../config/ChainParserTests-context.xml | 11 +-- ...hannelAdapterParserTests-inner-context.xml | 4 +- .../config/simpleEndpointTests.xml | 4 +- .../config/xml/BridgeParserTests-context.xml | 4 +- .../xml/ConstructorAutowireTests-context.xml | 4 +- .../xml/CronTriggerParserTests-context.xml | 4 - .../config/xml/CronTriggerParserTests.java | 16 +--- .../xml/HeaderEnricherTests-context.xml | 4 +- ...boundChannelAdapterParserTests-context.xml | 4 +- ...ToStringTransformerParserTests-context.xml | 4 +- .../config/xml/defaultPollerWithId.xml | 4 +- .../config/xml/defaultPollerWithoutId.xml | 4 +- .../config/xml/innerdefaware.properties | 16 +--- .../config/xml/multipleDefaultPollers.xml | 8 +- .../config/xml/pollerWithAdviceChain.xml | 3 +- .../config/xml/topLevelPollerWithoutId.xml | 4 +- .../dispatcher/propagationMandatoryTests.xml | 3 +- .../propagationNotSupportedTests.xml | 3 +- .../dispatcher/propagationRequiredTests.xml | 3 +- .../propagationRequiresNewTests.xml | 3 +- .../dispatcher/propagationSupportsTests.xml | 3 +- .../endpoint/returnAddressTests.xml | 4 +- ...wayInvokingMessageHandlerTests-context.xml | 9 +-- ...ssageHistoryWithHistoryWriterNamespace.xml | 6 +- 28 files changed, 49 insertions(+), 195 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PollerParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PollerParser.java index da7b57d860..50410b5bf8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PollerParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PollerParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,6 @@ package org.springframework.integration.config.xml; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.TimeUnit; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -50,7 +49,7 @@ public class PollerParser extends AbstractBeanDefinitionParser { private static final String MULTIPLE_TRIGGER_DEFINITIONS = "A cannot specify more than one trigger configuration."; - private static final String NO_TRIGGER_DEFINITIONS = "A must have a one and only one trigger configuration."; + private static final String NO_TRIGGER_DEFINITIONS = "A must have one and only one trigger configuration."; private static final String PERIODIC_TRIGGER_CLASSNAME = "org.springframework.scheduling.support.PeriodicTrigger"; @@ -91,28 +90,23 @@ public class PollerParser extends AbstractBeanDefinitionParser { configureTrigger(element, metadataBuilder, parserContext); IntegrationNamespaceUtils.setValueIfAttributeDefined(metadataBuilder, element, "max-messages-per-poll"); IntegrationNamespaceUtils.setValueIfAttributeDefined(metadataBuilder, element, "receive-timeout"); - + Element txElement = DomUtils.getChildElementByTagName(element, "transactional"); - Element adviceChainElement = DomUtils.getChildElementByTagName(element, "advice-chain"); - configureAdviceChain(adviceChainElement, txElement, metadataBuilder, parserContext); - + IntegrationNamespaceUtils.setReferenceIfAttributeDefined(metadataBuilder, element, "task-executor"); String errorChannel = element.getAttribute("error-channel"); - if (StringUtils.hasText(errorChannel)){ + if (StringUtils.hasText(errorChannel)) { BeanDefinitionBuilder errorHandler = BeanDefinitionBuilder.genericBeanDefinition( "org.springframework.integration.channel.MessagePublishingErrorHandler"); errorHandler.addPropertyReference("defaultErrorChannel", errorChannel); - metadataBuilder.addPropertyValue("errorHandler", errorHandler.getBeanDefinition()); } return metadataBuilder.getBeanDefinition(); } private void configureTrigger(Element pollerElement, BeanDefinitionBuilder targetBuilder, ParserContext parserContext) { - // Polling frequency can be configured either through attributes or by using sub-elements - // However, since Spring Integration 2.0 the trigger sub-elements are deprecated String triggerAttribute = pollerElement.getAttribute("trigger"); String fixedRateAttribute = pollerElement.getAttribute("fixed-rate"); String fixedDelayAttribute = pollerElement.getAttribute("fixed-delay"); @@ -158,22 +152,6 @@ public class PollerParser extends AbstractBeanDefinitionParser { builder.getBeanDefinition(), parserContext.getRegistry()); triggerBeanNames.add(triggerBeanName); } - Element intervalElement = DomUtils.getChildElementByTagName(pollerElement, "interval-trigger"); - if (intervalElement != null) { - parserContext.getReaderContext().warning( - "Poller configuration via 'interval-trigger' subelements is deprecated, " + - "use the 'fixed-delay' or 'fixed-rate' attribute instead.", pollerElement); - triggerBeanNames.add(parseIntervalTrigger(intervalElement, parserContext)); - } - else { - Element cronElement = DomUtils.getChildElementByTagName(pollerElement, "cron-trigger"); - if (cronElement != null) { - parserContext.getReaderContext().warning( - "Poller configuration via 'cron-trigger' subelements is deprecated, " + - "use the 'cron' attribute instead.", pollerElement); - triggerBeanNames.add(parseCronTrigger(cronElement, parserContext)); - } - } if (triggerBeanNames.isEmpty()) { parserContext.getReaderContext().error(NO_TRIGGER_DEFINITIONS, pollerElement); } @@ -184,59 +162,25 @@ public class PollerParser extends AbstractBeanDefinitionParser { } /** - * Parse an "interval-trigger" element - */ - private String parseIntervalTrigger(Element element, ParserContext parserContext) { - String interval = element.getAttribute("interval"); - if (!StringUtils.hasText(interval)) { - parserContext.getReaderContext().error( - "the 'interval' attribute is required for an ", element); - } - TimeUnit timeUnit = TimeUnit.valueOf(element.getAttribute("time-unit")); - BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(PERIODIC_TRIGGER_CLASSNAME); - builder.addConstructorArgValue(interval); - builder.addConstructorArgValue(timeUnit); - IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "initial-delay"); - IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "fixed-rate"); - return BeanDefinitionReaderUtils.registerWithGeneratedName(builder.getBeanDefinition(), parserContext.getRegistry()); - } - - /** - * Parse a "cron-trigger" element - */ - private String parseCronTrigger(Element element, ParserContext parserContext) { - String cronExpression = element.getAttribute("expression"); - if (!StringUtils.hasText(cronExpression)) { - parserContext.getReaderContext().error( - "the 'expression' attribute is required for a ", element); - } - BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CRON_TRIGGER_CLASSNAME); - builder.addConstructorArgValue(cronExpression); - return BeanDefinitionReaderUtils.registerWithGeneratedName(builder.getBeanDefinition(), parserContext.getRegistry()); - } - - /** - * Parse a "transactional" element and configure TransactionInterceptor with "transactionManager" - * and other "transactionDefinition" properties. This advisor will be applied on Polling Task proxy + * Parse a "transactional" element and configure a TransactionInterceptor with "transactionManager" + * and other "transactionDefinition" properties. This advisor will be applied on the Polling Task proxy * (see {@link org.springframework.integration.endpoint.AbstractPollingEndpoint}). */ private BeanDefinition configureTransactionAttributes(Element txElement, BeanDefinitionBuilder targetBuilder, ParserContext parserContext) { String TX_PKG_PREFIX = "org.springframework.transaction.interceptor"; BeanDefinitionBuilder txDefinitionBuilder = - BeanDefinitionBuilder.genericBeanDefinition(TX_PKG_PREFIX + ".DefaultTransactionAttribute"); + BeanDefinitionBuilder.genericBeanDefinition(TX_PKG_PREFIX + ".DefaultTransactionAttribute"); txDefinitionBuilder.addPropertyValue("propagationBehaviorName", "PROPAGATION_" + txElement.getAttribute("propagation")); txDefinitionBuilder.addPropertyValue("isolationLevelName", "ISOLATION_" + txElement.getAttribute("isolation")); txDefinitionBuilder.addPropertyValue("timeout", txElement.getAttribute("timeout")); txDefinitionBuilder.addPropertyValue("readOnly", txElement.getAttribute("read-only")); BeanDefinitionBuilder attributeSourceBuilder = - BeanDefinitionBuilder.genericBeanDefinition(TX_PKG_PREFIX + ".MatchAlwaysTransactionAttributeSource"); + BeanDefinitionBuilder.genericBeanDefinition(TX_PKG_PREFIX + ".MatchAlwaysTransactionAttributeSource"); attributeSourceBuilder.addPropertyValue("transactionAttribute", txDefinitionBuilder.getBeanDefinition()); - BeanDefinitionBuilder txInterceptorBuilder = - BeanDefinitionBuilder.genericBeanDefinition(TX_PKG_PREFIX + ".TransactionInterceptor"); + BeanDefinitionBuilder.genericBeanDefinition(TX_PKG_PREFIX + ".TransactionInterceptor"); txInterceptorBuilder.addPropertyReference("transactionManager", txElement.getAttribute("transaction-manager")); txInterceptorBuilder.addPropertyValue("transactionAttributeSource", attributeSourceBuilder.getBeanDefinition()); - return txInterceptorBuilder.getBeanDefinition(); } @@ -246,10 +190,10 @@ public class PollerParser extends AbstractBeanDefinitionParser { @SuppressWarnings({ "unchecked", "rawtypes" }) private void configureAdviceChain(Element adviceChainElement, Element txElement, BeanDefinitionBuilder targetBuilder, ParserContext parserContext) { ManagedList adviceChain = new ManagedList(); - if (txElement != null){ + if (txElement != null) { adviceChain.add(this.configureTransactionAttributes(txElement, targetBuilder, parserContext)); } - if (adviceChainElement != null){ + if (adviceChainElement != null) { NodeList childNodes = adviceChainElement.getChildNodes(); for (int i = 0; i < childNodes.getLength(); i++) { Node child = childNodes.item(i); diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd index f8b97c1384..41685c948b 100644 --- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd +++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd @@ -1148,27 +1148,6 @@ endpoint itself is a Polling Consumer for a channel with a queue. - - - - - NOTE: The 'interval-trigger' sub-element is deprecated as of Spring Integration 2.0 and will be - removed in version - 2.1. - Use one of the interval trigger attributes instead ('fixed-delay' or 'fixed-rate'). - - - - - - - NOTE: The 'cron-trigger' sub-element is deprecated as of Spring Integration 2.0 and will be - removed in version 2.1. - Use the 'cron' attribute instead. - - - - diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests-context.xml index 585ca61759..276e0413f4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests-context.xml @@ -11,11 +11,8 @@ - - - - + + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml index 6b98d4f318..89d502edfc 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml @@ -14,9 +14,7 @@ - - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests-context.xml index cd836df5fe..659cf948d2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests-context.xml @@ -1,6 +1,7 @@ - - - + @@ -50,9 +49,7 @@ - - - + - - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml index 75d4a57464..91e67e100d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml @@ -12,9 +12,7 @@ - - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests-context.xml index 1a1ca7d811..0140adcce8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests-context.xml @@ -13,9 +13,7 @@ - - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTests-context.xml index 29f1c34688..69ef97fa9e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConstructorAutowireTests-context.xml @@ -19,9 +19,7 @@ - - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests-context.xml index 196369992b..f6378ee11e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests-context.xml @@ -7,10 +7,6 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> - - - - diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java index 687636cfd8..b3d3e4a579 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,20 +40,6 @@ public class CronTriggerParserTests { @Autowired private ApplicationContext context; - @Test - public void checkConfigWithSubElement() { - Object poller = context.getBean("pollerWithSubElement"); - assertEquals(PollerMetadata.class, poller.getClass()); - PollerMetadata metadata = (PollerMetadata) poller; - Trigger trigger = metadata.getTrigger(); - assertEquals(CronTrigger.class, trigger.getClass()); - DirectFieldAccessor accessor = new DirectFieldAccessor(trigger); - String expression = (String) new DirectFieldAccessor( - accessor.getPropertyValue("sequenceGenerator")) - .getPropertyValue("expression"); - assertEquals("*/10 * 9-17 * * MON-FRI", expression); - } - @Test public void checkConfigWithAttribute() { Object poller = context.getBean("pollerWithAttribute"); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests-context.xml index 36db19b65d..40480d9d96 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests-context.xml @@ -22,9 +22,7 @@ - - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParserTests-context.xml index 9e8f1a1d22..4edcba37be 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParserTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParserTests-context.xml @@ -20,9 +20,7 @@ - - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests-context.xml index a3d6c75617..ee594891ff 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests-context.xml @@ -20,9 +20,7 @@ - - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/defaultPollerWithId.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/defaultPollerWithId.xml index 0fa35c7858..33c72170e4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/defaultPollerWithId.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/defaultPollerWithId.xml @@ -7,8 +7,6 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> - - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/defaultPollerWithoutId.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/defaultPollerWithoutId.xml index 8b06e0f03c..da35a6e660 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/defaultPollerWithoutId.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/defaultPollerWithoutId.xml @@ -7,8 +7,6 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> - - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties index bab247be53..edc777dd12 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties @@ -34,9 +34,7 @@ splitter-inner-success-with-poller=\ \ \ \ - \ - \ - \ + \ \ \ @@ -59,9 +57,7 @@ splitter-inner-success-with-poller-reversed-order=\ \ \ \ - \ - \ - \ + \ \ \ \ @@ -296,9 +292,7 @@ aggregator-inner-concurrent-success=\ \ \ \ - \ - \ - \ + \ \ \ \ @@ -323,9 +317,7 @@ aggregator-inner-concurrent-success-reorder-bean-poller=\ \ \ \ - \ - \ - \ + \ \ \ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/multipleDefaultPollers.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/multipleDefaultPollers.xml index 9273edb8c1..5962b05f3a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/multipleDefaultPollers.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/multipleDefaultPollers.xml @@ -7,12 +7,8 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> - - - + - - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/pollerWithAdviceChain.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/pollerWithAdviceChain.xml index 7d6dc1680d..ae4257281f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/pollerWithAdviceChain.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/pollerWithAdviceChain.xml @@ -7,8 +7,7 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/topLevelPollerWithoutId.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/topLevelPollerWithoutId.xml index 18ff48f018..5681027936 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/topLevelPollerWithoutId.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/topLevelPollerWithoutId.xml @@ -7,8 +7,6 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> - - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml index 8cd004d885..c863700610 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml @@ -24,8 +24,7 @@ ref="testBean" method="good" output-channel="output"> - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml index 5700856390..b39a9642fc 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml @@ -20,8 +20,7 @@ ref="testBean" method="good" output-channel="output"> - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml index 6a334d6e45..453f131964 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml @@ -20,8 +20,7 @@ ref="testBean" method="good" output-channel="output"> - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml index f42ad90785..6eb445fa8b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml @@ -20,8 +20,7 @@ ref="testBean" method="good" output-channel="output"> - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml index f3bb30d005..c6595c568b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml @@ -20,8 +20,7 @@ ref="testBean" method="good" output-channel="output"> - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml index db55873a1d..76b5736a68 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml @@ -7,9 +7,7 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> - - - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests-context.xml index f670df2e54..97e820a6a6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests-context.xml @@ -1,8 +1,8 @@ @@ -37,10 +37,9 @@ - - - + + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/history/messageHistoryWithHistoryWriterNamespace.xml b/spring-integration-core/src/test/java/org/springframework/integration/history/messageHistoryWithHistoryWriterNamespace.xml index 7f229c3c5c..61e529eb38 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/history/messageHistoryWithHistoryWriterNamespace.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/history/messageHistoryWithHistoryWriterNamespace.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd"> + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> - - - + From 9f59001230317af8096d7641780dc4f0e47d80a8 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 31 Aug 2011 07:01:40 -0400 Subject: [PATCH 2/2] removed deprecated trigger sub-elements non-core --- .../locking/FileLockingNamespaceTests-context.xml | 4 +--- .../integration/ip/udp/testIp-out-context.xml | 4 +--- .../jms/config/MessageHistoryTests-context.xml | 4 +--- ...jmsInboundWithConnectionFactoryAndDestination.xml | 4 +--- ...nboundWithConnectionFactoryAndDestinationName.xml | 4 +--- .../config/jmsInboundWithConnectionFactoryOnly.xml | 4 +--- ...undWithDestinationAndDefaultConnectionFactory.xml | 4 +--- ...ithDestinationNameAndDefaultConnectionFactory.xml | 4 +--- .../jms/config/jmsInboundWithHeaderMapper.xml | 4 +--- .../jms/config/jmsInboundWithJmsTemplate.xml | 4 +--- .../jms/config/jmsInboundWithMessageConverter.xml | 4 +--- .../jms/config/jmsInboundWithMessageSelector.xml | 4 +--- .../jms/config/jmsInboundWithReceiveTimeout.xml | 4 +--- .../jms/config/jmsOutboundGatewayWithConverter.xml | 6 +----- .../InboundChannelAdapterParserTests-context.xml | 12 ++++-------- ...boundChannelAdapterParserTests-invalidContext.xml | 10 ++++------ .../config/PollingMailSourceParserTests-context.xml | 4 +--- .../consoleInboundChannelAdapterParserTests.xml | 4 +--- .../simpleWebServiceOutboundGatewayParserTests.xml | 4 +--- .../UnmarshallingTransformerParserTests-context.xml | 6 +----- 20 files changed, 26 insertions(+), 72 deletions(-) diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests-context.xml b/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests-context.xml index 657d110538..c06ced2a36 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests-context.xml +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests-context.xml @@ -23,8 +23,6 @@ - - - + \ No newline at end of file diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/testIp-out-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/testIp-out-context.xml index ea69b4e3cd..14591693fe 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/testIp-out-context.xml +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/testIp-out-context.xml @@ -14,9 +14,7 @@ http://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd"> - - - + 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 7d675e0202..0411793089 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 @@ -30,9 +30,7 @@ - - - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestination.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestination.xml index f231a89f24..d15818e15f 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestination.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestination.xml @@ -28,8 +28,6 @@ - - - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestinationName.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestinationName.xml index 6a1286a251..2c3c669367 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestinationName.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestinationName.xml @@ -26,8 +26,6 @@ - - - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryOnly.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryOnly.xml index 8aae4b0cca..eb51b0af86 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryOnly.xml +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryOnly.xml @@ -20,8 +20,6 @@ - - - + 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 65c7f75f39..06c7524d5e 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 @@ -26,8 +26,6 @@ - - - + 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 d255d8aa5e..f2204a253f 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 @@ -24,8 +24,6 @@ - - - + 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 57fbeea05e..43e6a3e73d 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 @@ -31,8 +31,6 @@ - - - + 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 956cb91ee5..6e1c3a1a5f 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 @@ -36,8 +36,6 @@ - - - + 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 661eac3539..f1e0157535 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 @@ -32,8 +32,6 @@ - - - + 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 ef72def7b6..c13349b119 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 @@ -24,9 +24,7 @@ destination="testDestination" selector="TestProperty = 'foo'" channel="output1"> - - - + - - - + 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 8da2cda0b4..4820294779 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 @@ -18,13 +18,9 @@ request-destination="requestQueue" request-channel="requestChannel" message-converter="converter"> - - - + - - diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-context.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-context.xml index 1b79cdd497..ab5f299125 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-context.xml +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-context.xml @@ -5,8 +5,8 @@ xmlns:si="http://www.springframework.org/schema/integration" xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" - xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd - http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail-2.0.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd + http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> @@ -56,9 +56,7 @@ - - - + @@ -105,8 +103,6 @@ - - - + diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-invalidContext.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-invalidContext.xml index 3f3e56b120..21fe859a0e 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-invalidContext.xml +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-invalidContext.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mail="http://www.springframework.org/schema/integration/mail" xmlns:si="http://www.springframework.org/schema/integration" - xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd - http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd + http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> @@ -13,8 +13,6 @@ - - - + diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests-context.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests-context.xml index 0a78386636..bf877cca72 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests-context.xml +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests-context.xml @@ -25,8 +25,6 @@ bar - - - + diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/consoleInboundChannelAdapterParserTests.xml b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/consoleInboundChannelAdapterParserTests.xml index 5d234a7606..4d9857597f 100644 --- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/consoleInboundChannelAdapterParserTests.xml +++ b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/consoleInboundChannelAdapterParserTests.xml @@ -16,8 +16,6 @@ - - - + \ No newline at end of file diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml index a44673fd73..ce5176bcba 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml @@ -86,9 +86,7 @@ - - - + - @@ -26,14 +25,11 @@ output-channel="output" unmarshaller="unmarshaller"/> - - - - +