Author: jboynes
Date: Fri Apr 14 08:24:24 2006
New Revision: 394118
URL: http://svn.apache.org/viewcvs?rev=394118&view=rev
Log:
refactor loader API to simplify and allow a loader to handle multiple elements
loaders now supply an element that they are prepared to handle during
registration
Removed:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/AbstractLoader.java
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/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/AbstractLoader.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
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -51,20 +51,12 @@
@Init(eager = true)
public void start() {
- registry.registerLoader(this);
+ registry.registerLoader(BINDING_WS, this);
}
@Destroy
public void stop() {
- registry.unregisterLoader(this);
- }
-
- public QName getXMLType() {
- return BINDING_WS;
- }
-
- public Class<WebServiceBinding> getModelType() {
- return WebServiceBinding.class;
+ registry.unregisterLoader(BINDING_WS, this);
}
public WebServiceBinding load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -51,20 +51,12 @@
@Init(eager = true)
public void start() {
- registry.registerLoader(this);
+ registry.registerLoader(BINDING_ISONRPC, this);
}
@Destroy
public void stop() {
- registry.unregisterLoader(this);
- }
-
- public QName getXMLType() {
- return BINDING_ISONRPC;
- }
-
- public Class<JSONRPCBinding> getModelType() {
- return JSONRPCBinding.class;
+ registry.unregisterLoader(BINDING_ISONRPC, this);
}
public JSONRPCBinding load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -74,20 +74,12 @@
@Init(eager = true)
public void start() {
- registry.registerLoader(this);
+ registry.registerLoader(IMPLEMENTATION_JAVA, this);
}
@Destroy
public void stop() {
- registry.unregisterLoader(this);
- }
-
- public QName getXMLType() {
- return IMPLEMENTATION_JAVA;
- }
-
- public Class<JavaImplementation> getModelType() {
- return JavaImplementation.class;
+ registry.unregisterLoader(IMPLEMENTATION_JAVA, this);
}
public JavaImplementation load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -20,7 +20,7 @@
import java.util.List;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLInputFactory;
+import javax.xml.namespace.QName;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -113,11 +113,11 @@
return mockType;
}
- public <T extends AssemblyObject> void
registerLoader(StAXElementLoader<T> loader) {
+ public <T extends AssemblyObject> void registerLoader(QName element,
StAXElementLoader<T> loader) {
throw new UnsupportedOperationException();
}
- public <T extends AssemblyObject> void
unregisterLoader(StAXElementLoader<T> loader) {
+ public <T extends AssemblyObject> void unregisterLoader(QName element,
StAXElementLoader<T> loader) {
throw new UnsupportedOperationException();
}
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -67,20 +67,12 @@
@Init(eager = true)
public void start() {
- registry.registerLoader(this);
+ registry.registerLoader(IMPLEMENTATION_JS, this);
}
@Destroy
public void stop() {
- registry.unregisterLoader(this);
- }
-
- public QName getXMLType() {
- return IMPLEMENTATION_JS;
- }
-
- public Class<JavaScriptImplementation> getModelType() {
- return JavaScriptImplementation.class;
+ registry.unregisterLoader(IMPLEMENTATION_JS, this);
}
public JavaScriptImplementation load(XMLStreamReader reader,
ResourceLoader resourceLoader) throws XMLStreamException,
ConfigurationLoadException {
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -16,34 +16,19 @@
*/
package org.apache.tuscany.core.loader;
+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;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
/**
* A loader that creates a model object from a StAX input stream.
*
* @version $Rev$ $Date$
*/
public interface StAXElementLoader<T extends AssemblyObject> {
- /**
- * Returns the XML element that this loader can handle.
- *
- * @return the XML element that this loader can handle
- */
- QName getXMLType();
-
- /**
- * Returns the type of model object that this loader will produce.
- *
- * @return the type of model object that this loader will produce
- */
- Class<T> getModelType();
-
/**
* Build the model object for an element in an XML stream.
* When this method returns the stream will be positioned on the
corresponding END_ELEMENT.
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -23,6 +23,7 @@
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.
@@ -43,15 +44,18 @@
* Register a loader. This operation will typically be called by a loader
* 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
+
*/
- <T extends AssemblyObject> void registerLoader(StAXElementLoader<T>
loader);
+ <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
*/
- <T extends AssemblyObject> void unregisterLoader(StAXElementLoader<T>
loader);
+ <T extends AssemblyObject> void unregisterLoader(QName element,
StAXElementLoader<T> loader);
/**
* Parse the supplied XML stream dispatching to the appropriate registered
loader
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AbstractLoader.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AbstractLoader.java?rev=394118&r1=394117&r2=394118&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AbstractLoader.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/AbstractLoader.java
Fri Apr 14 08:24:24 2006
@@ -16,6 +16,8 @@
*/
package org.apache.tuscany.core.loader.assembly;
+import javax.xml.namespace.QName;
+
import org.apache.tuscany.core.loader.StAXElementLoader;
import org.apache.tuscany.core.loader.StAXLoaderRegistry;
import org.apache.tuscany.core.system.annotation.Autowire;
@@ -43,11 +45,17 @@
@Init(eager = true)
public void start() {
- registry.registerLoader(this);
+ registry.registerLoader(getXMLType(), this);
}
@Destroy
public void stop() {
- registry.unregisterLoader(this);
+ registry.unregisterLoader(getXMLType(), this);
}
+
+ /**
+ * Returns the QName of the element that this implementation handles.
+ * @return the QName of the element that this implementation handles
+ */
+ protected abstract QName getXMLType();
}
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -56,10 +56,6 @@
return COMPONENT;
}
- public Class<Component> getModelType() {
- return Component.class;
- }
-
public Component load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
assert COMPONENT.equals(reader.getName());
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -41,10 +41,6 @@
return COMPONENT_TYPE;
}
- public Class<ComponentInfo> getModelType() {
- return ComponentInfo.class;
- }
-
public ComponentInfo load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
assert COMPONENT_TYPE.equals(reader.getName());
ComponentInfo componentType = factory.createComponentInfo();
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -46,10 +46,6 @@
return ENTRY_POINT;
}
- public Class<EntryPoint> getModelType() {
- return EntryPoint.class;
- }
-
public EntryPoint load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
assert ENTRY_POINT.equals(reader.getName());
EntryPoint entryPoint = factory.createEntryPoint();
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -44,10 +44,6 @@
return EXTERNAL_SERVICE;
}
- public Class<ExternalService> getModelType() {
- return ExternalService.class;
- }
-
public ExternalService load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
assert EXTERNAL_SERVICE.equals(reader.getName());
String name = reader.getAttributeValue(null, "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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -59,10 +59,6 @@
return IMPORT_WSDL;
}
- public Class<ImportWSDL> getModelType() {
- return ImportWSDL.class;
- }
-
public ImportWSDL load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
assert AssemblyConstants.IMPORT_WSDL.equals(reader.getName());
String namespace = reader.getAttributeValue(null, "namespace");
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -34,10 +34,6 @@
return AssemblyConstants.INTERFACE_JAVA;
}
- public Class<JavaServiceContract> getModelType() {
- return JavaServiceContract.class;
- }
-
public JavaServiceContract load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
assert AssemblyConstants.INTERFACE_JAVA.equals(reader.getName());
JavaServiceContract serviceContract =
factory.createJavaServiceContract();
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -34,10 +34,6 @@
return AssemblyConstants.INTERFACE_WSDL;
}
- public Class<WSDLServiceContract> getModelType() {
- return WSDLServiceContract.class;
- }
-
public WSDLServiceContract load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
assert AssemblyConstants.INTERFACE_WSDL.equals(reader.getName());
WSDLServiceContract serviceContract =
factory.createWSDLServiceContract();
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -34,10 +34,6 @@
return AssemblyConstants.MODULE_FRAGMENT;
}
- public Class<ModuleFragment> getModelType() {
- return ModuleFragment.class;
- }
-
public ModuleFragment load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
ModuleFragment fragment = factory.createModuleFragment();
loadAggregate(reader, fragment, resourceLoader);
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -34,10 +34,6 @@
return AssemblyConstants.MODULE;
}
- public Class<Module> getModelType() {
- return Module.class;
- }
-
public Module load(XMLStreamReader reader, ResourceLoader resourceLoader)
throws XMLStreamException, ConfigurationLoadException {
Module module = factory.createModule();
loadAggregate(reader, module, resourceLoader);
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -47,10 +47,6 @@
return PROPERTY;
}
- public Class<Property> getModelType() {
- return Property.class;
- }
-
public Property load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
assert PROPERTY.equals(reader.getName());
Property property = factory.createProperty();
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -41,10 +41,6 @@
return REFERENCE;
}
- public Class<Reference> getModelType() {
- return Reference.class;
- }
-
public Reference load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
assert REFERENCE.equals(reader.getName());
Reference reference = factory.createReference();
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -39,10 +39,6 @@
return SERVICE;
}
- public Class<Service> getModelType() {
- return Service.class;
- }
-
public Service load(XMLStreamReader reader, ResourceLoader resourceLoader)
throws XMLStreamException, ConfigurationLoadException {
assert SERVICE.equals(reader.getName());
Service service = factory.createService();
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -42,16 +42,14 @@
this.monitor = monitor;
}
- public <T extends AssemblyObject> void registerLoader(StAXElementLoader<T>
loader) {
- QName xmlType = loader.getXMLType();
- monitor.registeringLoader(xmlType);
- loaders.put(xmlType, loader);
+ public <T extends AssemblyObject> void registerLoader(QName element,
StAXElementLoader<T> loader) {
+ monitor.registeringLoader(element);
+ loaders.put(element, loader);
}
- public <T extends AssemblyObject> void
unregisterLoader(StAXElementLoader<T> loader) {
- QName xmlType = loader.getXMLType();
- monitor.unregisteringLoader(xmlType);
- loaders.remove(xmlType);
+ public <T extends AssemblyObject> void unregisterLoader(QName element,
StAXElementLoader<T> loader) {
+ monitor.unregisteringLoader(element);
+ loaders.remove(element);
}
public AssemblyObject load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -19,6 +19,7 @@
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.assembly.AbstractLoader;
import org.apache.tuscany.core.system.assembly.SystemBinding;
import org.osoa.sca.annotations.Scope;
@@ -33,12 +34,8 @@
public class SystemBindingLoader extends AbstractLoader {
public static final QName SYSTEM_BINDING = new
QName("http://org.apache.tuscany/xmlns/system/0.9";, "binding.system");
- public QName getXMLType() {
- return SystemBindingLoader.SYSTEM_BINDING;
- }
-
- public Class<SystemBinding> getModelType() {
- return SystemBinding.class;
+ protected QName getXMLType() {
+ return SYSTEM_BINDING;
}
public SystemBinding load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
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=394118&r1=394117&r2=394118&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
Fri Apr 14 08:24:24 2006
@@ -18,9 +18,9 @@
import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.core.config.ComponentTypeIntrospector;
-import org.apache.tuscany.core.config.ConfigurationException;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.loader.StAXUtil;
+import org.apache.tuscany.core.loader.assembly.AbstractLoader;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.core.system.assembly.SystemImplementation;
import org.osoa.sca.annotations.Scope;
@@ -43,12 +43,8 @@
this.introspector = introspector;
}
- public QName getXMLType() {
+ protected QName getXMLType() {
return SYSTEM_IMPLEMENTATION;
- }
-
- public Class<SystemImplementation> getModelType() {
- return SystemImplementation.class;
}
public SystemImplementation load(XMLStreamReader reader, ResourceLoader
resourceLoader) throws XMLStreamException, ConfigurationLoadException {
