Consolidated security parsers into the main 'config' package (avoids a tangle).

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

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;

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;

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

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;
 

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.*;
 

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.*;