You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/06 23:24:10 UTC

svn commit: r526290 - in /incubator/tuscany/java/sca/modules: assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ contribution/src/main/java/org/apache/tuscany/services/spi/contri...

Author: jsdelfino
Date: Fri Apr  6 14:24:09 2007
New Revision: 526290

URL: http://svn.apache.org/viewvc?view=rev&rev=526290
Log:
Simplified usage of generics in ArtifactProcessors and ArtifactProcessorRegistries. Added a DOMArtifactProcessorRegistry. Dissociated ArtifactProcessorRegistry and ArtifactProcessor interfaces and removed dependency on ArtifactProcessorRegistry in the ArtifactProcessors.

Added:
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DOMArtifactProcessorRegistry.java   (with props)
Modified:
    incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeDocumentProcessor.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeProcessor.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeDocumentProcessor.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeProcessor.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeDocumentProcessor.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeProcessor.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/OptimizeTestCase.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAndResolveDocumentTestCase.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ResolveTestCase.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ArtifactProcessorRegistry.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultArtifactProcessorRegistry.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultStAXArtifactProcessorRegistry.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultURLArtifactProcessorRegistry.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/StAXArtifactProcessorRegistry.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/URLArtifactProcessorRegistry.java
    incubator/tuscany/java/sca/modules/idl-java-xml/src/test/java/org/apache/tuscany/idl/java/xml/ReadTestCase.java
    incubator/tuscany/java/sca/modules/idl-wsdl-xml/src/test/java/org/apache/tuscany/idl/wsdl/xml/ReadTestCase.java
    incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeDocumentProcessor.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeDocumentProcessor.java Fri Apr  6 14:24:09 2007
@@ -37,7 +37,7 @@
 import org.apache.tuscany.services.spi.contribution.ContributionResolveException;
 import org.apache.tuscany.services.spi.contribution.ContributionWireException;
 import org.apache.tuscany.services.spi.contribution.ContributionWriteException;
-import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
+import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessor;
 import org.apache.tuscany.services.spi.contribution.URLArtifactProcessor;
 
 /**
@@ -46,7 +46,7 @@
  * @version $Rev$ $Date$
  */
 public class ComponentTypeDocumentProcessor extends BaseArtifactProcessor implements URLArtifactProcessor<ComponentType> {
-    private StAXArtifactProcessorRegistry registry;
+    private StAXArtifactProcessor<Object> staxProcessor;
     private XMLInputFactory inputFactory;
     
     /**
@@ -55,9 +55,9 @@
      * @param policyFactory
      * @param registry
      */
-    public ComponentTypeDocumentProcessor(AssemblyFactory factory, PolicyFactory policyFactory, StAXArtifactProcessorRegistry registry, XMLInputFactory inputFactory) {
+    public ComponentTypeDocumentProcessor(AssemblyFactory factory, PolicyFactory policyFactory, StAXArtifactProcessor<Object> staxProcessor, XMLInputFactory inputFactory) {
         super(factory, policyFactory);
-        this.registry = registry;
+        this.staxProcessor = staxProcessor;
         this.inputFactory = inputFactory;
     }
     
@@ -65,8 +65,8 @@
      * Constructs a new componentType processor.
      * @param registry
      */
-    public ComponentTypeDocumentProcessor(StAXArtifactProcessorRegistry registry) {
-        this(new DefaultAssemblyFactory(), new DefaultPolicyFactory(), registry, XMLInputFactory.newInstance());
+    public ComponentTypeDocumentProcessor(StAXArtifactProcessor<Object> staxProcessor) {
+        this(new DefaultAssemblyFactory(), new DefaultPolicyFactory(), staxProcessor, XMLInputFactory.newInstance());
     }
     
     public ComponentType read(URL url) throws ContributionReadException {
@@ -75,7 +75,7 @@
             urlStream = url.openStream();
             XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
             reader.nextTag();
-            ComponentType componentType = (ComponentType)registry.read(reader);
+            ComponentType componentType = (ComponentType)staxProcessor.read(reader);
             return componentType;
             
         } catch (XMLStreamException e) {
@@ -98,11 +98,11 @@
     }
     
     public void resolve(ComponentType componentType, ArtifactResolver resolver) throws ContributionResolveException {
-        registry.resolve(componentType, resolver);
+        staxProcessor.resolve(componentType, resolver);
     }
     
     public void wire(ComponentType componentType) throws ContributionWireException {
-        registry.wire(componentType);
+        staxProcessor.wire(componentType);
     }
     
     public String getArtifactType() {

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeProcessor.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeProcessor.java Fri Apr  6 14:24:09 2007
@@ -48,7 +48,6 @@
 import org.apache.tuscany.services.spi.contribution.ContributionWireException;
 import org.apache.tuscany.services.spi.contribution.ContributionWriteException;
 import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessor;
-import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
 
 /**
  * A componentType processor.
@@ -57,7 +56,7 @@
  */
 public class ComponentTypeProcessor extends BaseArtifactProcessor implements StAXArtifactProcessor<ComponentType> {
     private AssemblyFactory factory;
-    private StAXArtifactProcessorRegistry registry;
+    private StAXArtifactProcessor<Object> extensionProcessor;
     
     /**
      * Constructs a new componentType processor.
@@ -65,18 +64,18 @@
      * @param policyFactory
      * @param registry
      */
-    public ComponentTypeProcessor(AssemblyFactory factory, PolicyFactory policyFactory, StAXArtifactProcessorRegistry registry) {
+    public ComponentTypeProcessor(AssemblyFactory factory, PolicyFactory policyFactory, StAXArtifactProcessor<Object> extensionProcessor) {
         super(factory, policyFactory);
         this.factory = factory;
-        this.registry = registry;
+        this.extensionProcessor = extensionProcessor;
     }
     
     /**
      * Constructs a new componentType processor.
-     * @param registry
+     * @param extensionProcessor
      */
-    public ComponentTypeProcessor(StAXArtifactProcessorRegistry registry) {
-        this(new DefaultAssemblyFactory(), new DefaultPolicyFactory(), registry);
+    public ComponentTypeProcessor(StAXArtifactProcessor<Object> extensionProcessor) {
+        this(new DefaultAssemblyFactory(), new DefaultPolicyFactory(), extensionProcessor);
     }
     
     public ComponentType read(XMLStreamReader reader) throws ContributionReadException {
@@ -159,7 +158,7 @@
                         } else {
     
                             // Read an extension element
-                            Object extension = registry.read(reader);
+                            Object extension = extensionProcessor.read(reader);
                             if (extension != null) {
                                 if (extension instanceof Interface) {
     

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeDocumentProcessor.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeDocumentProcessor.java Fri Apr  6 14:24:09 2007
@@ -37,7 +37,7 @@
 import org.apache.tuscany.services.spi.contribution.ContributionResolveException;
 import org.apache.tuscany.services.spi.contribution.ContributionWireException;
 import org.apache.tuscany.services.spi.contribution.ContributionWriteException;
-import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
+import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessor;
 import org.apache.tuscany.services.spi.contribution.URLArtifactProcessor;
 
 /**
@@ -46,27 +46,27 @@
  * @version $Rev$ $Date$
  */
 public class CompositeDocumentProcessor extends BaseArtifactProcessor implements URLArtifactProcessor<Composite> {
-    private StAXArtifactProcessorRegistry registry;
+    private StAXArtifactProcessor<Object> staxProcessor;
     private XMLInputFactory inputFactory;
 
     /**
      * Construct a new composite processor
      * @param assemblyFactory
      * @param policyFactory
-     * @param registry
+     * @param staxProcessor
      */
-    public CompositeDocumentProcessor(AssemblyFactory factory, PolicyFactory policyFactory, StAXArtifactProcessorRegistry registry, XMLInputFactory inputFactory) {
+    public CompositeDocumentProcessor(AssemblyFactory factory, PolicyFactory policyFactory, StAXArtifactProcessor<Object> staxProcessor, XMLInputFactory inputFactory) {
         super(factory, policyFactory);
-        this.registry = registry;
+        this.staxProcessor = staxProcessor;
         this.inputFactory = inputFactory;
     }
 
     /**
      * Construct a new composite processor.
-     * @param registry
+     * @param staxProcessor
      */
-    public CompositeDocumentProcessor(StAXArtifactProcessorRegistry registry) {
-        this(new DefaultAssemblyFactory(), new DefaultPolicyFactory(), registry, XMLInputFactory.newInstance());
+    public CompositeDocumentProcessor(StAXArtifactProcessor<Object> staxProcessor) {
+        this(new DefaultAssemblyFactory(), new DefaultPolicyFactory(), staxProcessor, XMLInputFactory.newInstance());
     }
 
     public Composite read(URL url) throws ContributionReadException {
@@ -75,7 +75,7 @@
             urlStream = url.openStream();
             XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
             reader.nextTag();
-            Composite composite = (Composite)registry.read(reader);
+            Composite composite = (Composite)staxProcessor.read(reader);
             return composite;
             
         } catch (XMLStreamException e) {
@@ -100,11 +100,11 @@
     }
     
     public void resolve(Composite composite, ArtifactResolver resolver) throws ContributionResolveException {
-        registry.resolve(composite, resolver);
+        staxProcessor.resolve(composite, resolver);
     }
 
     public void wire(Composite composite) throws ContributionWireException {
-        registry.wire(composite);
+        staxProcessor.wire(composite);
     }
 
     public String getArtifactType() {

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeProcessor.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeProcessor.java Fri Apr  6 14:24:09 2007
@@ -55,7 +55,6 @@
 import org.apache.tuscany.services.spi.contribution.ContributionWireException;
 import org.apache.tuscany.services.spi.contribution.ContributionWriteException;
 import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessor;
-import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
 
 /**
  * A composite processor.
@@ -64,26 +63,26 @@
  */
 public class CompositeProcessor extends BaseArtifactProcessor implements StAXArtifactProcessor<Composite> {
     private AssemblyFactory factory;
-    private StAXArtifactProcessorRegistry registry;
+    private StAXArtifactProcessor<Object> extensionProcessor;
 
     /**
      * Construct a new composite processor
      * @param assemblyFactory
      * @param policyFactory
-     * @param registry
+     * @param extensionProcessor
      */
-    public CompositeProcessor(AssemblyFactory factory, PolicyFactory policyFactory, StAXArtifactProcessorRegistry registry) {
+    public CompositeProcessor(AssemblyFactory factory, PolicyFactory policyFactory, StAXArtifactProcessor<Object> extensionProcessor) {
         super(factory, policyFactory);
         this.factory = factory;
-        this.registry = registry;
+        this.extensionProcessor = extensionProcessor;
     }
 
     /**
      * Construct a new composite processor.
-     * @param registry
+     * @param extensionProcessor
      */
-    public CompositeProcessor(StAXArtifactProcessorRegistry registry) {
-        this(new DefaultAssemblyFactory(), new DefaultPolicyFactory(), registry);
+    public CompositeProcessor(StAXArtifactProcessor<Object> extensionProcessor) {
+        this(new DefaultAssemblyFactory(), new DefaultPolicyFactory(), extensionProcessor);
     }
 
     public Composite read(XMLStreamReader reader) throws ContributionReadException {
@@ -260,7 +259,7 @@
                         } else {
     
                             // Read an extension element
-                            Object extension = registry.read(reader);
+                            Object extension = extensionProcessor.read(reader);
                             if (extension != null) {
                                 if (extension instanceof Interface) {
     

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeDocumentProcessor.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeDocumentProcessor.java Fri Apr  6 14:24:09 2007
@@ -37,7 +37,7 @@
 import org.apache.tuscany.services.spi.contribution.ContributionResolveException;
 import org.apache.tuscany.services.spi.contribution.ContributionWireException;
 import org.apache.tuscany.services.spi.contribution.ContributionWriteException;
-import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
+import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessor;
 import org.apache.tuscany.services.spi.contribution.URLArtifactProcessor;
 
 /**
@@ -46,28 +46,28 @@
  * @version $Rev$ $Date$
  */
 public class ConstrainingTypeDocumentProcessor extends BaseArtifactProcessor implements URLArtifactProcessor<ConstrainingType> {
-    private StAXArtifactProcessorRegistry registry;
+    private StAXArtifactProcessor<Object> staxProcessor;
     private XMLInputFactory inputFactory;
 
     /**
      * Construct a new constrainingType processor.
      * @param factory
      * @param policyFactory
-     * @param registry
+     * @param staxProcessor
      */
-    public ConstrainingTypeDocumentProcessor(AssemblyFactory factory, PolicyFactory policyFactory, StAXArtifactProcessorRegistry registry, XMLInputFactory inputFactory) {
+    public ConstrainingTypeDocumentProcessor(AssemblyFactory factory, PolicyFactory policyFactory, StAXArtifactProcessor<Object> staxProcessor, XMLInputFactory inputFactory) {
         super(factory, policyFactory);
-        this.registry = registry;
+        this.staxProcessor = staxProcessor;
         this.inputFactory = inputFactory;
     }
 
     /**
      * Construct a new constrainingType processor.
-     * @param registry
+     * @param staxProcessor
      */
-    public ConstrainingTypeDocumentProcessor(StAXArtifactProcessorRegistry registry) {
-        this(new DefaultAssemblyFactory(), new DefaultPolicyFactory(), registry, XMLInputFactory.newInstance());
-        this.registry = registry;
+    public ConstrainingTypeDocumentProcessor(StAXArtifactProcessor<Object> staxProcessor) {
+        this(new DefaultAssemblyFactory(), new DefaultPolicyFactory(), staxProcessor, XMLInputFactory.newInstance());
+        this.staxProcessor = staxProcessor;
     }
 
     public ConstrainingType read(URL url) throws ContributionReadException {
@@ -76,7 +76,7 @@
             urlStream = url.openStream();
             XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
             reader.nextTag();
-            ConstrainingType constrainingType = (ConstrainingType)registry.read(reader);
+            ConstrainingType constrainingType = (ConstrainingType)staxProcessor.read(reader);
             return constrainingType;
             
         } catch (XMLStreamException e) {
@@ -101,11 +101,11 @@
     }
     
     public void resolve(ConstrainingType constrainingType, ArtifactResolver resolver) throws ContributionResolveException {
-        registry.resolve(constrainingType, resolver);
+        staxProcessor.resolve(constrainingType, resolver);
     }
     
     public void wire(ConstrainingType constrainingType) throws ContributionWireException {
-        registry.wire(constrainingType);
+        staxProcessor.wire(constrainingType);
     }
 
     public String getArtifactType() {

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeProcessor.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeProcessor.java Fri Apr  6 14:24:09 2007
@@ -45,7 +45,6 @@
 import org.apache.tuscany.services.spi.contribution.ContributionWireException;
 import org.apache.tuscany.services.spi.contribution.ContributionWriteException;
 import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessor;
-import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
 
 /**
  * A contrainingType content handler.
@@ -54,27 +53,27 @@
  */
 public class ConstrainingTypeProcessor extends BaseArtifactProcessor implements StAXArtifactProcessor<ConstrainingType> {
     private AssemblyFactory factory;
-    private StAXArtifactProcessorRegistry registry;
+    private StAXArtifactProcessor<Object> extensionProcessor;
 
     /**
      * Construct a new constrainingType processor.
      * @param factory
      * @param policyFactory
-     * @param registry
+     * @param extensionProcessor
      */
-    public ConstrainingTypeProcessor(AssemblyFactory factory, PolicyFactory policyFactory, StAXArtifactProcessorRegistry registry) {
+    public ConstrainingTypeProcessor(AssemblyFactory factory, PolicyFactory policyFactory, StAXArtifactProcessor<Object> extensionProcessor) {
         super(factory, policyFactory);
         this.factory = factory;
-        this.registry = registry;
+        this.extensionProcessor = extensionProcessor;
     }
 
     /**
      * Construct a new constrainingType processor.
-     * @param registry
+     * @param extensionProcessor
      */
-    public ConstrainingTypeProcessor(StAXArtifactProcessorRegistry registry) {
-        this(new DefaultAssemblyFactory(), new DefaultPolicyFactory(), registry);
-        this.registry = registry;
+    public ConstrainingTypeProcessor(StAXArtifactProcessor<Object> extensionProcessor) {
+        this(new DefaultAssemblyFactory(), new DefaultPolicyFactory(), extensionProcessor);
+        this.extensionProcessor = extensionProcessor;
     }
 
     public ConstrainingType read(XMLStreamReader reader) throws ContributionReadException {
@@ -139,7 +138,7 @@
                         } else {
     
                             // Read an extension element
-                            Object extension = registry.read(reader);
+                            Object extension = extensionProcessor.read(reader);
                             if (extension instanceof Interface) {
                                 // <service><interface> and <reference><interface>
                                 abstractContract.setInterface((Interface)extension);

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/OptimizeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/OptimizeTestCase.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/OptimizeTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/OptimizeTestCase.java Fri Apr  6 14:24:09 2007
@@ -32,7 +32,6 @@
 import org.apache.tuscany.assembly.xml.impl.ConstrainingTypeProcessor;
 import org.apache.tuscany.services.spi.contribution.DefaultArtifactResolver;
 import org.apache.tuscany.services.spi.contribution.DefaultStAXArtifactProcessorRegistry;
-import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
 
 /**
  * Test the resolving SCA XML assemblies.
@@ -42,7 +41,7 @@
 public class OptimizeTestCase extends TestCase {
 
     private XMLInputFactory inputFactory;
-    private StAXArtifactProcessorRegistry registry;
+    private DefaultStAXArtifactProcessorRegistry registry;
 
     public void setUp() throws Exception {
         inputFactory = XMLInputFactory.newInstance();

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAndResolveDocumentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAndResolveDocumentTestCase.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAndResolveDocumentTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAndResolveDocumentTestCase.java Fri Apr  6 14:24:09 2007
@@ -19,12 +19,8 @@
 
 package org.apache.tuscany.assembly.xml;
 
-import java.io.InputStream;
 import java.net.URL;
 
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
 import junit.framework.TestCase;
 
 import org.apache.tuscany.assembly.Composite;
@@ -38,8 +34,6 @@
 import org.apache.tuscany.services.spi.contribution.DefaultArtifactResolver;
 import org.apache.tuscany.services.spi.contribution.DefaultStAXArtifactProcessorRegistry;
 import org.apache.tuscany.services.spi.contribution.DefaultURLArtifactProcessorRegistry;
-import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
-import org.apache.tuscany.services.spi.contribution.URLArtifactProcessorRegistry;
 
 /**
  * Test the resolving SCA XML assemblies.
@@ -48,15 +42,13 @@
  */
 public class ReadAndResolveDocumentTestCase extends TestCase {
 
-    private XMLInputFactory inputFactory;
-    private URLArtifactProcessorRegistry registry;
+    private DefaultURLArtifactProcessorRegistry registry;
 
     public void setUp() throws Exception {
-        inputFactory = XMLInputFactory.newInstance();
         registry = new DefaultURLArtifactProcessorRegistry();
         
         // Create Stax processors
-        StAXArtifactProcessorRegistry staxRegistry = new DefaultStAXArtifactProcessorRegistry();
+        DefaultStAXArtifactProcessorRegistry staxRegistry = new DefaultStAXArtifactProcessorRegistry();
         staxRegistry.addArtifactProcessor(new CompositeProcessor(staxRegistry));
         staxRegistry.addArtifactProcessor(new ComponentTypeProcessor(staxRegistry));
         staxRegistry.addArtifactProcessor(new ConstrainingTypeProcessor(staxRegistry));
@@ -68,7 +60,6 @@
     }
 
     public void tearDown() throws Exception {
-        inputFactory = null;
         registry = null;
     }
 

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadTestCase.java Fri Apr  6 14:24:09 2007
@@ -30,7 +30,6 @@
 import org.apache.tuscany.assembly.xml.impl.CompositeProcessor;
 import org.apache.tuscany.assembly.xml.impl.ConstrainingTypeProcessor;
 import org.apache.tuscany.services.spi.contribution.DefaultStAXArtifactProcessorRegistry;
-import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
 
 /**
  * Test the usability of the assembly model API when loading SCDL
@@ -40,7 +39,7 @@
 public class ReadTestCase extends TestCase {
 
     private XMLInputFactory inputFactory;
-    private StAXArtifactProcessorRegistry registry;
+    private DefaultStAXArtifactProcessorRegistry registry;
 
     public void setUp() throws Exception {
         inputFactory = XMLInputFactory.newInstance();

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ResolveTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ResolveTestCase.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ResolveTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ResolveTestCase.java Fri Apr  6 14:24:09 2007
@@ -32,7 +32,6 @@
 import org.apache.tuscany.assembly.xml.impl.ConstrainingTypeProcessor;
 import org.apache.tuscany.services.spi.contribution.DefaultArtifactResolver;
 import org.apache.tuscany.services.spi.contribution.DefaultStAXArtifactProcessorRegistry;
-import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
 
 /**
  * Test the resolving SCA XML assemblies.
@@ -42,7 +41,7 @@
 public class ResolveTestCase extends TestCase {
 
     private XMLInputFactory inputFactory;
-    private StAXArtifactProcessorRegistry registry;
+    private DefaultStAXArtifactProcessorRegistry registry;
 
     public void setUp() throws Exception {
         inputFactory = XMLInputFactory.newInstance();

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/StAXPerfTest.java Fri Apr  6 14:24:09 2007
@@ -31,7 +31,6 @@
 import org.apache.tuscany.policy.PolicyFactory;
 import org.apache.tuscany.policy.impl.DefaultPolicyFactory;
 import org.apache.tuscany.services.spi.contribution.DefaultStAXArtifactProcessorRegistry;
-import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
 
 /**
  * Test the usability of the assembly model API when loading SCDL
@@ -43,7 +42,7 @@
     private XMLInputFactory inputFactory;
     private AssemblyFactory assemblyFactory;
     private PolicyFactory policyFactory;
-    private StAXArtifactProcessorRegistry registry;
+    private DefaultStAXArtifactProcessorRegistry registry;
 
     public static void main(String[] args) throws Exception {
 

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ArtifactProcessorRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ArtifactProcessorRegistry.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ArtifactProcessorRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ArtifactProcessorRegistry.java Fri Apr  6 14:24:09 2007
@@ -25,12 +25,12 @@
  * 
  * @version $Rev$ $Date$
  */
-public interface ArtifactProcessorRegistry<I, O, M, T> extends ArtifactProcessor<I, O, M, T> {
+public interface ArtifactProcessorRegistry<P> {
     
     /**
      * Add an artifact processor.
      * @param artifactProcessor the artifact processor to add
      */
-    void addArtifactProcessor(ArtifactProcessor<I, O, ?, T> artifactProcessor);
+    void addArtifactProcessor(Object artifactProcessor);
 
 }

Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DOMArtifactProcessorRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DOMArtifactProcessorRegistry.java?view=auto&rev=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DOMArtifactProcessorRegistry.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DOMArtifactProcessorRegistry.java Fri Apr  6 14:24:09 2007
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.services.spi.contribution;
+
+
+
+/**
+ * A registry for StAX artifact processors.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface DOMArtifactProcessorRegistry extends
+    ArtifactProcessorRegistry<DOMArtifactProcessor<Object>> {
+    
+}

Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DOMArtifactProcessorRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DOMArtifactProcessorRegistry.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultArtifactProcessorRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultArtifactProcessorRegistry.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultArtifactProcessorRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultArtifactProcessorRegistry.java Fri Apr  6 14:24:09 2007
@@ -26,9 +26,9 @@
  * 
  * @version $Rev$ $Date$
  */
-abstract class DefaultArtifactProcessorRegistry<I, O, M, K> implements ArtifactProcessorRegistry<I, O, M, K> {
-    private final Map<K, ArtifactProcessor<I, O, ?, K>> processorsByArtifactType = new HashMap<K, ArtifactProcessor<I, O, ?, K>>();
-    private final Map<Class<?>, ArtifactProcessor<I, O, ?, K>> processorsByModelType = new HashMap<Class<?>, ArtifactProcessor<I, O, ?, K>>();
+abstract class DefaultArtifactProcessorRegistry<P extends ArtifactProcessor> implements ArtifactProcessorRegistry<P> {
+    private final Map<Object, P> processorsByArtifactType = new HashMap<Object, P>();
+    private final Map<Class<?>, P> processorsByModelType = new HashMap<Class<?>, P>();
 
     /**
      * Constructs a new loader registry.
@@ -41,7 +41,7 @@
      * @param artifactType an artifact type
      * @return the processor associated with the given artifact type
      */
-    protected ArtifactProcessor<I, O, ?, K> getProcessor(K artifactType) {
+    protected P getProcessor(Object artifactType) {
         return processorsByArtifactType.get(artifactType);
     }
 
@@ -50,28 +50,20 @@
      * @param modelType a model type
      * @return the processor associated with the given model type
      */
-    protected ArtifactProcessor<I, O, ?, K> getProcessor(Class<M> modelType) {
+    protected P getProcessor(Class<?> modelType) {
         Class<?>[] classes = modelType.getClasses();
         for (Class<?> c: classes) {
-            ArtifactProcessor<I, O, ?, K> processor = processorsByModelType.get(c);
+            P processor = processorsByModelType.get(c);
             if (processor != null)
                 return processor;
         }
         return null;
     }
 
-    public void addArtifactProcessor(ArtifactProcessor<I, O, ?, K> artifactProcessor) {
-        processorsByArtifactType.put(artifactProcessor.getArtifactType(), artifactProcessor);
-        processorsByModelType.put(artifactProcessor.getModelType(), artifactProcessor);
+    public void addArtifactProcessor(Object artifactProcessor) {
+        P processor = (P)artifactProcessor;
+        processorsByArtifactType.put((Object)processor.getArtifactType(), processor);
+        processorsByModelType.put(processor.getModelType(), processor);
     }
     
-    public K getArtifactType() {
-        // Will never match
-        return null;
-    }
-    
-    public Class<M> getModelType() {
-        // Will never match
-        return null;
-    }
 }

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultStAXArtifactProcessorRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultStAXArtifactProcessorRegistry.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultStAXArtifactProcessorRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultStAXArtifactProcessorRegistry.java Fri Apr  6 14:24:09 2007
@@ -35,8 +35,8 @@
  * @version $Rev$ $Date$
  */
 public class DefaultStAXArtifactProcessorRegistry
-    extends DefaultArtifactProcessorRegistry<XMLStreamReader, XMLStreamWriter, Object, QName>
-    implements StAXArtifactProcessorRegistry {
+    extends DefaultArtifactProcessorRegistry<StAXArtifactProcessor<Object>>
+    implements StAXArtifactProcessorRegistry, StAXArtifactProcessor<Object> {
 
     private XMLInputFactory factory;
 
@@ -139,4 +139,11 @@
         }
     }
 
+    public QName getArtifactType() {
+        return null;
+    }
+    
+    public Class<Object> getModelType() {
+        return null;
+    }
 }

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultURLArtifactProcessorRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultURLArtifactProcessorRegistry.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultURLArtifactProcessorRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultURLArtifactProcessorRegistry.java Fri Apr  6 14:24:09 2007
@@ -26,8 +26,8 @@
  * @version $Rev$ $Date$
  */
 public class DefaultURLArtifactProcessorRegistry
-    extends DefaultArtifactProcessorRegistry<URL, URL, Object, String>
-    implements URLArtifactProcessorRegistry {
+    extends DefaultArtifactProcessorRegistry<URLArtifactProcessor<Object>>
+    implements URLArtifactProcessorRegistry, URLArtifactProcessor<Object> {
 
     /**
      * Constructs a new loader registry.
@@ -88,6 +88,14 @@
             e.setResourceURI(url.toString());
             throw e;
         }
+    }
+    
+    public String getArtifactType() {
+        return null;
+    }
+    
+    public Class<Object> getModelType() {
+        return null;
     }
 
 }

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/StAXArtifactProcessorRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/StAXArtifactProcessorRegistry.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/StAXArtifactProcessorRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/StAXArtifactProcessorRegistry.java Fri Apr  6 14:24:09 2007
@@ -18,17 +18,14 @@
  */
 package org.apache.tuscany.services.spi.contribution;
 
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
 
 
 /**
- * A registry for StAX artifact processors.
+ * A registry for DOM artifact processors.
  * 
  * @version $Rev$ $Date$
  */
 public interface StAXArtifactProcessorRegistry extends
-    ArtifactProcessorRegistry<XMLStreamReader, XMLStreamWriter, Object, QName> {
+    ArtifactProcessorRegistry<StAXArtifactProcessor<Object>> {
     
 }

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/URLArtifactProcessorRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/URLArtifactProcessorRegistry.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/URLArtifactProcessorRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/URLArtifactProcessorRegistry.java Fri Apr  6 14:24:09 2007
@@ -18,7 +18,6 @@
  */
 package org.apache.tuscany.services.spi.contribution;
 
-import java.net.URL;
 
 
 /**
@@ -27,6 +26,6 @@
  * @version $Rev: 525638 $ $Date: 2007-04-04 16:36:03 -0700 (Wed, 04 Apr 2007) $
  */
 public interface URLArtifactProcessorRegistry extends
-    ArtifactProcessorRegistry<URL, URL, Object, String> {
+    ArtifactProcessorRegistry<URLArtifactProcessor<Object>> {
     
 }

Modified: incubator/tuscany/java/sca/modules/idl-java-xml/src/test/java/org/apache/tuscany/idl/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/idl-java-xml/src/test/java/org/apache/tuscany/idl/java/xml/ReadTestCase.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/idl-java-xml/src/test/java/org/apache/tuscany/idl/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/idl-java-xml/src/test/java/org/apache/tuscany/idl/java/xml/ReadTestCase.java Fri Apr  6 14:24:09 2007
@@ -35,7 +35,6 @@
 import org.apache.tuscany.assembly.xml.impl.CompositeProcessor;
 import org.apache.tuscany.assembly.xml.impl.ConstrainingTypeProcessor;
 import org.apache.tuscany.services.spi.contribution.DefaultStAXArtifactProcessorRegistry;
-import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
 
 /**
  * Test the usability of the assembly model API when loading SCDL
@@ -45,7 +44,7 @@
 public class ReadTestCase extends TestCase {
 
     XMLInputFactory inputFactory;
-    StAXArtifactProcessorRegistry registry;
+    DefaultStAXArtifactProcessorRegistry registry;
 
     public void setUp() throws Exception {
         inputFactory = XMLInputFactory.newInstance();

Modified: incubator/tuscany/java/sca/modules/idl-wsdl-xml/src/test/java/org/apache/tuscany/idl/wsdl/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/idl-wsdl-xml/src/test/java/org/apache/tuscany/idl/wsdl/xml/ReadTestCase.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/idl-wsdl-xml/src/test/java/org/apache/tuscany/idl/wsdl/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/idl-wsdl-xml/src/test/java/org/apache/tuscany/idl/wsdl/xml/ReadTestCase.java Fri Apr  6 14:24:09 2007
@@ -35,7 +35,6 @@
 import org.apache.tuscany.assembly.xml.impl.CompositeProcessor;
 import org.apache.tuscany.assembly.xml.impl.ConstrainingTypeProcessor;
 import org.apache.tuscany.services.spi.contribution.DefaultStAXArtifactProcessorRegistry;
-import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
 
 /**
  * Test the usability of the assembly model API when loading SCDL
@@ -45,7 +44,7 @@
 public class ReadTestCase extends TestCase {
 
     XMLInputFactory inputFactory;
-    StAXArtifactProcessorRegistry registry;
+    DefaultStAXArtifactProcessorRegistry registry;
 
     public void setUp() throws Exception {
         inputFactory = XMLInputFactory.newInstance();

Modified: incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java?view=diff&rev=526290&r1=526289&r2=526290
==============================================================================
--- incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java Fri Apr  6 14:24:09 2007
@@ -35,7 +35,6 @@
 import org.apache.tuscany.assembly.xml.impl.CompositeProcessor;
 import org.apache.tuscany.assembly.xml.impl.ConstrainingTypeProcessor;
 import org.apache.tuscany.services.spi.contribution.DefaultStAXArtifactProcessorRegistry;
-import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
 
 /**
  * Test the usability of the assembly model API when loading SCDL
@@ -45,7 +44,7 @@
 public class ReadTestCase extends TestCase {
 
     XMLInputFactory inputFactory;
-    StAXArtifactProcessorRegistry registry;
+    DefaultStAXArtifactProcessorRegistry registry;
     
     public void setUp() throws Exception {
         inputFactory = XMLInputFactory.newInstance();



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org