From 9ed5cc6a610a6e0d7e1a7e5239377075bfe0ffa0 Mon Sep 17 00:00:00 2001
From: Jonas Partner <jonas.partner@gmail.com>
Date: Wed, 25 Jun 2008 17:30:12 +0000
Subject: [PATCH] removed security references

---
 .../channel/config/AbstractChannelParser.java |  7 ------
 .../config/spring-integration-core-1.0.xsd    | 24 -------------------
 2 files changed, 31 deletions(-)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/AbstractChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/AbstractChannelParser.java
index 23fe3126c4..03efddafdb 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/AbstractChannelParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/AbstractChannelParser.java
@@ -49,9 +49,6 @@ public abstract class AbstractChannelParser extends AbstractSingleBeanDefinition
 
 	private static final String INTERCEPTORS_PROPERTY = "interceptors";
 
-	private static final String SECURED_ELEMENT ="secured";
-
-
 	@Override
 	protected boolean shouldGenerateId() {
 		return false;
@@ -85,10 +82,6 @@ public abstract class AbstractChannelParser extends AbstractSingleBeanDefinition
 					String ref = ((Element) child).getAttribute("ref");
 					interceptors.add(new RuntimeBeanReference(ref));
 				}
-				else if (SECURED_ELEMENT.equals(localName)) {
-					parserContext.getReaderContext().getNamespaceHandlerResolver().resolve(
-							element.getNamespaceURI()).parse((Element)child, parserContext);
-				}
 			}
 		}
 		String datatypeAttr = element.getAttribute(DATATYPE_ATTRIBUTE);
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
index 38dd12aa88..6719c99613 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
@@ -120,7 +120,6 @@
 		<xsd:sequence>
 			<xsd:element ref="dispatcher-policy" minOccurs="0" maxOccurs="1"/>
 			<xsd:element ref="interceptor" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element name="secured" type="securedType" minOccurs="0" maxOccurs="1"/>
 		</xsd:sequence>
 		<xsd:attribute name="id" type="xsd:ID" use="required"/>
 		<xsd:attribute name="publish-subscribe" type="xsd:boolean" default="false"/>
@@ -438,27 +437,4 @@
 		</xsd:complexContent>
 	</xsd:complexType>
 
-	<xsd:element name="secure-channels" type="secureChannelsType"/>
-
-	<xsd:complexType name="securedType">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines a security interceptor.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="receive-access" type="xsd:string"/>
-		<xsd:attribute name="send-access" type="xsd:string"/>
-		<xsd:attribute name="access-decision-manager" type="xsd:string"/>
-		<xsd:attribute name="propagate" type="xsd:boolean" default="true"/>
-	</xsd:complexType>
-
-	<xsd:complexType name="secureChannelsType">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines a bean post processor which propagates the security context.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="propagate" type="xsd:boolean" default="true"/>
-	</xsd:complexType>
-
 </xsd:schema>
\ No newline at end of file