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

5 files changed, 27 insertions, 3 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