Get implementation.web building cleanly

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

1 files changed, 3 insertions, 16 deletions

diff --git a/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java b/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
index 10a7df7ae5..b23d24656a 100644
--- a/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
+++ b/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
@@ -26,21 +26,15 @@ import javax.xml.stream.XMLStreamReader;
 

 import junit.framework.TestCase;

 

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

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

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

 import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;

-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;

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

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

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

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

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

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

 import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

-import org.apache.tuscany.sca.core.UtilityExtensionPoint;

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

-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;

-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;

 

 /**

  * Test reading Web implementations.

@@ -57,14 +51,7 @@ public class ReadTestCase extends TestCase {
         inputFactory = XMLInputFactory.newInstance();

         StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);

         staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);

-        

-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);

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

-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);

-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);

-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);

-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);

-        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper, null);

+        compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");

     }

 

     public void testReadComposite() throws Exception {

@@ -73,7 +60,7 @@ public class ReadTestCase extends TestCase {
         Composite composite = (Composite) staxProcessor.read(reader);

         assertNotNull(composite);

 

-        compositeBuilder.build(composite);

+        compositeBuilder.build(composite, null, null);

         

         assertTrue(((WebImplementation) composite.getComponents().get(0).getImplementation()).getWebURI().equals("MyWebapp"));

     }