Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed EndpointInterceptorParser and removed the "interceptors" sub-element from the "endpoint" element in the schema definition.

Browse Source
This commit is contained in:
Mark Fisher
2008-10-02 02:47:29 +00:00
parent a8ce041a0b
commit b58706a1d7
3 changed files with 0 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractEndpointParser.java
View File

@@ -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);
}

32
org.springframework.integration/src/main/java/org/springframework/integration/config/EndpointInterceptorParser.java
View File

@@ -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>();
}
}

19
org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
View File

@@ -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>