Index: pom.xml
===================================================================
--- pom.xml	(revision 372)
+++ pom.xml	(working copy)
@@ -20,22 +20,23 @@
         <module>ASM_4003</module>
         <module>ASM_4004</module>
         <module>ASM_4007</module>
-        <!--module>ASM_4008</module-->
+        <module>ASM_4008</module>
         <module>ASM_5004</module>
+        <module>ASM_5005</module>
         <module>ASM_5007</module>
-        <!--module>ASM_5008</module-->
+        <module>ASM_5008</module>
         <module>ASM_5009</module>
-        <!--module>ASM_5010</module-->
-        <!--module>ASM_5014</module-->
+        <module>ASM_5010</module>
+        <module>ASM_5014</module>
         <module>ASM_5023</module>
         <module>ASM_5024</module>
         <module>ASM_5027</module>
-        <!--module>ASM_5028</module-->
-        <!--module>ASM_5029</module-->
+        <module>ASM_5028</module>
+        <module>ASM_5029</module>
         <module>ASM_5030</module>
         <module>ASM_5035</module>
-        <!--module>ASM_5036</module-->
-        <!--module>ASM_5037</module-->
+        <module>ASM_5036</module>
+        <module>ASM_5037</module>
         <module>ASM_6001</module>
         <module>ASM_6002</module>
         <module>ASM_6003</module>
@@ -43,19 +44,19 @@
         <module>ASM_6006</module>
         <module>ASM_6008</module>
         <module>ASM_6012</module>
-        <!--module>ASM_6016</module-->
-        <!--module>ASM_6020</module-->
+        <module>ASM_6016</module>
+        <module>ASM_6020</module>
         <module>ASM_6021</module>
         <module>ASM_6022</module>
-        <!--module>ASM_6023</module-->
-        <!--module>ASM_6024</module-->
+        <module>ASM_6023</module>
+        <module>ASM_6024</module>
         <module>ASM_6025</module>
         <module>ASM_6028</module>
         <module>ASM_6029</module>
-        <!--module>ASM_6030</module-->
+        <module>ASM_6030</module>
         <module>ASM_6031</module>
-        <!--module>ASM_6032</module-->
-        <!--module>ASM_6033</module-->
+        <module>ASM_6032</module>
+        <module>ASM_6033</module>
         <module>ASM_7001</module>
         <!--module>ASM_7002</module-->
         <!--module>ASM_7003</module-->
@@ -67,14 +68,14 @@
         <module>ASM_8004_Java</module>
         <module>ASM_8005_Java</module>
         <module>ASM_8006</module>
-        <!--module>ASM_8007</module-->
-        <!--module>ASM_8008</module-->
-        <!--module>ASM_8009</module-->
+        <module>ASM_8007</module>
+        <module>ASM_8008</module>
+        <module>ASM_8009</module>
         <module>ASM_8010</module>
         <module>ASM_8011</module>
         <module>ASM_8012</module>
         <module>ASM_8017</module>
-        <!--module>ASM_8018</module-->
+        <module>ASM_8018</module>
         <module>ASM_8019</module>
         <module>ASM_9002</module>
         <module>ASM_10001</module>
Index: ASM_8005_Java/src/main/resources/META-INF/sca-contribution.xml
===================================================================
--- ASM_8005_Java/src/main/resources/META-INF/sca-contribution.xml	(revision 372)
+++ ASM_8005_Java/src/main/resources/META-INF/sca-contribution.xml	(working copy)
@@ -3,7 +3,7 @@
 <contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903">
 
 	<import namespace="http://docs.oasis-open.org/ns/opencsa/scatests/200903"/>
-	<import.java package="test"/>
+	<import.java package="org.oasisopen.sca.test"/>
 	<import namespace="http://test.sca.oasisopen.org/"/> 			<!-- WSDL namespace -->		
 	
 </contribution>
Index: General/src/main/resources/Test_ASM_5026.composite
===================================================================
--- General/src/main/resources/Test_ASM_5026.composite	(revision 372)
+++ General/src/main/resources/Test_ASM_5026.composite	(working copy)
@@ -35,8 +35,8 @@
              with the correct XSD global element type -->
         <property name="complexType" element="test:globalElement1">
             <test:globalElement1>
-            	<firstData>complex1</firstData>
-            	<secondData>complex2</secondData>
+            	<test:firstData>complex1</test:firstData>
+            	<test:secondData>complex2</test:secondData>
             </test:globalElement1>
         </property>
     </component> 
Index: General/src/main/resources/Test_ASM_5033.composite
===================================================================
--- General/src/main/resources/Test_ASM_5033.composite	(revision 372)
+++ General/src/main/resources/Test_ASM_5033.composite	(working copy)
@@ -35,7 +35,7 @@
         <reference name="Reference1">
         	<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
         	<binding.sca uri="TestComponent2/Service1"/>
-        	<binding.sca uri="TestComponent2/Service1"/>
+        	<binding.sca name="foo" uri="TestComponent2/Service1"/>
         </reference>
     </component> 
 
Index: General/src/main/resources/TestComposite13.composite
===================================================================
--- General/src/main/resources/TestComposite13.composite	(revision 372)
+++ General/src/main/resources/TestComposite13.composite	(working copy)
@@ -30,8 +30,8 @@
         	<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
         </service>
         <property name="serviceName" source="$serviceName"/>
-        <property name="serviceData1" source="$complexType/firstData"/>
-        <property name="serviceData2" source="$complexType/secondData"/>
+        <property name="serviceData1" source="$complexType/test:firstData"/>
+        <property name="serviceData2" source="$complexType/test:secondData"/>
     </component>
 
 </composite>
Index: General/src/main/resources/Test_ASM_5034.composite
===================================================================
--- General/src/main/resources/Test_ASM_5034.composite	(revision 372)
+++ General/src/main/resources/Test_ASM_5034.composite	(working copy)
@@ -33,8 +33,8 @@
         <property name="serviceName">service1</property>
         <reference name="Reference1">
         	<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
-        	<binding.sca uri="TestComponent2/Service1"/>
-        	<binding.ws uri="http://localhost:8080/TestComponent2"/>
+        	<binding.sca name="binding1" uri="TestComponent2/Service1"/>
+        	<binding.ws name="binding2" uri="http://localhost:8080/TestComponent2/Service1/binding4"/>
         </reference>
     </component> 
 
@@ -43,8 +43,8 @@
 		<implementation.composite name="test:TestComposite1"/>
         <service name="Service1">
         	<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
-        	<binding.sca/>
-		    <binding.ws/>
+        	<binding.sca name="binding3"/>
+		    <binding.ws name="binding4"/>
         </service>
         <property name="serviceName">service2</property>
     </component>
Index: Contribution2/src/main/resources/META-INF/sca-contribution.xml
===================================================================
--- Contribution2/src/main/resources/META-INF/sca-contribution.xml	(revision 372)
+++ Contribution2/src/main/resources/META-INF/sca-contribution.xml	(working copy)
@@ -11,7 +11,7 @@
 	xmlns:test="http://docs.oasis-open.org/ns/opencsa/scatests/200903">
 
 	<import namespace="http://docs.oasis-open.org/ns/opencsa/scatests/2009032" location="Contribution1"/>
-	<import.java package="test"/>
+	<import.java package="org.oasisopen.sca.test"/>
 
 	<export namespace="http://docs.oasis-open.org/ns/opencsa/scatests/2009032"/>
 		
Index: Contribution2/src/main/resources/TestComposite67.composite
===================================================================
--- Contribution2/src/main/resources/TestComposite67.composite	(revision 372)
+++ Contribution2/src/main/resources/TestComposite67.composite	(working copy)
@@ -16,7 +16,7 @@
            name="TestComposite67">
            
 	<service name="Service1" promote="TestComposite67TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
+		<interface.java interface="org.oasisopen.sca.test.Service1"/>
 	</service>
 
     <property name="serviceName" type="string"/>
@@ -24,7 +24,7 @@
     <component name="TestComposite67TestComponent1">
 		<implementation.composite name="test2:TestComposite5"/>
         <service name="Service1">
-        	<interface.java interface="test.Service1"/>
+        	<interface.java interface="org.oasisopen.sca.test.Service1"/>
         </service>
         <property name="serviceName" source="$serviceName"/>
     </component>
Index: Contribution2/src/main/resources/TestComposite5.composite
===================================================================
--- Contribution2/src/main/resources/TestComposite5.composite	(revision 372)
+++ Contribution2/src/main/resources/TestComposite5.composite	(working copy)
@@ -15,15 +15,15 @@
            name="TestComposite5">
            
 	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
+		<interface.java interface="org.oasisopen.sca.test.Service1"/>
 	</service>
 
     <property name="serviceName" type="string"/>
  
     <component name="TestComponent1">
-		<implementation.java class="test.service1Impl"/>
+		<implementation.java class="org.oasisopen.sca.test.service1Impl"/>
         <service name="Service1">
-        	<interface.java interface="test.Service1"/>
+        	<interface.java interface="org.oasisopen.sca.test.Service1"/>
         </service>
         <property name="serviceName">servicex</property>
     </component>
Index: ASM_12003/src/main/resources/Test_ASM_12003.composite
===================================================================
--- ASM_12003/src/main/resources/Test_ASM_12003.composite	(revision 372)
+++ ASM_12003/src/main/resources/Test_ASM_12003.composite	(working copy)
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *
- * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
- * OASIS trademark, IPR and other policies apply.    
- *   
--->
-<!--
-Tests that where a WSDL document references its schema using @schemaLocation attribute 
-(schema artifact specific artifact resolution mechanism), that this is used to resolve 
-the schema rather than SCA mechanisms.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://docs.oasis-open.org/ns/opencsa/scatests/200903"
-           xmlns:test="http://docs.oasis-open.org/ns/opencsa/scatests/200903"
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.    
+ *   
+-->
+<!--
+Tests that where a WSDL document references its schema using @schemaLocation attribute 
+(schema artifact specific artifact resolution mechanism), that this is used to resolve 
+the schema rather than SCA mechanisms.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+           targetNamespace="http://docs.oasis-open.org/ns/opencsa/scatests/200903"
+           xmlns:test="http://docs.oasis-open.org/ns/opencsa/scatests/200903"
            name="TEST_ASM_12003">
-           
+           
     <component name="TestClient">
 		<implementation.composite name="test:TestClient_0002"/>
 		<service name="TestInvocation">
-			<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(TestInvocation)"/>
+			<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(TestInvocation)"/>
 			<binding.ws/>
 		</service>
-        <reference name="reference1" target="TestComponent1/Service1" >
-        	<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
+        <reference name="reference1" target="TestComponent1/Service1" >
+        	<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1b)"/>
         </reference>
         <property name="testName">ASM_12003</property>
     </component>
-
-    <component name="TestComponent1">
-		<implementation.composite name="test:TestComposite1"/>
+
+    <component name="TestComponent1">
+		<implementation.composite name="test:TestComposite1"/>
         <service name="Service1">
-        	<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
-        </service>
-        <property name="serviceName">service1</property>
-    </component>
-
-</composite>
+        	<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1b)"/>
+        </service>
+        <property name="serviceName">service1</property>
+    </component>
+
+</composite>
Index: ASM_12003/src/main/resources/Service1b.wsdl
===================================================================
--- ASM_12003/src/main/resources/Service1b.wsdl	(revision 372)
+++ ASM_12003/src/main/resources/Service1b.wsdl	(working copy)
@@ -24,7 +24,7 @@
     <wsdl:part name="operation1" element="tns:operation1">
     </wsdl:part>
   </wsdl:message>
-  <wsdl:portType name="Service1">
+  <wsdl:portType name="Service1b">
     <wsdl:operation name="operation1">
       <wsdl:input message="tns:operation1">
     </wsdl:input>
Index: ASM_12008/src/main/resources/TestComposite5.composite
===================================================================
--- ASM_12008/src/main/resources/TestComposite5.composite	(revision 372)
+++ ASM_12008/src/main/resources/TestComposite5.composite	(working copy)
@@ -1,33 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *
- * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
- * OASIS trademark, IPR and other policies apply.    
- *   
--->
-<!-- 
-Copy of TestComposite5 with different contents offering 
-	1 service, with a remotable interface type=Service1 (other TestComposite5 has Service2)
-    0 references
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://docs.oasis-open.org/ns/opencsa/scatests/2009032"
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.    
+ *   
+-->
+<!-- 
+Copy of TestComposite5 with different contents offering 
+	1 service, with a remotable interface type=Service1 (other TestComposite5 has Service2)
+    0 references
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+           targetNamespace="http://docs.oasis-open.org/ns/opencsa/scatests/2009032"
+           xmlns:test="http://docs.oasis-open.org/ns/opencsa/scatests/200903"
            name="TestComposite5">
-           
-	<service name="Service1" promote="TestComposite5Component1/Service1">
-		<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
-	</service>
-
-    <property name="serviceName" type="string"/>
- 
-    <component name="TestComposite5Component1">
-		<implementation.composite name="test:TestComposite5"/>
-        <service name="Service1">
-        	<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
-        </service>
-        <!-- Note that the property is fixed as "servicex" which causes this string
-             to appear in the output of the service, if invoked -->      
-        <property name="serviceName">servicex</property>
-    </component>
-
-</composite>
+           
+	<service name="Service1" promote="TestComposite5Component1/Service1">
+		<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
+	</service>
+
+    <property name="serviceName" type="string"/>
+ 
+    <component name="TestComposite5Component1">
+		<implementation.composite name="test:TestComposite5"/>
+        <service name="Service1">
+        	<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
+        </service>
+        <!-- Note that the property is fixed as "servicex" which causes this string
+             to appear in the output of the service, if invoked -->      
+        <property name="serviceName">servicex</property>
+    </component>
+
+</composite>
Index: ASM_4002/src/main/resources/META-INF/sca-contribution.xml
===================================================================
--- ASM_4002/src/main/resources/META-INF/sca-contribution.xml	(revision 372)
+++ ASM_4002/src/main/resources/META-INF/sca-contribution.xml	(working copy)
@@ -12,6 +12,6 @@
 
 	<import namespace="http://docs.oasis-open.org/ns/opencsa/scatests/200903"/>	<!-- Contributions namespace -->
 	<import namespace="http://test.sca.oasisopen.org/"/> 			<!-- WSDL namespace -->	
-	<import.java package="test"/>				<!-- Java package -->
+	<import.java package="org.oasisopen.sca.test"/>				<!-- Java package -->
 	
 </contribution>
Index: ASM_4003/src/main/resources/META-INF/sca-contribution.xml
===================================================================
--- ASM_4003/src/main/resources/META-INF/sca-contribution.xml	(revision 372)
+++ ASM_4003/src/main/resources/META-INF/sca-contribution.xml	(working copy)
@@ -12,6 +12,6 @@
 
 	<import namespace="http://docs.oasis-open.org/ns/opencsa/scatests/200903"/>	<!-- Contributions namespace -->
 	<import namespace="http://test.sca.oasisopen.org/"/> 			<!-- WSDL namespace -->	
-	<import.java package="test"/>				<!-- Java package -->
+	<import.java package="org.oasisopen.sca.test"/>				<!-- Java package -->
 	
 </contribution>
Index: src/main/resources/General/Test_ASM_5033.composite
===================================================================
--- src/main/resources/General/Test_ASM_5033.composite	(revision 372)
+++ src/main/resources/General/Test_ASM_5033.composite	(working copy)
@@ -35,7 +35,7 @@
         <reference name="Reference1">
         	<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
         	<binding.sca uri="TestComponent2/Service1"/>
-        	<binding.sca uri="TestComponent2/Service1"/>
+        	<binding.sca name="foo" uri="TestComponent2/Service1"/>
         </reference>
     </component> 
 
Index: src/main/resources/Contribution2/TestComposite67.composite
===================================================================
--- src/main/resources/Contribution2/TestComposite67.composite	(revision 372)
+++ src/main/resources/Contribution2/TestComposite67.composite	(working copy)
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *
- * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
- * OASIS trademark, IPR and other policies apply.    
- *   
--->
-<!-- 
-Copy of TestComposite5 with a different name, in namespace http://docs.oasis-open.org/ns/opencsa/scatests/2009032 
-	1 service, with a remotable interface type=Service1
-    0 references
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://docs.oasis-open.org/ns/opencsa/scatests/2009032"
-           xmlns:test2="http://docs.oasis-open.org/ns/opencsa/scatests/2009032"
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.    
+ *   
+-->
+<!-- 
+Copy of TestComposite5 with a different name, in namespace http://docs.oasis-open.org/ns/opencsa/scatests/2009032 
+	1 service, with a remotable interface type=Service1
+    0 references
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+           targetNamespace="http://docs.oasis-open.org/ns/opencsa/scatests/2009032"
+           xmlns:test2="http://docs.oasis-open.org/ns/opencsa/scatests/2009032"
            name="TestComposite67">
-           
-	<service name="Service1" promote="TestComposite67TestComponent1/Service1">
-		<interface.java interface="test.Service1"/>
+           
+	<service name="Service1" promote="TestComposite67TestComponent1/Service1">
+		<interface.java interface="org.oasisopen.sca.test.Service1"/>
 	</service>
-
+
     <property name="serviceName" type="string"/>
- 
-    <component name="TestComposite67TestComponent1">
-		<implementation.composite name="test2:TestComposite5"/>
+ 
+    <component name="TestComposite67TestComponent1">
+		<implementation.composite name="test2:TestComposite5"/>
         <service name="Service1">
-        	<interface.java interface="test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-
-</composite>
+        	<interface.java interface="org.oasisopen.sca.test.Service1"/>
+        </service>
+        <property name="serviceName" source="$serviceName"/>
+    </component>
+
+</composite>
Index: src/main/resources/General_Java/TestComposite3.composite
===================================================================
--- src/main/resources/General_Java/TestComposite3.composite	(revision 372)
+++ src/main/resources/General_Java/TestComposite3.composite	(working copy)
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *
- * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
- * OASIS trademark, IPR and other policies apply.    
- *   
--->
-<!-- Invalid composite - it has two composite level references with the same @name attribute  -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://docs.oasis-open.org/ns/opencsa/scatests/200903"
-           xmlns:sample="http://docs.oasis-open.org/ns/opencsa/scatests/200903"
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.    
+ *   
+-->
+<!-- Invalid composite - it has two composite level references with the same @name attribute  -->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+           targetNamespace="http://docs.oasis-open.org/ns/opencsa/scatests/200903"
+           xmlns:sample="http://docs.oasis-open.org/ns/opencsa/scatests/200903"
            name="TestComposite3">
-           
-	<service name="Service1" promote="TestComponent1/Service1">
-		<interface.java interface="org.oasisopen.sca.test.Service1"/>
-	</service>
-
+           
+	<service name="Service1" promote="TestComponent1/Service1">
+		<interface.java interface="org.oasisopen.sca.test.Service1"/>
+	</service>
+
     <property name="serviceName" type="string"/>
- 
-    <component name="TestComponent1">
-		<implementation.java class="org.oasisopen.sca.test.service1Impl2"/>
+ 
+    <component name="TestComponent1">
+		<implementation.java class="org.oasisopen.sca.test.service1Impl2"/>
         <service name="Service1">
         	<interface.java interface="org.oasisopen.sca.test.Service1"/>
-        </service>
-        <property name="serviceName" source="$serviceName"/>
-    </component>
-    
-    <reference name="Reference1" promote="TestComponent1/Reference">
-        <interface.java interface="org.oasisopen.sca.test.Service1"/>
-    </reference>
-    
-    <reference name="Reference1" promote="TestComponent1/Reference">
-        <interface.java interface="org.oasisopen.sca.test.Service1"/>
-    </reference>
-   
-</composite>
+        </service>
+        <property name="serviceName" source="$serviceName"/>
+    </component>
+    
+    <reference name="Reference1" promote="TestComponent1/reference1">
+        <interface.java interface="org.oasisopen.sca.test.Service1"/>
+    </reference>
+    
+    <reference name="Reference1" promote="TestComponent1/reference1">
+        <interface.java interface="org.oasisopen.sca.test.Service1"/>
+    </reference>
+   
+</composite>
Index: ASM_4004/src/main/resources/META-INF/sca-contribution.xml
===================================================================
--- ASM_4004/src/main/resources/META-INF/sca-contribution.xml	(revision 372)
+++ ASM_4004/src/main/resources/META-INF/sca-contribution.xml	(working copy)
@@ -12,6 +12,6 @@
 
 	<import namespace="http://docs.oasis-open.org/ns/opencsa/scatests/200903"/>	<!-- Contributions namespace -->
 	<import namespace="http://test.sca.oasisopen.org/"/> 			<!-- WSDL namespace -->	
-	<import.java package="test"/>				<!-- Java package -->
+	<import.java package="org.oasisopen.sca.test"/>				<!-- Java package -->
 	
 </contribution>
Index: ASM_8010/src/main/resources/META-INF/sca-contribution.xml
===================================================================
--- ASM_8010/src/main/resources/META-INF/sca-contribution.xml	(revision 372)
+++ ASM_8010/src/main/resources/META-INF/sca-contribution.xml	(working copy)
@@ -4,7 +4,7 @@
 
 	<import namespace="http://docs.oasis-open.org/ns/opencsa/scatests/200903"/>
 	<import namespace="http://test.sca.oasisopen.org/"/>			<!-- WSDL files -->
-	<import.java package="test"/>
+	<import.java package="org.oasisopen.sca.test"/>
 	
 	
 </contribution>
Index: ASM_8011/src/main/resources/TestComposite62.composite
===================================================================
--- ASM_8011/src/main/resources/TestComposite62.composite	(revision 372)
+++ ASM_8011/src/main/resources/TestComposite62.composite	(working copy)
@@ -25,7 +25,7 @@
     
     <component name="TestComposite62TestComponent1">
 		<implementation.java class="test.service1Callback5Impl"/>
-		<implementation.composite name="test:TestComposite54"/>
+		<!-- implementation.composite name="test:TestComposite54"/ -->
         <service name="Service1">
         	<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
         </service>
Index: ASM_6033/src/main/resources/TestComposite41.composite
===================================================================
--- ASM_6033/src/main/resources/TestComposite41.composite	(revision 372)
+++ ASM_6033/src/main/resources/TestComposite41.composite	(working copy)
@@ -27,12 +27,12 @@
         	<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
         </service>
         <property name="serviceName" source="$serviceName"/>
-        <reference name="reference1" multiplicity="1..1">
+        <reference name="Reference1" multiplicity="1..1">
         	<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
         </reference>
     </component>
     
-    <reference name="Reference1" promote="TestComponent1/reference1" multiplicity="0..n">
+    <reference name="Reference1" promote="TestComponent1/Reference1" multiplicity="0..n">
         <interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(Service1)"/>
     </reference>
     
Index: General_Java/src/main/resources/TestComposite3.composite
===================================================================
--- General_Java/src/main/resources/TestComposite3.composite	(revision 372)
+++ General_Java/src/main/resources/TestComposite3.composite	(working copy)
@@ -25,11 +25,11 @@
         <property name="serviceName" source="$serviceName"/>
     </component>
     
-    <reference name="Reference1" promote="TestComponent1/Reference">
+    <reference name="Reference1" promote="TestComponent1/reference1">
         <interface.java interface="org.oasisopen.sca.test.Service1"/>
     </reference>
     
-    <reference name="Reference1" promote="TestComponent1/Reference">
+    <reference name="Reference1" promote="TestComponent1/reference1">
         <interface.java interface="org.oasisopen.sca.test.Service1"/>
     </reference>
    
Index: General_Java/src/main/resources/META-INF/sca-contribution.xml
===================================================================
--- General_Java/src/main/resources/META-INF/sca-contribution.xml	(revision 372)
+++ General_Java/src/main/resources/META-INF/sca-contribution.xml	(working copy)
@@ -11,6 +11,6 @@
 	<export namespace="http://docs.oasis-open.org/ns/opencsa/scatests/200903"/> 	<!-- Contributions namespace 1 -->
 	<export namespace="http://docs.oasis-open.org/ns/opencsa/scatests/2009032"/> 	<!-- Contributions namespace 2 -->
 	<export namespace="http://test.sca.oasisopen.org/"/> 			<!-- WSDL namespace -->
-	<export.java package="test"/> 				<!-- Java package -->
+	<export.java package="org.oasisopen.sca.test"/> 				<!-- Java package -->
 	
 </contribution>