From 590f7e9f26741c2f8c21cb53e802f349fe9c333a Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Mon, 7 Jul 2008 01:54:41 +0000 Subject: [PATCH] Consolidated security parsers into the main 'config' package (avoids a tangle). --- .../security/config/IntegrationSecurityNamespaceHandler.java | 3 --- .../security/{channel => }/config/SecuredChannelsParser.java | 2 +- .../config/SecurityEndpointInterceptorParser.java | 2 +- .../config/SecurityPropagatingBeanPostProcessor.java | 3 +-- .../config/SecurityPropagatingChannelsParser.java | 4 +--- .../config/SecuredChannelsParserTests-context.xml | 0 .../{channel => }/config/SecuredChannelsParserTests.java | 2 +- ...atingChannelsParserTests-noPropagationByDefaultContext.xml | 0 ...opagatingChannelsParserTests-propagateByDefaultContext.xml | 0 .../config/SecurityPropagatingChannelsParserTests.java | 2 +- 10 files changed, 6 insertions(+), 12 deletions(-) rename org.springframework.integration.security/src/main/java/org/springframework/integration/security/{channel => }/config/SecuredChannelsParser.java (98%) rename org.springframework.integration.security/src/main/java/org/springframework/integration/security/{endpoint => }/config/SecurityEndpointInterceptorParser.java (97%) rename org.springframework.integration.security/src/main/java/org/springframework/integration/security/{channel => }/config/SecurityPropagatingBeanPostProcessor.java (94%) rename org.springframework.integration.security/src/main/java/org/springframework/integration/security/{channel => }/config/SecurityPropagatingChannelsParser.java (90%) rename org.springframework.integration.security/src/test/java/org/springframework/integration/security/{channel => }/config/SecuredChannelsParserTests-context.xml (100%) rename org.springframework.integration.security/src/test/java/org/springframework/integration/security/{channel => }/config/SecuredChannelsParserTests.java (98%) rename org.springframework.integration.security/src/test/java/org/springframework/integration/security/{channel => }/config/SecurityPropagatingChannelsParserTests-noPropagationByDefaultContext.xml (100%) rename org.springframework.integration.security/src/test/java/org/springframework/integration/security/{channel => }/config/SecurityPropagatingChannelsParserTests-propagateByDefaultContext.xml (100%) rename org.springframework.integration.security/src/test/java/org/springframework/integration/security/{channel => }/config/SecurityPropagatingChannelsParserTests.java (98%) diff --git a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/IntegrationSecurityNamespaceHandler.java b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/IntegrationSecurityNamespaceHandler.java index 8b0c828fbe..ed907802c6 100644 --- a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/IntegrationSecurityNamespaceHandler.java +++ b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/IntegrationSecurityNamespaceHandler.java @@ -18,9 +18,6 @@ package org.springframework.integration.security.config; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; import org.springframework.integration.security.StackBasedSecurityContextHolderStrategy; -import org.springframework.integration.security.channel.config.SecuredChannelsParser; -import org.springframework.integration.security.channel.config.SecurityPropagatingChannelsParser; -import org.springframework.integration.security.endpoint.config.SecurityEndpointInterceptorParser; import org.springframework.security.context.SecurityContextHolder; /** diff --git a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/config/SecuredChannelsParser.java b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java similarity index 98% rename from org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/config/SecuredChannelsParser.java rename to org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java index eec92924ac..9ad93250b2 100644 --- a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/config/SecuredChannelsParser.java +++ b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.security.channel.config; +package org.springframework.integration.security.config; import java.util.ArrayList; import java.util.List; diff --git a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/endpoint/config/SecurityEndpointInterceptorParser.java b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecurityEndpointInterceptorParser.java similarity index 97% rename from org.springframework.integration.security/src/main/java/org/springframework/integration/security/endpoint/config/SecurityEndpointInterceptorParser.java rename to org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecurityEndpointInterceptorParser.java index e42e50ebbf..bb04e9b4b9 100644 --- a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/endpoint/config/SecurityEndpointInterceptorParser.java +++ b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecurityEndpointInterceptorParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.security.endpoint.config; +package org.springframework.integration.security.config; import org.springframework.beans.BeanMetadataAttribute; import org.springframework.beans.factory.config.RuntimeBeanReference; diff --git a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/config/SecurityPropagatingBeanPostProcessor.java b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecurityPropagatingBeanPostProcessor.java similarity index 94% rename from org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/config/SecurityPropagatingBeanPostProcessor.java rename to org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecurityPropagatingBeanPostProcessor.java index edadc110fb..12a8eabfab 100644 --- a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/config/SecurityPropagatingBeanPostProcessor.java +++ b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecurityPropagatingBeanPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.security.channel.config; +package org.springframework.integration.security.config; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,7 +23,6 @@ import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.core.Ordered; import org.springframework.integration.channel.AbstractMessageChannel; import org.springframework.integration.security.channel.SecurityContextPropagatingChannelInterceptor; -import org.springframework.integration.security.config.OrderedIncludeExcludeList; /** * Post processes channels applying appropriate propagation behaviour. If diff --git a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/config/SecurityPropagatingChannelsParser.java b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecurityPropagatingChannelsParser.java similarity index 90% rename from org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/config/SecurityPropagatingChannelsParser.java rename to org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecurityPropagatingChannelsParser.java index f18e8b4de2..8c37fc7420 100644 --- a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/config/SecurityPropagatingChannelsParser.java +++ b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecurityPropagatingChannelsParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.security.channel.config; +package org.springframework.integration.security.config; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder; @@ -22,8 +22,6 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.security.config.IncludeExcludePatternParser; -import org.springframework.integration.security.config.OrderedIncludeExcludeList; import org.springframework.security.context.SecurityContext; import org.w3c.dom.Element; diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/config/SecuredChannelsParserTests-context.xml b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests-context.xml similarity index 100% rename from org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/config/SecuredChannelsParserTests-context.xml rename to org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests-context.xml diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/config/SecuredChannelsParserTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java similarity index 98% rename from org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/config/SecuredChannelsParserTests.java rename to org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java index f943debc80..80d193e43f 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/config/SecuredChannelsParserTests.java +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.security.channel.config; +package org.springframework.integration.security.config; import static org.junit.Assert.*; diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/config/SecurityPropagatingChannelsParserTests-noPropagationByDefaultContext.xml b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecurityPropagatingChannelsParserTests-noPropagationByDefaultContext.xml similarity index 100% rename from org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/config/SecurityPropagatingChannelsParserTests-noPropagationByDefaultContext.xml rename to org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecurityPropagatingChannelsParserTests-noPropagationByDefaultContext.xml diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/config/SecurityPropagatingChannelsParserTests-propagateByDefaultContext.xml b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecurityPropagatingChannelsParserTests-propagateByDefaultContext.xml similarity index 100% rename from org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/config/SecurityPropagatingChannelsParserTests-propagateByDefaultContext.xml rename to org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecurityPropagatingChannelsParserTests-propagateByDefaultContext.xml diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/config/SecurityPropagatingChannelsParserTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecurityPropagatingChannelsParserTests.java similarity index 98% rename from org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/config/SecurityPropagatingChannelsParserTests.java rename to org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecurityPropagatingChannelsParserTests.java index 2507411404..cebe576d2a 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/config/SecurityPropagatingChannelsParserTests.java +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecurityPropagatingChannelsParserTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.security.channel.config; +package org.springframework.integration.security.config; import static org.junit.Assert.*;