The patch added support to resolve Resource
from contextLocation.
|
Index: java/org/apache/tuscany/container/spring/SCABeanDefinitionReader.java =================================================================== --- java/org/apache/tuscany/container/spring/SCABeanDefinitionReader.java (revision 409683) +++ java/org/apache/tuscany/container/spring/SCABeanDefinitionReader.java (working copy) @@ -19,7 +19,7 @@ protected XmlBeanDefinitionParser createXmlBeanDefinitionParser() { - return new SCAXmlBeanDefinitionParser(componentType); + return new SCAXMLBeanDefinitionParser(componentType); } } Index: java/org/apache/tuscany/container/spring/SCAXMLBeanDefinitionParser.java =================================================================== --- java/org/apache/tuscany/container/spring/SCAXMLBeanDefinitionParser.java (revision 409683) +++ java/org/apache/tuscany/container/spring/SCAXMLBeanDefinitionParser.java (working copy) @@ -10,11 +10,11 @@ * * @version $$Rev$$ $$Date$$ */ -public class SCAXmlBeanDefinitionParser extends DefaultXmlBeanDefinitionParser { +public class SCAXMLBeanDefinitionParser extends DefaultXmlBeanDefinitionParser { private CompositeComponentType componentType; - public SCAXmlBeanDefinitionParser(CompositeComponentType componentType) { + public SCAXMLBeanDefinitionParser(CompositeComponentType componentType) { this.componentType = componentType; } Index: java/org/apache/tuscany/container/spring/SpringComponentTypeLoader.java =================================================================== --- java/org/apache/tuscany/container/spring/SpringComponentTypeLoader.java (revision 409683) +++ java/org/apache/tuscany/container/spring/SpringComponentTypeLoader.java (working copy) @@ -7,12 +7,12 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.io.Resource; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; /** - * Loads a component type for a Spring <code>ApplicationContext</code>. The impplementation creates a new - * instance of a Spring application context which is configured with SCA namespace handlers for generating - * component type information - * + * Loads a component type for a Spring <code>ApplicationContext</code>. The impplementation creates a new instance of a Spring application context + * which is configured with SCA namespace handlers for generating component type information + * * @version $$Rev$$ $$Date$$ */ public class SpringComponentTypeLoader implements ComponentTypeLoader<SpringImplementation> { @@ -21,7 +21,9 @@ DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); CompositeComponentType componentType = new CompositeComponentType(); XmlBeanDefinitionReader reader = new SCABeanDefinitionReader(beanFactory, componentType); - Resource resource = null; //FIXME + PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(deploymentContext.getClassLoader()); + String contextLocation = implementation.getContextLocation(); + Resource resource = resolver.getResource(contextLocation); reader.loadBeanDefinitions(resource); GenericApplicationContext ctx = new GenericApplicationContext(beanFactory); ctx.refresh();
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]