diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java index 297619bdf2..3d9fe3d4f0 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java @@ -16,21 +16,9 @@ package org.springframework.integration.config; -import java.io.IOException; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; -import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.integration.config.annotation.AnnotationDrivenParser; import org.springframework.integration.gateway.config.GatewayParser; -import org.springframework.util.ClassUtils; /** * Namespace handler for the integration namespace. @@ -40,12 +28,6 @@ import org.springframework.util.ClassUtils; */ public class IntegrationNamespaceHandler extends NamespaceHandlerSupport { - private static final String ADAPTER_PARSER_MAPPINGS_LOCATION = "META-INF/spring-integration.parsers"; - - - private final Log logger = LogFactory.getLog(this.getClass()); - - public void init() { registerBeanDefinitionParser("message-bus", new MessageBusParser()); registerBeanDefinitionParser("annotation-driven", new AnnotationDrivenParser()); @@ -61,48 +43,6 @@ public class IntegrationNamespaceHandler extends NamespaceHandlerSupport { registerBeanDefinitionParser("aggregator", new AggregatorParser()); registerBeanDefinitionParser("resequencer", new ResequencerParser()); registerBeanDefinitionParser("pool-executor", new PoolExecutorParser()); - Map> parserMappings = this.loadAdapterParserMappings(); - try { - for (Map.Entry> entry : parserMappings.entrySet()) { - registerBeanDefinitionParser(entry.getKey(), (BeanDefinitionParser) entry.getValue().newInstance()); - } - } - catch (Exception e) { - throw new IllegalStateException("Failed to instantiate BeanDefinitionParser.", e); - } - } - - private Map> loadAdapterParserMappings() { - Map> parserMappings = - new HashMap>(); - ClassLoader classLoader = getClass().getClassLoader(); - try { - Properties mappings = - PropertiesLoaderUtils.loadAllProperties(ADAPTER_PARSER_MAPPINGS_LOCATION, classLoader); - if (logger.isDebugEnabled()) { - logger.debug("Loaded parser mappings [" + mappings + "]"); - } - Enumeration propertyNames = mappings.propertyNames(); - while (propertyNames.hasMoreElements()) { - String name = (String) propertyNames.nextElement(); - String classname = mappings.getProperty(name); - Class parserClass = ClassUtils.forName(classname, classLoader); - if (!BeanDefinitionParser.class.isAssignableFrom(parserClass)) { - throw new IllegalStateException("Expected class of type BeanDefinitionParser, but '" + - name + "' was of type '" + parserClass.getSimpleName() + "'"); - } - parserMappings.put(name, (Class) parserClass); - } - return parserMappings; - } - catch (IOException e) { - throw new IllegalStateException( - "Unable to load BeanDefinitionParser mappings from location [" + - ADAPTER_PARSER_MAPPINGS_LOCATION + "]. Root cause: " + e); - } - catch (ClassNotFoundException e) { - throw new IllegalStateException("Failed to load BeanDefinitionParser.", e); - } } }