From b58706a1d7aba483ca052939c0823a13381c516c Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 2 Oct 2008 02:47:29 +0000
Subject: [PATCH] Removed EndpointInterceptorParser and removed the
 "interceptors" sub-element from the "endpoint" element in the schema
 definition.

---
 .../config/AbstractEndpointParser.java        |  9 ------
 .../config/EndpointInterceptorParser.java     | 32 -------------------
 .../config/spring-integration-1.0.xsd         | 19 -----------
 3 files changed, 60 deletions(-)
 delete mode 100644 org.springframework.integration/src/main/java/org/springframework/integration/config/EndpointInterceptorParser.java

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractEndpointParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractEndpointParser.java
index f689c4c66f..5825091ca4 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractEndpointParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractEndpointParser.java
@@ -22,7 +22,6 @@ import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
-import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.endpoint.MessageEndpoint;
@@ -51,8 +50,6 @@ public abstract class AbstractEndpointParser extends AbstractSingleBeanDefinitio
 
 	private static final String ERROR_HANDLER_ATTRIBUTE = "error-handler";
 
-	private static final String INTERCEPTORS_ELEMENT = "interceptors";
-
 
 	/**
 	 * Subclasses may override this method to determine whether the endpoint
@@ -109,12 +106,6 @@ public abstract class AbstractEndpointParser extends AbstractSingleBeanDefinitio
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, OUTPUT_CHANNEL_ATTRIBUTE);
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, SELECTOR_ATTRIBUTE);
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, ERROR_HANDLER_ATTRIBUTE);
-		Element interceptorsElement = DomUtils.getChildElementByTagName(element, INTERCEPTORS_ELEMENT);
-		if (interceptorsElement != null) {
-			EndpointInterceptorParser parser = new EndpointInterceptorParser();
-			ManagedList interceptors = parser.parseInterceptors(interceptorsElement, parserContext);
-			builder.addPropertyValue("interceptors", interceptors);
-		}
 		this.postProcess(element, parserContext, builder);
 	}
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/EndpointInterceptorParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/EndpointInterceptorParser.java
deleted file mode 100644
index 70dbf47efa..0000000000
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/EndpointInterceptorParser.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2002-2008 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.integration.config;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Mark Fisher
- */
-public class EndpointInterceptorParser extends AbstractInterceptorParser {
-
-	@Override
-	protected Map<String, BeanDefinitionRegisteringParser> getParserMap() {
-		return new HashMap<String, BeanDefinitionRegisteringParser>();
-	}
-
-}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
index d3d076a312..5ffeb92861 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
@@ -222,7 +222,6 @@
 			<xsd:extension base="beans:identifiedType">
 				<xsd:all>
 					<xsd:element ref="poller" minOccurs="0" maxOccurs="1"/>
-					<xsd:element name="interceptors" type="endpointInterceptorsType" minOccurs="0" maxOccurs="1"/>
 				</xsd:all>
 				<xsd:attribute name="input-channel" type="xsd:string" use="required"/>
 				<xsd:attribute name="ref" type="xsd:string"/>
@@ -433,24 +432,6 @@
 		<xsd:attribute name="timeout" type="xsd:long" use="optional"/>
 	</xsd:complexType>
 
-	<xsd:complexType name="endpointInterceptorsType">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines a list of interceptors. Each element may be an EndpointInterceptor, ref, or inner-bean.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:choice minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="ref" minOccurs="0" maxOccurs="unbounded">
-					<xsd:complexType>
-						<xsd:attribute name="bean" use="required"/>
-					</xsd:complexType>
-				</xsd:element>
-				<xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="unbounded"/>
-			</xsd:choice>
-		</xsd:sequence>
-	</xsd:complexType>
-
 	<xsd:complexType name="transactionalType">
 		<xsd:attribute name="transaction-manager" type="xsd:string" default="transactionManager">
 			<xsd:annotation>