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/05/15 19:01:22 UTC
svn commit: r406679 - in /incubator/tuscany/sandbox/jboynes/sca:
core/src/main/java/org/apache/tuscany/core/loader/assembly/
core/src/main/java/org/apache/tuscany/core/loader/system/
core/src/main/resources/org/apache/tuscany/core/ core/src/test/java/o...
Author: jboynes
Date: Mon May 15 10:01:20 2006
New Revision: 406679
URL: http://svn.apache.org/viewcvs?rev=406679&view=rev
Log:
convert LoaderSupport to an extension point
Added:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java (contents, props changed)
- copied, changed from r406662, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImpl.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java (contents, props changed)
- copied, changed from r406662, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderSupport.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java (contents, props changed)
- copied, changed from r406662, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXLoaderRegistry.java
Removed:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImpl.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderSupport.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXLoaderRegistry.java
Modified:
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/EntryPointLoader.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoader.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemBindingLoader.java
incubator/tuscany/sandbox/jboynes/sca/core/src/main/resources/org/apache/tuscany/core/MonitorMessages.properties
incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/CompositeLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceJavaLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderException.java
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/EntryPointLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/EntryPointLoader.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/EntryPointLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/EntryPointLoader.java Mon May 15 10:01:20 2006
@@ -20,7 +20,7 @@
import org.apache.tuscany.core.loader.StAXUtil;
import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.core.loader.AssemblyConstants;
-import org.apache.tuscany.spi.loader.LoaderSupport;
+import org.apache.tuscany.spi.extension.LoaderExtension;
import static org.apache.tuscany.core.loader.AssemblyConstants.ENTRY_POINT;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.Binding;
@@ -43,7 +43,7 @@
* @version $Rev$ $Date$
*/
@Scope("MODULE")
-public class EntryPointLoader extends LoaderSupport {
+public class EntryPointLoader extends LoaderExtension {
public QName getXMLType() {
return ENTRY_POINT;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoader.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ExternalServiceLoader.java Mon May 15 10:01:20 2006
@@ -19,7 +19,7 @@
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.spi.loader.LoaderSupport;
+import org.apache.tuscany.spi.extension.LoaderExtension;
import static org.apache.tuscany.core.loader.AssemblyConstants.EXTERNAL_SERVICE;
import org.apache.tuscany.model.assembly.AssemblyObject;
import org.apache.tuscany.model.assembly.Binding;
@@ -40,7 +40,7 @@
* @version $Rev$ $Date$
*/
@Scope("MODULE")
-public class ExternalServiceLoader extends LoaderSupport {
+public class ExternalServiceLoader extends LoaderExtension {
public QName getXMLType() {
return EXTERNAL_SERVICE;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ImportWSDLLoader.java Mon May 15 10:01:20 2006
@@ -32,7 +32,7 @@
import org.apache.tuscany.core.loader.StAXUtil;
import org.apache.tuscany.core.loader.WSDLDefinitionRegistry;
import org.apache.tuscany.core.loader.AssemblyConstants;
-import org.apache.tuscany.spi.loader.LoaderSupport;
+import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.annotation.Autowire;
import static org.apache.tuscany.core.loader.AssemblyConstants.IMPORT_WSDL;
import org.apache.tuscany.model.assembly.ImportWSDL;
@@ -44,7 +44,7 @@
* @version $Rev$ $Date$
*/
@Scope("MODULE")
-public class ImportWSDLLoader extends LoaderSupport {
+public class ImportWSDLLoader extends LoaderExtension {
private WSDLDefinitionRegistry wsdlRegistry;
@Autowire
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemBindingLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemBindingLoader.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemBindingLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemBindingLoader.java Mon May 15 10:01:20 2006
@@ -19,7 +19,7 @@
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.spi.loader.LoaderSupport;
+import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.core.system.assembly.SystemBinding;
import org.osoa.sca.annotations.Scope;
@@ -31,7 +31,7 @@
* @version $Rev$ $Date$
*/
@Scope("MODULE")
-public class SystemBindingLoader extends LoaderSupport {
+public class SystemBindingLoader extends LoaderExtension {
public static final QName SYSTEM_BINDING = new QName("http://org.apache.tuscany/xmlns/system/0.9", "binding.system");
protected QName getXMLType() {
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/main/resources/org/apache/tuscany/core/MonitorMessages.properties
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/main/resources/org/apache/tuscany/core/MonitorMessages.properties?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/main/resources/org/apache/tuscany/core/MonitorMessages.properties (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/main/resources/org/apache/tuscany/core/MonitorMessages.properties Mon May 15 10:01:20 2006
@@ -19,5 +19,5 @@
org.apache.tuscany.core.client.TuscanyRuntime$Monitor#moduleStartFailed = Fatal exception starting application module [{0}]
org.apache.tuscany.core.client.TuscanyRuntime$Monitor#moduleStopped = Stopped application module [{0}]
-org.apache.tuscany.core.loader.StAXLoaderRegistryImpl$Monitor#registeringLoader = Registering StAXElementLoader for {0}
-org.apache.tuscany.core.loader.StAXLoaderRegistryImpl$Monitor#elementLoad = Processing element {0}
\ No newline at end of file
+org.apache.tuscany.core.loader.LoaderRegistryImpl$Monitor#registeringLoader = Registering StAXElementLoader for {0}
+org.apache.tuscany.core.loader.LoaderRegistryImpl$Monitor#elementLoad = Processing element {0}
\ No newline at end of file
Modified: incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java Mon May 15 10:01:20 2006
@@ -30,7 +30,7 @@
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.spi.loader.LoaderSupport;
+import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.impl.AssemblyContextImpl;
@@ -75,7 +75,7 @@
return reader;
}
- protected void registerLoader(LoaderSupport<?> loader) {
+ protected void registerLoader(LoaderExtension<?> loader) {
loader.setFactory(assemblyFactory);
loader.setRegistry(registry);
loader.start();
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java Mon May 15 10:01:20 2006
@@ -36,7 +36,7 @@
import org.apache.tuscany.spi.loader.InvalidReferenceException;
import org.apache.tuscany.spi.loader.LoaderContext;
import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderSupport;
+import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.MissingImplementationException;
import org.apache.tuscany.spi.loader.StAXPropertyFactory;
import org.osoa.sca.annotations.Scope;
@@ -45,7 +45,7 @@
* @version $Rev$ $Date$
*/
@Scope("MODULE")
-public class ComponentLoader extends LoaderSupport {
+public class ComponentLoader extends LoaderExtension {
private StAXPropertyFactory defaultPropertyFactory;
@Autowire
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeLoader.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeLoader.java Mon May 15 10:01:20 2006
@@ -29,12 +29,12 @@
import org.apache.tuscany.model.Service;
import org.apache.tuscany.spi.loader.LoaderContext;
import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderSupport;
+import org.apache.tuscany.spi.extension.LoaderExtension;
/**
* @version $Rev$ $Date$
*/
-public class ComponentTypeLoader extends LoaderSupport {
+public class ComponentTypeLoader extends LoaderExtension {
public QName getXMLType() {
return AssemblyConstants.COMPONENT_TYPE;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/CompositeLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/CompositeLoader.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/CompositeLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/CompositeLoader.java Mon May 15 10:01:20 2006
@@ -30,12 +30,12 @@
import org.apache.tuscany.model.Component;
import org.apache.tuscany.spi.loader.LoaderContext;
import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderSupport;
+import org.apache.tuscany.spi.extension.LoaderExtension;
/**
* @version $Rev$ $Date$
*/
-public class CompositeLoader extends LoaderSupport<CompositeComponentType> {
+public class CompositeLoader extends LoaderExtension<CompositeComponentType> {
protected QName getXMLType() {
return AssemblyConstants.COMPOSITE;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceJavaLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceJavaLoader.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceJavaLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceJavaLoader.java Mon May 15 10:01:20 2006
@@ -23,12 +23,12 @@
import org.apache.tuscany.model.JavaServiceContract;
import org.apache.tuscany.spi.loader.LoaderContext;
import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderSupport;
+import org.apache.tuscany.spi.extension.LoaderExtension;
/**
* @version $Rev$ $Date$
*/
-public class InterfaceJavaLoader extends LoaderSupport {
+public class InterfaceJavaLoader extends LoaderExtension {
public QName getXMLType() {
return AssemblyConstants.INTERFACE_JAVA;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java Mon May 15 10:01:20 2006
@@ -28,12 +28,12 @@
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.loader.LoaderContext;
import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderSupport;
+import org.apache.tuscany.spi.extension.LoaderExtension;
/**
* @version $Rev$ $Date$
*/
-public class InterfaceWSDLLoader extends LoaderSupport {
+public class InterfaceWSDLLoader extends LoaderExtension {
private static final String WSDLI = "http://www.w3.org/2006/01/wsdl-instance";
private static final String WSDLI_LOCATION = "wsdlLocation";
Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java (from r406662, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImpl.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImpl.java&r1=406662&r2=406679&rev=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java Mon May 15 10:01:20 2006
@@ -26,13 +26,13 @@
import org.apache.tuscany.spi.loader.LoaderContext;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.StAXElementLoader;
-import org.apache.tuscany.spi.loader.StAXLoaderRegistry;
+import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.UnrecognizedElementException;
/**
* @version $Rev$ $Date$
*/
-public class StAXLoaderRegistryImpl implements StAXLoaderRegistry {
+public class LoaderRegistryImpl implements LoaderRegistry {
private final Map<QName, StAXElementLoader<? extends ModelObject>> loaders = new HashMap<QName, StAXElementLoader<? extends ModelObject>>();
private Monitor monitor;
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java Mon May 15 10:01:20 2006
@@ -24,12 +24,12 @@
import org.apache.tuscany.model.Property;
import org.apache.tuscany.spi.loader.LoaderContext;
import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderSupport;
+import org.apache.tuscany.spi.extension.LoaderExtension;
/**
* @version $Rev$ $Date$
*/
-public class PropertyLoader extends LoaderSupport {
+public class PropertyLoader extends LoaderExtension {
public QName getXMLType() {
return PROPERTY;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java Mon May 15 10:01:20 2006
@@ -28,12 +28,12 @@
import org.apache.tuscany.model.ServiceContract;
import org.apache.tuscany.spi.loader.LoaderContext;
import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderSupport;
+import org.apache.tuscany.spi.extension.LoaderExtension;
/**
* @version $Rev$ $Date$
*/
-public class ReferenceLoader extends LoaderSupport {
+public class ReferenceLoader extends LoaderExtension {
public QName getXMLType() {
return AssemblyConstants.REFERENCE;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java Mon May 15 10:01:20 2006
@@ -27,12 +27,12 @@
import org.apache.tuscany.model.ServiceContract;
import org.apache.tuscany.spi.loader.LoaderContext;
import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderSupport;
+import org.apache.tuscany.spi.extension.LoaderExtension;
/**
* @version $Rev$ $Date$
*/
-public class ServiceLoader extends LoaderSupport {
+public class ServiceLoader extends LoaderExtension {
public QName getXMLType() {
return AssemblyConstants.SERVICE;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java Mon May 15 10:01:20 2006
@@ -24,12 +24,12 @@
import org.apache.tuscany.core.system.model.SystemImplementation;
import org.apache.tuscany.spi.loader.LoaderContext;
import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderSupport;
+import org.apache.tuscany.spi.extension.LoaderExtension;
/**
* @version $Rev$ $Date$
*/
-public class SystemImplementationLoader extends LoaderSupport {
+public class SystemImplementationLoader extends LoaderExtension {
public static final QName SYSTEM_IMPLEMENTATION = new QName("http://tuscany.apache.org/xmlns/system/0.9", "implementation.system");
protected QName getXMLType() {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java Mon May 15 10:01:20 2006
@@ -25,7 +25,7 @@
import org.apache.tuscany.model.ServiceContract;
import org.apache.tuscany.spi.loader.LoaderContext;
import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.StAXLoaderRegistry;
+import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
@@ -65,8 +65,8 @@
super.setUp();
loader = new ServiceLoader();
mockReader = mock(XMLStreamReader.class);
- mockRegistry = mock(StAXLoaderRegistry.class);
- loader.setRegistry((StAXLoaderRegistry) mockRegistry.proxy());
+ mockRegistry = mock(LoaderRegistry.class);
+ loader.setRegistry((LoaderRegistry) mockRegistry.proxy());
loaderContext = new LoaderContext(null, null);
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java Mon May 15 10:01:20 2006
@@ -33,7 +33,7 @@
*/
@SuppressWarnings({"CastToIncompatibleInterface"})
public class StAXLoaderRegistryImplTestCase extends MockObjectTestCase {
- private StAXLoaderRegistryImpl registry;
+ private LoaderRegistryImpl registry;
private QName name;
private Mock mockMonitor;
private Mock mockLoader;
@@ -77,9 +77,9 @@
super.setUp();
name = new QName("http://mock", "test");
loaderContext = new LoaderContext(null, null);
- registry = new StAXLoaderRegistryImpl();
- mockMonitor = mock(StAXLoaderRegistryImpl.Monitor.class);
- registry.setMonitor((StAXLoaderRegistryImpl.Monitor) mockMonitor.proxy());
+ registry = new LoaderRegistryImpl();
+ mockMonitor = mock(LoaderRegistryImpl.Monitor.class);
+ registry.setMonitor((LoaderRegistryImpl.Monitor) mockMonitor.proxy());
mockLoader = mock(StAXElementLoader.class);
mockReader = mock(XMLStreamReader.class);
Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java (from r406662, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderSupport.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderSupport.java&r1=406662&r2=406679&rev=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderSupport.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java Mon May 15 10:01:20 2006
@@ -14,25 +14,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tuscany.spi.loader;
+package org.apache.tuscany.spi.extension;
import javax.xml.namespace.QName;
import org.apache.tuscany.model.ModelObject;
import org.apache.tuscany.spi.annotation.Autowire;
+import org.apache.tuscany.spi.loader.StAXElementLoader;
+import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Init;
/**
- * Base class for loader implementations that handles registration.
+ * Support class for extending the Loader mechanism.
*
* @version $Rev$ $Date$
*/
-public abstract class LoaderSupport<T extends ModelObject> implements StAXElementLoader<T> {
- protected StAXLoaderRegistry registry;
+public abstract class LoaderExtension<T extends ModelObject> implements StAXElementLoader<T> {
+ protected LoaderRegistry registry;
@Autowire
- public void setRegistry(StAXLoaderRegistry registry) {
+ public void setRegistry(LoaderRegistry registry) {
this.registry = registry;
}
Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/LoaderExtension.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderException.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderException.java?rev=406679&r1=406678&r2=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderException.java Mon May 15 10:01:20 2006
@@ -19,6 +19,9 @@
import org.apache.tuscany.common.TuscanyException;
/**
+ * Base class for Exceptions raised during the loading process.
+ * Loader implementations should throw a subclass of this to indicate the actual problem.
+ *
* @version $Rev$ $Date$
*/
public class LoaderException extends TuscanyException {
Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java (from r406662, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXLoaderRegistry.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXLoaderRegistry.java&r1=406662&r2=406679&rev=406679&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/StAXLoaderRegistry.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java Mon May 15 10:01:20 2006
@@ -36,7 +36,7 @@
*
* @version $Rev$ $Date$
*/
-public interface StAXLoaderRegistry {
+public interface LoaderRegistry {
/**
* Register a loader. This operation will typically be called by a loader
* during its initialization.
Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/loader/LoaderRegistry.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date