From 2eda315aa65a081bb65173a56e0b68c8414342c4 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 30 Apr 2010 22:01:08 +0000 Subject: [PATCH] INT-842 moved AbstractRemotingOutboundGatewayParser to core config.xml package and renamed AbstractOutboundGatewayParser --- .../config/HttpInvokerOutboundGatewayParser.java | 6 +++--- .../integration/rmi/config/RmiOutboundGatewayParser.java | 6 +++--- .../ws/config/WebServiceOutboundGatewayParser.java | 6 +++--- .../config/xml/AbstractOutboundGatewayParser.java | 9 ++++----- 4 files changed, 13 insertions(+), 14 deletions(-) rename org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingOutboundGatewayParser.java => org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractOutboundGatewayParser.java (87%) diff --git a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerOutboundGatewayParser.java b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerOutboundGatewayParser.java index 437a3eab9d..cd819e77e2 100644 --- a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerOutboundGatewayParser.java +++ b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerOutboundGatewayParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ package org.springframework.integration.httpinvoker.config; import org.w3c.dom.Element; -import org.springframework.integration.adapter.config.AbstractRemotingOutboundGatewayParser; +import org.springframework.integration.config.xml.AbstractOutboundGatewayParser; /** * Parser for the <outbound-gateway/> element of the 'httpinvoker' namespace. @@ -28,7 +28,7 @@ import org.springframework.integration.adapter.config.AbstractRemotingOutboundGa * @deprecated as of 2.0.x. We recommend using the REST-based HTTP adapters instead. */ @Deprecated -public class HttpInvokerOutboundGatewayParser extends AbstractRemotingOutboundGatewayParser { +public class HttpInvokerOutboundGatewayParser extends AbstractOutboundGatewayParser { @Override protected String getGatewayClassName(Element element) { diff --git a/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParser.java b/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParser.java index 6786fc811c..982eabc72b 100644 --- a/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParser.java +++ b/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import java.rmi.registry.Registry; import org.w3c.dom.Element; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.adapter.config.AbstractRemotingOutboundGatewayParser; +import org.springframework.integration.config.xml.AbstractOutboundGatewayParser; import org.springframework.integration.rmi.RmiInboundGateway; import org.springframework.util.StringUtils; @@ -30,7 +30,7 @@ import org.springframework.util.StringUtils; * * @author Mark Fisher */ -public class RmiOutboundGatewayParser extends AbstractRemotingOutboundGatewayParser { +public class RmiOutboundGatewayParser extends AbstractOutboundGatewayParser { @Override protected String getGatewayClassName(Element element) { diff --git a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParser.java b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParser.java index e99751ed28..c4c5bdb6c3 100644 --- a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParser.java +++ b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import org.springframework.beans.factory.config.ConstructorArgumentValues; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.adapter.config.AbstractRemotingOutboundGatewayParser; +import org.springframework.integration.config.xml.AbstractOutboundGatewayParser; import org.springframework.integration.config.xml.IntegrationNamespaceUtils; import org.springframework.util.StringUtils; @@ -32,7 +32,7 @@ import org.springframework.util.StringUtils; * @author Mark Fisher * @author Jonas Partner */ -public class WebServiceOutboundGatewayParser extends AbstractRemotingOutboundGatewayParser { +public class WebServiceOutboundGatewayParser extends AbstractOutboundGatewayParser { private static final String BASE_PACKAGE = "org.springframework.integration.ws"; diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingOutboundGatewayParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractOutboundGatewayParser.java similarity index 87% rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingOutboundGatewayParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractOutboundGatewayParser.java index a5dee87669..f8e7456880 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingOutboundGatewayParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractOutboundGatewayParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.adapter.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; @@ -22,15 +22,14 @@ import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.xml.AbstractConsumerEndpointParser; import org.springframework.util.StringUtils; /** - * Base class for url-based remoting outbound gateway parsers. + * Base class for url-based outbound gateway parsers. * * @author Mark Fisher */ -public abstract class AbstractRemotingOutboundGatewayParser extends AbstractConsumerEndpointParser { +public abstract class AbstractOutboundGatewayParser extends AbstractConsumerEndpointParser { protected abstract String getGatewayClassName(Element element);