From 9ab7f4ef4ef54eb0c1dc0adf8fabc76672464566 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 22 Jun 2011 18:05:33 -0400 Subject: [PATCH] INT-1949 AbstractChannelParser no longer does class loading --- .../config/xml/AbstractChannelParser.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelParser.java index adb11ce94a..d4ed9112f7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2011 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. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import org.w3c.dom.Element; - import org.springframework.aop.scope.ScopedProxyUtils; import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.support.AbstractBeanDefinition; @@ -26,9 +24,9 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.ManagedList; import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; +import org.w3c.dom.Element; /** * Base class for channel parsers. @@ -53,15 +51,7 @@ public abstract class AbstractChannelParser extends AbstractBeanDefinitionParser } String datatypeAttr = element.getAttribute("datatype"); if (StringUtils.hasText(datatypeAttr)) { - // TODO: remove this once the editor fallback is working (3.0 GA) - // it should be replaced with: builder.addPropertyValue("datatypes", datatypeAttr); - String[] classnames = StringUtils.commaDelimitedListToStringArray(datatypeAttr); - Class[] datatypes = new Class[classnames.length]; - int i = 0; - for (String classname : classnames) { - datatypes[i++] = ClassUtils.resolveClassName(classname.trim(), this.getClass().getClassLoader()); - } - builder.addPropertyValue("datatypes", datatypes); + builder.addPropertyValue("datatypes", datatypeAttr); } builder.addPropertyValue("interceptors", interceptors); AbstractBeanDefinition beanDefinition = builder.getBeanDefinition();