You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/04/24 15:58:42 UTC
svn commit: r396557 - in /incubator/tuscany/java/sca:
bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/
bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/loader/
containers/container.java/src/main/jav...
Author: jboynes
Date: Mon Apr 24 06:58:26 2006
New Revision: 396557
URL: http://svn.apache.org/viewcvs?rev=396557&view=rev
Log:
give the load operation a context
Added:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderContext.java (with props)
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceBindingLoader.java
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/loader/JSONRPCBindingLoader.java
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaImplementationLoader.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/loader/JavaImplementationLoaderTestCase.java
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptImplementationLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/StAXModuleComponentConfigurationLoaderImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXElementLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXLoaderRegistry.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AggregateLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/EntryPointLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceJavaLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleFragmentLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/PropertyLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ReferenceLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ServiceLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StAXLoaderRegistryImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemBindingLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemImplementationLoader.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoaderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoaderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoaderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java
Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceBindingLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceBindingLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceBindingLoader.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceBindingLoader.java Mon Apr 24 06:58:26 2006
@@ -23,10 +23,10 @@
import org.apache.tuscany.binding.axis2.assembly.WebServiceAssemblyFactory;
import org.apache.tuscany.binding.axis2.assembly.WebServiceBinding;
import org.apache.tuscany.binding.axis2.assembly.impl.WebServiceAssemblyFactoryImpl;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.loader.StAXElementLoader;
import org.apache.tuscany.core.loader.StAXLoaderRegistry;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.osoa.sca.annotations.Destroy;
@@ -61,7 +61,7 @@
}
public WebServiceBinding load(XMLStreamReader reader,
- ResourceLoader resourceLoader)
+ LoaderContext loaderContext)
throws XMLStreamException, ConfigurationLoadException {
WebServiceBinding binding = WS_FACTORY.createWebServiceBinding();
Modified: incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/loader/JSONRPCBindingLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/loader/JSONRPCBindingLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/loader/JSONRPCBindingLoader.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/loader/JSONRPCBindingLoader.java Mon Apr 24 06:58:26 2006
@@ -21,10 +21,10 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.binding.jsonrpc.assembly.JSONRPCBinding;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.loader.StAXElementLoader;
import org.apache.tuscany.core.loader.StAXLoaderRegistry;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Init;
@@ -55,7 +55,7 @@
registry.unregisterLoader(BINDING_JSONRPC, this);
}
- public JSONRPCBinding load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public JSONRPCBinding load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
JSONRPCBinding binding = new JSONRPCBinding();
binding.setURI(reader.getAttributeValue(null, "uri"));
return binding;
Modified: incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaImplementationLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaImplementationLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaImplementationLoader.java Mon Apr 24 06:58:26 2006
@@ -39,6 +39,7 @@
import org.apache.tuscany.core.config.impl.Java5ComponentTypeIntrospector;
import org.apache.tuscany.core.loader.StAXElementLoader;
import org.apache.tuscany.core.loader.StAXLoaderRegistry;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.core.loader.assembly.AssemblyConstants;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.ComponentInfo;
@@ -82,12 +83,12 @@
registry.unregisterLoader(IMPLEMENTATION_JAVA, this);
}
- public JavaImplementation load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public JavaImplementation load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
JavaImplementation javaImpl = factory.createJavaImplementation();
String typeName = reader.getAttributeValue(null, "class");
- Class<?> implementationClass = getImplementationClass(resourceLoader, typeName);
+ Class<?> implementationClass = getImplementationClass(loaderContext.getResourceLoader(), typeName);
javaImpl.setImplementationClass(implementationClass);
- javaImpl.setComponentInfo(loadComponentType(resourceLoader, implementationClass));
+ javaImpl.setComponentInfo(loadComponentType(loaderContext, implementationClass));
return javaImpl;
}
@@ -104,13 +105,13 @@
}
}
- protected ComponentInfo loadComponentType(ResourceLoader loader, Class<?> implClass) throws ConfigurationLoadException, XMLStreamException {
+ protected ComponentInfo loadComponentType(LoaderContext loaderContext, Class<?> implClass) throws ConfigurationLoadException, XMLStreamException {
String baseName = JavaIntrospectionHelper.getBaseName(implClass);
URL sidefile = implClass.getResource(baseName + ".componentType");
if (sidefile == null) {
return loadComponentTypeByIntrospection(implClass);
} else {
- return loadComponentTypeFromSidefile(sidefile, loader);
+ return loadComponentTypeFromSidefile(sidefile, loaderContext);
}
}
@@ -118,7 +119,7 @@
return introspector.introspect(implClass);
}
- protected ComponentInfo loadComponentTypeFromSidefile(URL sidefile, ResourceLoader loader) throws SidefileLoadException {
+ protected ComponentInfo loadComponentTypeFromSidefile(URL sidefile, LoaderContext loaderContext) throws SidefileLoadException {
try {
XMLStreamReader reader;
InputStream is;
@@ -132,7 +133,7 @@
e.setResourceURI(sidefile.toString());
throw e;
}
- return (ComponentInfo) registry.load(reader, loader);
+ return (ComponentInfo) registry.load(reader, loaderContext);
} finally {
try {
reader.close();
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/loader/JavaImplementationLoaderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/loader/JavaImplementationLoaderTestCase.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/loader/JavaImplementationLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/loader/JavaImplementationLoaderTestCase.java Mon Apr 24 06:58:26 2006
@@ -25,7 +25,6 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.container.java.assembly.JavaAssemblyFactory;
import org.apache.tuscany.container.java.assembly.impl.JavaAssemblyFactoryImpl;
import org.apache.tuscany.container.java.assembly.mock.HelloWorldImpl;
@@ -34,6 +33,7 @@
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.loader.StAXElementLoader;
import org.apache.tuscany.core.loader.StAXLoaderRegistry;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.core.loader.assembly.AssemblyConstants;
import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.AssemblyObject;
@@ -108,7 +108,7 @@
this.mockType = mockType;
}
- public AssemblyObject load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public AssemblyObject load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
assertEquals(AssemblyConstants.COMPONENT_TYPE, reader.getName());
return mockType;
}
Modified: incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptImplementationLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptImplementationLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/loader/JavaScriptImplementationLoader.java Mon Apr 24 06:58:26 2006
@@ -38,6 +38,7 @@
import org.apache.tuscany.core.config.SidefileLoadException;
import org.apache.tuscany.core.loader.StAXElementLoader;
import org.apache.tuscany.core.loader.StAXLoaderRegistry;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.core.loader.assembly.AssemblyConstants;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.ComponentInfo;
@@ -75,18 +76,18 @@
registry.unregisterLoader(IMPLEMENTATION_JS, this);
}
- public JavaScriptImplementation load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public JavaScriptImplementation load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
String scriptFile = reader.getAttributeValue(null, "scriptFile");
String style = reader.getAttributeValue(null, "style");
- String script = loadScript(scriptFile, resourceLoader);
- ComponentInfo componentType = loadComponentType(scriptFile, resourceLoader);
+ String script = loadScript(scriptFile, loaderContext.getResourceLoader());
+ ComponentInfo componentType = loadComponentType(scriptFile, loaderContext);
JavaScriptImplementation jsImpl = factory.createJavaScriptImplementation();
jsImpl.setComponentInfo(componentType);
jsImpl.setScriptFile(scriptFile);
jsImpl.setStyle(style);
jsImpl.setScript(script);
- jsImpl.setResourceLoader(resourceLoader);
+ jsImpl.setResourceLoader(loaderContext.getResourceLoader());
return jsImpl;
}
@@ -119,9 +120,9 @@
}
}
- protected ComponentInfo loadComponentType(String scriptFile, ResourceLoader resourceLoader) throws SidefileLoadException, MissingResourceException{
+ protected ComponentInfo loadComponentType(String scriptFile, LoaderContext loaderContext) throws SidefileLoadException, MissingResourceException{
String sidefile = scriptFile.substring(0, scriptFile.lastIndexOf('.')) + ".componentType";
- URL componentTypeFile = resourceLoader.getResource(sidefile);
+ URL componentTypeFile = loaderContext.getResourceLoader().getResource(sidefile);
if (componentTypeFile == null) {
throw new MissingResourceException(sidefile);
}
@@ -139,7 +140,7 @@
e.setResourceURI(componentTypeFile.toString());
throw e;
}
- return (ComponentInfo) registry.load(reader, resourceLoader);
+ return (ComponentInfo) registry.load(reader, loaderContext);
} finally {
try {
reader.close();
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/StAXModuleComponentConfigurationLoaderImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/StAXModuleComponentConfigurationLoaderImpl.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/StAXModuleComponentConfigurationLoaderImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/StAXModuleComponentConfigurationLoaderImpl.java Mon Apr 24 06:58:26 2006
@@ -18,6 +18,7 @@
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.loader.StAXLoaderRegistry;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.Module;
import org.apache.tuscany.model.assembly.ModuleFragment;
@@ -47,7 +48,7 @@
try {
XMLStreamReader reader = xmlFactory.createXMLStreamReader(url.openStream());
getDocumentRoot(reader);
- return (Module) registry.load(reader, resourceLoader);
+ return (Module) registry.load(reader, new LoaderContext(resourceLoader));
} catch (XMLStreamException e) {
ConfigurationLoadException ce = new ConfigurationLoadException(e);
ce.setResourceURI(url.toString());
@@ -66,7 +67,7 @@
try {
XMLStreamReader reader = xmlFactory.createXMLStreamReader(url.openStream());
getDocumentRoot(reader);
- return (ModuleFragment) registry.load(reader, resourceLoader);
+ return (ModuleFragment) registry.load(reader, new LoaderContext(resourceLoader));
} catch (XMLStreamException e) {
ConfigurationLoadException ce = new ConfigurationLoadException(e);
ce.setResourceURI(url.toString());
Added: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderContext.java?rev=396557&view=auto
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderContext.java (added)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderContext.java Mon Apr 24 06:58:26 2006
@@ -0,0 +1,34 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation or its licensors as applicable
+ *
+ * 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.apache.tuscany.core.loader;
+
+import org.apache.tuscany.common.resource.ResourceLoader;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class LoaderContext {
+ private final ResourceLoader resourceLoader;
+
+ public LoaderContext(ResourceLoader resourceLoader) {
+ this.resourceLoader = resourceLoader;
+ }
+
+ public ResourceLoader getResourceLoader() {
+ return resourceLoader;
+ }
+}
Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderContext.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXElementLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXElementLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXElementLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXElementLoader.java Mon Apr 24 06:58:26 2006
@@ -19,7 +19,6 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.model.assembly.AssemblyObject;
@@ -34,8 +33,8 @@
* When this method returns the stream will be positioned on the corresponding END_ELEMENT.
*
* @param reader the XML stream reader positioned on the applicable START_ELEMENT
- * @param resourceLoader a resource loader for application artifacts
+ * @param loaderContext the context for the load operation
* @return the model object for that element
*/
- T load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException;
+ T load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException;
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXLoaderRegistry.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXLoaderRegistry.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXLoaderRegistry.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXLoaderRegistry.java Mon Apr 24 06:58:26 2006
@@ -16,15 +16,14 @@
*/
package org.apache.tuscany.core.loader;
-import org.apache.tuscany.common.resource.ResourceLoader;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.AssemblyObject;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.namespace.QName;
-
/**
* Registry for XML loaders that can parse a StAX input stream and return model objects.
* <p/>
@@ -45,15 +44,15 @@
* during its initialization.
*
* @param element the element that should be delegated to the contibuted loader
- * @param loader a loader that is being contributed to the system
-
+ * @param loader a loader that is being contributed to the system
*/
<T extends AssemblyObject> void registerLoader(QName element, StAXElementLoader<T> loader);
/**
* Unregister a loader. This will typically be called by a loader as it is being destroyed.
+ *
* @param element the element that was being delegated to the contibuted loader
- * @param loader a loader that should no longer be used
+ * @param loader a loader that should no longer be used
*/
<T extends AssemblyObject> void unregisterLoader(QName element, StAXElementLoader<T> loader);
@@ -65,12 +64,12 @@
* When this method returns, the stream will be positioned on the corresponding
* END_ELEMENT event.
*
- * @param reader the XML stream to parse
- * @param resourceLoader a resource loader for application artifacts
+ * @param reader the XML stream to parse
+ * @param loaderContext
* @return the model object obtained by parsing the current element on the stream
* @throws XMLStreamException if there was a problem reading the stream
*/
- AssemblyObject load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException;
+ AssemblyObject load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException;
/**
* Hack to allow loaders to initialize model objects on the fly.
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AggregateLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AggregateLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AggregateLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AggregateLoader.java Mon Apr 24 06:58:26 2006
@@ -21,11 +21,11 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
-import org.apache.tuscany.model.assembly.Composite;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.Component;
+import org.apache.tuscany.model.assembly.Composite;
import org.apache.tuscany.model.assembly.EntryPoint;
import org.apache.tuscany.model.assembly.ExternalService;
import org.apache.tuscany.model.assembly.ImportWSDL;
@@ -35,12 +35,12 @@
* @version $Rev$ $Date$
*/
public abstract class AggregateLoader extends AbstractLoader {
- public void loadAggregate(XMLStreamReader reader, Composite aggregate, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public void loadAggregate(XMLStreamReader reader, Composite aggregate, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
aggregate.setName(reader.getAttributeValue(null, "name"));
while (true) {
switch (reader.next()) {
case START_ELEMENT:
- AssemblyObject o = registry.load(reader, resourceLoader);
+ AssemblyObject o = registry.load(reader, loaderContext);
if (o instanceof EntryPoint) {
aggregate.getEntryPoints().add((EntryPoint) o);
} else if (o instanceof ExternalService) {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java Mon Apr 24 06:58:26 2006
@@ -34,7 +34,7 @@
import org.apache.tuscany.core.loader.InvalidPropertyFactoryException;
import org.apache.tuscany.core.loader.StAXPropertyFactory;
import org.apache.tuscany.core.loader.StAXUtil;
-import org.apache.tuscany.core.loader.impl.StringParserPropertyFactory;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.Component;
@@ -62,7 +62,7 @@
return COMPONENT;
}
- public Component load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public Component load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
assert COMPONENT.equals(reader.getName());
Component component = factory.createSimpleComponent();
@@ -73,11 +73,11 @@
case START_ELEMENT:
QName name = reader.getName();
if (PROPERTIES.equals(name)) {
- loadProperties(reader, resourceLoader, component);
+ loadProperties(reader, loaderContext.getResourceLoader(), component);
} else if (REFERENCES.equals(name)) {
loadReferences(reader, component);
} else {
- AssemblyObject o = registry.load(reader, resourceLoader);
+ AssemblyObject o = registry.load(reader, loaderContext);
if (o instanceof Implementation) {
Implementation impl = (Implementation) o;
impl.initialize(registry.getContext());
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoader.java Mon Apr 24 06:58:26 2006
@@ -16,9 +16,9 @@
*/
package org.apache.tuscany.core.loader.assembly;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import static org.apache.tuscany.core.loader.assembly.AssemblyConstants.COMPONENT_TYPE;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.ComponentInfo;
import org.apache.tuscany.model.assembly.Property;
@@ -41,14 +41,14 @@
return COMPONENT_TYPE;
}
- public ComponentInfo load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public ComponentInfo load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
assert COMPONENT_TYPE.equals(reader.getName());
ComponentInfo componentType = factory.createComponentInfo();
while (true) {
switch (reader.next()) {
case START_ELEMENT:
- AssemblyObject o = registry.load(reader, resourceLoader);
+ AssemblyObject o = registry.load(reader, loaderContext);
if (o instanceof Service) {
componentType.getServices().add((Service) o);
} else if (o instanceof Reference) {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/EntryPointLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/EntryPointLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/EntryPointLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/EntryPointLoader.java Mon Apr 24 06:58:26 2006
@@ -16,9 +16,9 @@
*/
package org.apache.tuscany.core.loader.assembly;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.loader.StAXUtil;
+import org.apache.tuscany.core.loader.LoaderContext;
import static org.apache.tuscany.core.loader.assembly.AssemblyConstants.ENTRY_POINT;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.Binding;
@@ -46,7 +46,7 @@
return ENTRY_POINT;
}
- public EntryPoint load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public EntryPoint load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
assert ENTRY_POINT.equals(reader.getName());
EntryPoint entryPoint = factory.createEntryPoint();
String name = reader.getAttributeValue(null, "name");
@@ -72,7 +72,7 @@
String uri = reader.getElementText();
configuredReference.getTargets().add(uri);
} else {
- AssemblyObject o = registry.load(reader, resourceLoader);
+ AssemblyObject o = registry.load(reader, loaderContext);
if (o instanceof Binding) {
entryPoint.getBindings().add((Binding) o);
} else if (o instanceof ServiceContract) {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoader.java Mon Apr 24 06:58:26 2006
@@ -16,9 +16,9 @@
*/
package org.apache.tuscany.core.loader.assembly;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.loader.StAXUtil;
+import org.apache.tuscany.core.loader.LoaderContext;
import static org.apache.tuscany.core.loader.assembly.AssemblyConstants.EXTERNAL_SERVICE;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.Binding;
@@ -44,7 +44,7 @@
return EXTERNAL_SERVICE;
}
- public ExternalService load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public ExternalService load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
assert EXTERNAL_SERVICE.equals(reader.getName());
String name = reader.getAttributeValue(null, "name");
ExternalService externalService = factory.createExternalService();
@@ -54,7 +54,7 @@
while (true) {
switch (reader.next()) {
case START_ELEMENT:
- AssemblyObject o = registry.load(reader, resourceLoader);
+ AssemblyObject o = registry.load(reader, loaderContext);
if (o instanceof ServiceContract) {
Service service = factory.createService();
service.setName(name);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java Mon Apr 24 06:58:26 2006
@@ -34,6 +34,7 @@
import org.apache.tuscany.core.config.SidefileLoadException;
import org.apache.tuscany.core.loader.StAXUtil;
import org.apache.tuscany.core.loader.WSDLDefinitionRegistry;
+import org.apache.tuscany.core.loader.LoaderContext;
import static org.apache.tuscany.core.loader.assembly.AssemblyConstants.IMPORT_WSDL;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.AssemblyContext;
@@ -58,13 +59,13 @@
return IMPORT_WSDL;
}
- public ImportWSDL load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public ImportWSDL load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
assert AssemblyConstants.IMPORT_WSDL.equals(reader.getName());
String namespace = reader.getAttributeValue(null, "namespace");
String location = reader.getAttributeValue(null, "location");
ImportWSDL importWSDL = factory.createImportWSDL(location, namespace);
- Definition definition = loadDefinition(namespace, location, resourceLoader);
+ Definition definition = loadDefinition(namespace, location, loaderContext.getResourceLoader());
// importWSDL.setDefinition(definition);
StAXUtil.skipToEndElement(reader);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceJavaLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceJavaLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceJavaLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceJavaLoader.java Mon Apr 24 06:58:26 2006
@@ -16,8 +16,8 @@
*/
package org.apache.tuscany.core.loader.assembly;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.types.java.JavaServiceContract;
@@ -34,7 +34,7 @@
return AssemblyConstants.INTERFACE_JAVA;
}
- public JavaServiceContract load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public JavaServiceContract load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
assert AssemblyConstants.INTERFACE_JAVA.equals(reader.getName());
JavaServiceContract serviceContract = factory.createJavaServiceContract();
serviceContract.setScope(Scope.INSTANCE);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoader.java Mon Apr 24 06:58:26 2006
@@ -16,11 +16,11 @@
*/
package org.apache.tuscany.core.loader.assembly;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.config.MissingInterfaceException;
import org.apache.tuscany.core.loader.WSDLDefinitionRegistry;
import org.apache.tuscany.core.loader.StAXUtil;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.types.wsdl.WSDLServiceContract;
@@ -46,7 +46,7 @@
return AssemblyConstants.INTERFACE_WSDL;
}
- public WSDLServiceContract load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public WSDLServiceContract load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
assert AssemblyConstants.INTERFACE_WSDL.equals(reader.getName());
WSDLServiceContract serviceContract = factory.createWSDLServiceContract();
serviceContract.setScope(Scope.INSTANCE);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleFragmentLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleFragmentLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleFragmentLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleFragmentLoader.java Mon Apr 24 06:58:26 2006
@@ -16,8 +16,8 @@
*/
package org.apache.tuscany.core.loader.assembly;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.model.assembly.ModuleFragment;
import org.osoa.sca.annotations.Scope;
@@ -34,9 +34,9 @@
return AssemblyConstants.MODULE_FRAGMENT;
}
- public ModuleFragment load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public ModuleFragment load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
ModuleFragment fragment = factory.createModuleFragment();
- loadAggregate(reader, fragment, resourceLoader);
+ loadAggregate(reader, fragment, loaderContext);
return fragment;
}
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ModuleLoader.java Mon Apr 24 06:58:26 2006
@@ -16,8 +16,8 @@
*/
package org.apache.tuscany.core.loader.assembly;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.model.assembly.Module;
import org.osoa.sca.annotations.Scope;
@@ -34,9 +34,9 @@
return AssemblyConstants.MODULE;
}
- public Module load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public Module load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
Module module = factory.createModule();
- loadAggregate(reader, module, resourceLoader);
+ loadAggregate(reader, module, loaderContext);
return module;
}
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/PropertyLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/PropertyLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/PropertyLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/PropertyLoader.java Mon Apr 24 06:58:26 2006
@@ -16,9 +16,9 @@
*/
package org.apache.tuscany.core.loader.assembly;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.loader.StAXUtil;
+import org.apache.tuscany.core.loader.LoaderContext;
import static org.apache.tuscany.core.loader.assembly.AssemblyConstants.PROPERTY;
import org.apache.tuscany.model.assembly.Property;
import org.osoa.sca.annotations.Scope;
@@ -47,7 +47,7 @@
return PROPERTY;
}
- public Property load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public Property load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
assert PROPERTY.equals(reader.getName());
Property property = factory.createProperty();
property.setName(reader.getAttributeValue(null, "name"));
@@ -62,7 +62,7 @@
property.setType(TYPE_MAP.get(qname));
} else {
try {
- Class<?> type = resourceLoader.loadClass(typeName);
+ Class<?> type = loaderContext.getResourceLoader().loadClass(typeName);
property.setType(type);
} catch (ClassNotFoundException e) {
throw new ConfigurationLoadException(e);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ReferenceLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ReferenceLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ReferenceLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ReferenceLoader.java Mon Apr 24 06:58:26 2006
@@ -16,9 +16,9 @@
*/
package org.apache.tuscany.core.loader.assembly;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.loader.StAXUtil;
+import org.apache.tuscany.core.loader.LoaderContext;
import static org.apache.tuscany.core.loader.assembly.AssemblyConstants.REFERENCE;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.Multiplicity;
@@ -41,7 +41,7 @@
return REFERENCE;
}
- public Reference load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public Reference load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
assert REFERENCE.equals(reader.getName());
Reference reference = factory.createReference();
reference.setName(reader.getAttributeValue(null, "name"));
@@ -50,7 +50,7 @@
while (true) {
switch (reader.next()) {
case START_ELEMENT:
- AssemblyObject o = registry.load(reader, resourceLoader);
+ AssemblyObject o = registry.load(reader, loaderContext);
if (o instanceof ServiceContract) {
reference.setServiceContract((ServiceContract) o);
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ServiceLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ServiceLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ServiceLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ServiceLoader.java Mon Apr 24 06:58:26 2006
@@ -16,9 +16,9 @@
*/
package org.apache.tuscany.core.loader.assembly;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import static org.apache.tuscany.core.loader.assembly.AssemblyConstants.SERVICE;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.Service;
import org.apache.tuscany.model.assembly.ServiceContract;
@@ -39,7 +39,7 @@
return SERVICE;
}
- public Service load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public Service load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
assert SERVICE.equals(reader.getName());
Service service = factory.createService();
service.setName(reader.getAttributeValue(null, "name"));
@@ -47,7 +47,7 @@
while (true) {
switch (reader.next()) {
case START_ELEMENT:
- AssemblyObject o = registry.load(reader, resourceLoader);
+ AssemblyObject o = registry.load(reader, loaderContext);
if (o instanceof ServiceContract) {
service.setServiceContract((ServiceContract) o);
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StAXLoaderRegistryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StAXLoaderRegistryImpl.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StAXLoaderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/impl/StAXLoaderRegistryImpl.java Mon Apr 24 06:58:26 2006
@@ -16,10 +16,10 @@
*/
package org.apache.tuscany.core.loader.impl;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.loader.StAXElementLoader;
import org.apache.tuscany.core.loader.StAXLoaderRegistry;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.AssemblyObject;
@@ -52,7 +52,7 @@
loaders.remove(element);
}
- public AssemblyObject load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public AssemblyObject load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
QName name = reader.getName();
monitor.elementLoad(name);
StAXElementLoader<? extends AssemblyObject> loader = loaders.get(name);
@@ -61,7 +61,7 @@
e.setIdentifier(name.toString());
throw e;
} else {
- return loader.load(reader, resourceLoader);
+ return loader.load(reader, loaderContext);
}
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemBindingLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemBindingLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemBindingLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemBindingLoader.java Mon Apr 24 06:58:26 2006
@@ -16,9 +16,9 @@
*/
package org.apache.tuscany.core.loader.system;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.loader.StAXUtil;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.core.loader.assembly.AbstractLoader;
import org.apache.tuscany.core.system.assembly.SystemBinding;
import org.osoa.sca.annotations.Scope;
@@ -38,7 +38,7 @@
return SYSTEM_BINDING;
}
- public SystemBinding load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public SystemBinding load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
assert SystemBindingLoader.SYSTEM_BINDING.equals(reader.getName());
SystemBinding binding = factory.createSystemBinding();
StAXUtil.skipToEndElement(reader);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemImplementationLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemImplementationLoader.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemImplementationLoader.java Mon Apr 24 06:58:26 2006
@@ -16,10 +16,10 @@
*/
package org.apache.tuscany.core.loader.system;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ComponentTypeIntrospector;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.loader.StAXUtil;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.core.loader.assembly.AbstractLoader;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.core.system.assembly.SystemImplementation;
@@ -47,13 +47,13 @@
return SYSTEM_IMPLEMENTATION;
}
- public SystemImplementation load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public SystemImplementation load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
assert SYSTEM_IMPLEMENTATION.equals(reader.getName());
SystemImplementation implementation = factory.createSystemImplementation();
String implClass = reader.getAttributeValue(null, "class");
Class<?> implementationClass;
try {
- implementationClass = resourceLoader.loadClass(implClass);
+ implementationClass = loaderContext.getResourceLoader().loadClass(implClass);
implementation.setImplementationClass(implementationClass);
} catch (ClassNotFoundException e) {
throw new ConfigurationLoadException(e);
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryTestCase.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryTestCase.java Mon Apr 24 06:58:26 2006
@@ -30,7 +30,6 @@
import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.AssemblyInitializationException;
import org.apache.tuscany.model.assembly.AssemblyVisitor;
-import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
/**
@@ -44,6 +43,7 @@
private MockMonitor monitor;
private QName qname;
private ResourceLoaderImpl rl;
+ private LoaderContext loaderContext;
public void testRegistrationEvents() throws XMLStreamException, ConfigurationLoadException {
reader.name = qname;
@@ -64,7 +64,7 @@
public void testSuccessfulLoad() throws XMLStreamException, ConfigurationLoadException {
reader.name = qname;
registry.registerLoader(qname, loader);
- assertSame(mockObject, registry.load(reader, rl));
+ assertSame(mockObject, registry.load(reader, loaderContext));
assertEquals(1, monitor.loading.size());
assertTrue(monitor.loading.contains(qname));
}
@@ -73,7 +73,7 @@
registry.registerLoader(qname, loader);
reader.name = new QName("foo");
try {
- registry.load(reader, rl);
+ registry.load(reader, loaderContext);
fail();
} catch (ConfigurationLoadException e) {
assertEquals(1, monitor.loading.size());
@@ -91,6 +91,7 @@
loader = new MockElementLoader();
reader = new MockReader();
rl = new ResourceLoaderImpl(getClass().getClassLoader());
+ loaderContext = new LoaderContext(rl);
}
public static class MockMonitor implements StAXLoaderRegistryImpl.Monitor {
@@ -112,10 +113,10 @@
}
@SuppressWarnings({"NonStaticInnerClassInSecureContext"})
- public class MockElementLoader implements StAXElementLoader {
- public AssemblyObject load(XMLStreamReader reader, ResourceLoader resourceLoader) throws XMLStreamException, ConfigurationLoadException {
+ public class MockElementLoader<MockObject> implements StAXElementLoader {
+ public AssemblyObject load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
assertEquals(qname, reader.getName());
- assertSame(rl, resourceLoader);
+ assertSame(rl, loaderContext.getResourceLoader());
return mockObject;
}
}
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoaderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoaderTestCase.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoaderTestCase.java Mon Apr 24 06:58:26 2006
@@ -31,7 +31,7 @@
public void testMinimal() throws XMLStreamException, ConfigurationLoadException {
XMLStreamReader reader = getReader("<componentType xmlns='http://www.osoa.org/xmlns/sca/0.9'><service name='service1'/></componentType>");
- ComponentInfo type = (ComponentInfo) registry.load(reader, resourceLoader);
+ ComponentInfo type = (ComponentInfo) registry.load(reader, loaderContext);
type.initialize(null);
assertNotNull(type);
assertEquals(1, type.getServices().size());
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java Mon Apr 24 06:58:26 2006
@@ -34,7 +34,7 @@
public void testMinimal() throws XMLStreamException, ConfigurationLoadException {
String xml = "<entryPoint xmlns='http://www.osoa.org/xmlns/sca/0.9' name='test'></entryPoint>";
XMLStreamReader reader = getReader(xml);
- EntryPoint ep = (EntryPoint) registry.load(reader, resourceLoader);
+ EntryPoint ep = (EntryPoint) registry.load(reader, loaderContext);
reader.require(XMLStreamConstants.END_ELEMENT, ENTRY_POINT.getNamespaceURI(), ENTRY_POINT.getLocalPart());
assertEquals(XMLStreamConstants.END_DOCUMENT, reader.next());
assertNotNull(ep);
@@ -45,7 +45,7 @@
String interfaceName = MockService.class.getName();
String xml = "<entryPoint xmlns='http://www.osoa.org/xmlns/sca/0.9' name='test'><interface.java interface='" + interfaceName + "'/></entryPoint>";
XMLStreamReader reader = getReader(xml);
- EntryPoint ep = (EntryPoint) registry.load(reader, resourceLoader);
+ EntryPoint ep = (EntryPoint) registry.load(reader, loaderContext);
reader.require(XMLStreamConstants.END_ELEMENT, ENTRY_POINT.getNamespaceURI(), ENTRY_POINT.getLocalPart());
assertEquals(XMLStreamConstants.END_DOCUMENT, reader.next());
assertNotNull(ep);
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoaderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoaderTestCase.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoaderTestCase.java Mon Apr 24 06:58:26 2006
@@ -35,7 +35,7 @@
public void testMinimal() throws XMLStreamException, ConfigurationLoadException {
String xml = "<externalService xmlns='http://www.osoa.org/xmlns/sca/0.9' name='test'></externalService>";
XMLStreamReader reader = getReader(xml);
- ExternalService es = (ExternalService) registry.load(reader, resourceLoader);
+ ExternalService es = (ExternalService) registry.load(reader, loaderContext);
assertNotNull(es);
assertEquals("test", es.getName());
reader.require(XMLStreamConstants.END_ELEMENT, EXTERNAL_SERVICE.getNamespaceURI(), EXTERNAL_SERVICE.getLocalPart());
@@ -46,7 +46,7 @@
String interfaceName = MockService.class.getName();
String xml = "<externalService xmlns='http://www.osoa.org/xmlns/sca/0.9' name='test'><interface.java interface='" + interfaceName + "'/></externalService>";
XMLStreamReader reader = getReader(xml);
- ExternalService es = (ExternalService) registry.load(reader, resourceLoader);
+ ExternalService es = (ExternalService) registry.load(reader, loaderContext);
reader.require(XMLStreamConstants.END_ELEMENT, EXTERNAL_SERVICE.getNamespaceURI(), EXTERNAL_SERVICE.getLocalPart());
assertEquals(XMLStreamConstants.END_DOCUMENT, reader.next());
assertNotNull(es);
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoaderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoaderTestCase.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/InterfaceWSDLLoaderTestCase.java Mon Apr 24 06:58:26 2006
@@ -17,11 +17,9 @@
package org.apache.tuscany.core.loader.assembly;
import java.net.URL;
-import java.io.IOException;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import javax.wsdl.WSDLException;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import static org.apache.tuscany.core.loader.assembly.AssemblyConstants.INTERFACE_WSDL;
@@ -37,7 +35,7 @@
public void testMinimal() throws XMLStreamException, ConfigurationLoadException {
String xml = "<interface.wsdl xmlns='http://www.osoa.org/xmlns/sca/0.9'></interface.wsdl>";
XMLStreamReader reader = getReader(xml);
- WSDLServiceContract sc = (WSDLServiceContract) registry.load(reader, resourceLoader);
+ WSDLServiceContract sc = (WSDLServiceContract) registry.load(reader, loaderContext);
reader.require(XMLStreamConstants.END_ELEMENT, INTERFACE_WSDL.getNamespaceURI(), INTERFACE_WSDL.getLocalPart());
assertEquals(XMLStreamConstants.END_DOCUMENT, reader.next());
assertNotNull(sc);
@@ -46,7 +44,7 @@
public void testInterface() throws XMLStreamException, ConfigurationLoadException {
String xml = "<interface.wsdl xmlns='http://www.osoa.org/xmlns/sca/0.9' interface='http://www.example.org#HelloWorld'></interface.wsdl>";
XMLStreamReader reader = getReader(xml);
- WSDLServiceContract sc = (WSDLServiceContract) registry.load(reader, resourceLoader);
+ WSDLServiceContract sc = (WSDLServiceContract) registry.load(reader, loaderContext);
reader.require(XMLStreamConstants.END_ELEMENT, INTERFACE_WSDL.getNamespaceURI(), INTERFACE_WSDL.getLocalPart());
assertEquals(XMLStreamConstants.END_DOCUMENT, reader.next());
assertNotNull(sc);
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java?rev=396557&r1=396556&r2=396557&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java Mon Apr 24 06:58:26 2006
@@ -29,6 +29,7 @@
import org.apache.tuscany.core.system.assembly.SystemAssemblyFactory;
import org.apache.tuscany.core.system.assembly.impl.SystemAssemblyFactoryImpl;
import org.apache.tuscany.core.loader.impl.StAXLoaderRegistryImpl;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.impl.AssemblyContextImpl;
@@ -40,6 +41,7 @@
public abstract class LoaderTestSupport extends TestCase {
protected SystemAssemblyFactory assemblyFactory;
protected ResourceLoader resourceLoader;
+ protected LoaderContext loaderContext;
protected AssemblyContext modelContext;
protected XMLInputFactory xmlFactory;
protected StAXLoaderRegistryImpl registry;
@@ -59,6 +61,7 @@
super.setUp();
assemblyFactory = new SystemAssemblyFactoryImpl();
resourceLoader = new ResourceLoaderImpl(getClass().getClassLoader());
+ loaderContext = new LoaderContext(resourceLoader);
modelContext = new AssemblyContextImpl(assemblyFactory, null, resourceLoader);
xmlFactory = XMLInputFactory.newInstance();
registry = new StAXLoaderRegistryImpl();