TUSCANY-3174 - Extend test to include a second contribution

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

6 files changed, 60 insertions, 8 deletions

diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml b/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml
index 965e42b22a..ba8f0a4793 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml
+++ b/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml
@@ -4,5 +4,6 @@
 		 	  xmlns:tns="http://someuri"
               xmlns:ans="http://someotheruri">
     <deployable composite="AComposite"/>
-    <tns:import.xyz uri="abc" tns:anAttribute="def"/>
+    <import namespace="http://test"/>
+    <tns:import.xyz uri="abcdef" anAttribute="abcdef.xyz"/>
 </contribution>
\ No newline at end of file
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite b/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite
index e2823f38a2..9b56f92027 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite
+++ b/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
            xmlns:tns="http://someuri"
-           targetNamespace="http://someotheruri"
+           xmlns:test="http://test"
+           targetNamespace="http://contrib1"
            name="AComposite">
 
        <component name="Component1">
-         <tns:implementation.xyz anAttribute="abcde"/>
+         <tns:implementation.xyz anAttribute="abcdef.xyz"/>
          <reference name="component2" target="Component2"/>
        </component>
 
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib2/META-INF/sca-contribution.xml b/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib2/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..8511d427f9
--- /dev/null
+++ b/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib2/META-INF/sca-contribution.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+		 	  xmlns:tns="http://someuri"
+              xmlns:ans="http://someotheruri">
+    <deployable composite="BComposite"/>
+    <export namespace="http://test"/>
+    <tns:export.xyz uri="abcdef" anAttribute="abcdef.xyz"/>
+</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib2/abcdef.xyz b/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib2/abcdef.xyz
new file mode 100644
index 0000000000..037869c9ef
--- /dev/null
+++ b/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib2/abcdef.xyz
@@ -0,0 +1 @@
+Empty File
\ No newline at end of file
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib2/contrib2.composite b/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib2/contrib2.composite
new file mode 100644
index 0000000000..75c0513423
--- /dev/null
+++ b/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib2/contrib2.composite
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+           xmlns:tns="http://someuri"
+           targetNamespace="http://contrib2"
+           name="BComposite">
+
+       <component name="Component3">
+         <tns:implementation.xyz anAttribute="abcdef.xyz"/>
+         <reference name="component2" target="Component2"/>
+       </component>
+    
+</composite>
\ No newline at end of file
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java b/branches/sca-java-1.x/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java
index d325f404c9..efd6d11b8e 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java
+++ b/branches/sca-java-1.x/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java
@@ -21,15 +21,21 @@ package org.apache.tuscany.sca.workspace.manager.test;
 import static org.junit.Assert.assertEquals;
 
 
+import org.apache.tuscany.sca.artifact.xyz.XYZ;
+import org.apache.tuscany.sca.artifact.xyz.XYZModelResolver;
+import org.apache.tuscany.sca.artifact.xyz.XYZProcessor;
 import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
 import org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.implementation.xyz.ImplementationXYZFactoryImpl;
 import org.apache.tuscany.sca.implementation.xyz.ImplementationXYZProcessor;
 import org.apache.tuscany.sca.imprt.xyz.DefaultImportExportXYZFactory;
+import org.apache.tuscany.sca.imprt.xyz.ExportXYZProcessor;
 import org.apache.tuscany.sca.imprt.xyz.ImportXYZProcessor;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
@@ -63,23 +69,32 @@ public class WorkspaceManagerTestCase {
             ExtensionPointRegistry registry = workspaceManager.getRegistry();
             
             // get monitor
-            UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
+            UtilityExtensionPoint utilities = 
+                registry.getExtensionPoint(UtilityExtensionPoint.class);
             MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
             Monitor monitor = monitorFactory.createMonitor();
                     
             // create validation schema
             // are schema required
-            ValidationSchemaExtensionPoint schemas = registry.getExtensionPoint(ValidationSchemaExtensionPoint.class);
+            ValidationSchemaExtensionPoint schemas = 
+                registry.getExtensionPoint(ValidationSchemaExtensionPoint.class);
             schemas.addSchema(WorkspaceManagerTestCase.class.getClassLoader().getResource("implementation-xyz.xsd").toString());
             schemas.addSchema(WorkspaceManagerTestCase.class.getClassLoader().getResource("import-xyz.xsd").toString());
             
             // create model factories
-            ModelFactoryExtensionPoint modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
+            ModelFactoryExtensionPoint modelFactories = 
+                registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
 
             modelFactories.addFactory(new ImplementationXYZFactoryImpl());
             modelFactories.addFactory(new DefaultImportExportXYZFactory());
             
-            // Create artifact processors
+            // Create URL artifact processors
+            URLArtifactProcessorExtensionPoint urlProcessors = 
+                registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
+            
+            urlProcessors.addArtifactProcessor(new XYZProcessor(modelFactories, monitor));
+            
+            // Create stax artifact processors
             StAXArtifactProcessorExtensionPoint artifactProcessors = 
                 registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
             
@@ -87,6 +102,14 @@ public class WorkspaceManagerTestCase {
                     monitor));
             artifactProcessors.addArtifactProcessor(new ImportXYZProcessor(modelFactories,
                     monitor));
+            artifactProcessors.addArtifactProcessor(new ExportXYZProcessor(modelFactories,
+                    monitor));
+            
+            // create model resolvers
+            ModelResolverExtensionPoint modelResolvers = 
+                registry.getExtensionPoint(ModelResolverExtensionPoint.class);
+            
+            modelResolvers.addResolver(XYZ.class, XYZModelResolver.class);
             
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -98,8 +121,13 @@ public class WorkspaceManagerTestCase {
             System.out.println("Process contribution");
             
             Workspace workspace = workspaceManager.createWorkspace();
-            Contribution contribution = workspaceManager.readContribution("contrib1", "./target/classes/contrib1");
+            
+            Contribution contribution = workspaceManager.readContribution("contrib2", "./target/classes/contrib2");
+            workspaceManager.addContributionToWorkspace(workspace, contribution);
+            
+            contribution = workspaceManager.readContribution("contrib1", "./target/classes/contrib1");
             workspaceManager.addContributionToWorkspace(workspace, contribution);
+            
             workspaceManager.resolveWorkspace(workspace);   
             
             return workspace;