Get implementation.web building cleanly

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@745114 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 11 insertions, 12 deletions

diff --git a/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java b/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
index f44da1f5bb..b255dd2d0e 100644
--- a/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
+++ b/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
@@ -22,12 +22,12 @@ import java.util.ArrayList;
 import java.util.Collections;

 import java.util.List;

 

-import org.apache.tuscany.sca.assembly.ConstrainingType;

-import org.apache.tuscany.sca.assembly.builder.ComponentPreProcessor;

 import org.apache.tuscany.sca.assembly.Component;

+import org.apache.tuscany.sca.assembly.ConstrainingType;

 import org.apache.tuscany.sca.assembly.Property;

 import org.apache.tuscany.sca.assembly.Reference;

 import org.apache.tuscany.sca.assembly.Service;

+import org.apache.tuscany.sca.assembly.builder.ComponentPreProcessor;

 import org.apache.tuscany.sca.implementation.web.WebImplementation;

 import org.apache.tuscany.sca.runtime.RuntimeComponent;

 

diff --git a/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java b/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
index 540b5edc27..e37bdd9fb8 100644
--- a/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
+++ b/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
@@ -28,17 +28,17 @@ import javax.xml.stream.XMLStreamWriter;
 import org.apache.tuscany.sca.assembly.AssemblyFactory;

 import org.apache.tuscany.sca.assembly.ComponentType;

 import org.apache.tuscany.sca.assembly.xml.Constants;

-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

 import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;

+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;

+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;

+import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;

 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;

 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.contribution.service.ContributionReadException;

-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;

-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;

+import org.apache.tuscany.sca.core.ExtensionPointRegistry;

+import org.apache.tuscany.sca.core.FactoryExtensionPoint;

 import org.apache.tuscany.sca.implementation.web.WebImplementation;

 import org.apache.tuscany.sca.implementation.web.WebImplementationFactory;

-import org.apache.tuscany.sca.monitor.Monitor;

-

+import org.apache.tuscany.sca.implementation.web.impl.WebImplementationFactoryImpl;

 

 /**

  * Implements a StAX artifact processor for Web implementations.

@@ -48,12 +48,11 @@ public class WebImplementationProcessor extends BaseStAXArtifactProcessor implem
     

     private AssemblyFactory assemblyFactory;

     private WebImplementationFactory implementationFactory;

-    private Monitor monitor;

     

-    public WebImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {

+    public WebImplementationProcessor(ExtensionPointRegistry extensionPoints) {

+        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);

         this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);

-        this.implementationFactory = modelFactories.getFactory(WebImplementationFactory.class);

-        this.monitor = monitor;

+        this.implementationFactory = new WebImplementationFactoryImpl();

     }

 

     public QName getArtifactType() {