Index: sca-java-caa/JCA_General_POJO/src/main/java/org/oasisopen/sca/test/service1AsyncRefImpl.java
===================================================================
--- sca-java-caa/JCA_General_POJO/src/main/java/org/oasisopen/sca/test/service1AsyncRefImpl.java	(revision 92)
+++ sca-java-caa/JCA_General_POJO/src/main/java/org/oasisopen/sca/test/service1AsyncRefImpl.java	(working copy)
@@ -67,22 +67,22 @@
 		
 		if( invokeMethods.equals("asyncPoll")) {
 			// Invoke an async polling method...
-			Response<String> theResponse = reference1.operation1Async( input );
-			try {
-				result = theResponse.get();
-			} catch (Exception e) {
-				// Do nothing - the null response string deals with the occurrance of an exception
-			} // end try
+//			Response<String> theResponse = reference1.operation1Async( input );
+//			try {
+//				result = theResponse.get();
+//			} catch (Exception e) {
+//				// Do nothing - the null response string deals with the occurrance of an exception
+//			} // end try
 		} // end if
 		
 		if( invokeMethods.equals("asyncCallback")) {
-			Future<?> theFuture = reference1.operation1Async(input, callback);
-			try {
-				theLatch.await(10, TimeUnit.SECONDS);
-			} catch (InterruptedException e) {
-				// Do nothing
-			} // end try
-			result = asyncResponse;
+//			Future<?> theFuture = reference1.operation1Async(input, callback);
+//			try {
+//				theLatch.await(10, TimeUnit.SECONDS);
+//			} catch (InterruptedException e) {
+//				// Do nothing
+//			} // end try
+//			result = asyncResponse;
 		} // end if
 		
 		return serviceName + " operation1 invoked" + " " + result;
Index: sca-java-caa/JCA_General_POJO/src/main/java/org/oasisopen/sca/test/Service1WithAsyncMethods.java
===================================================================
--- sca-java-caa/JCA_General_POJO/src/main/java/org/oasisopen/sca/test/Service1WithAsyncMethods.java	(revision 92)
+++ sca-java-caa/JCA_General_POJO/src/main/java/org/oasisopen/sca/test/Service1WithAsyncMethods.java	(working copy)
@@ -32,7 +32,7 @@
 	 * @param input
 	 * @return
 	 */
-	public Response<String> operation1Async( String input );
+//	public Response<String> operation1Async( String input );
 	
 	/**
 	 * Callback version of the synchronous operation1 method
@@ -40,6 +40,6 @@
 	 * @param callback - Async callback handler
 	 * @return - a Future representing the outstanding request
 	 */
-	public Future<?> operation1Async( String input, AsyncHandler<String> callback );
+//	public Future<?> operation1Async( String input, AsyncHandler<String> callback );
 
 } // end interface Service1WithAsyncMethods
Index: sca-java-caa/JCA_General_POJO/src/main/java/org/oasisopen/sca/test/service1LifecycleExceptionsImpl.java
===================================================================
--- sca-java-caa/JCA_General_POJO/src/main/java/org/oasisopen/sca/test/service1LifecycleExceptionsImpl.java	(revision 92)
+++ sca-java-caa/JCA_General_POJO/src/main/java/org/oasisopen/sca/test/service1LifecycleExceptionsImpl.java	(working copy)
@@ -79,6 +79,7 @@
 		if( reference1Parm != null ) actionSequence += " reference1 injected";
 		property1 	= property1Parm;
 		reference1	= reference1Parm;
+		uninitRef = uninitRefParm;
 		
 		dataStore.storeData( serviceName, actionSequence );
 		// Transition to injecting state
Index: sca-java-caa/JCA_10050/src/main/resources/Test_JCA_10050.composite
===================================================================
--- sca-java-caa/JCA_10050/src/main/resources/Test_JCA_10050.composite	(revision 0)
+++ sca-java-caa/JCA_10050/src/main/resources/Test_JCA_10050.composite	(revision 0)
@@ -0,0 +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.    
+ *   
+-->
+<!--
+ JCA-TA-10050
+ Tests that where an implementation class declares 2 or more services, 
+ that each service interface class has a distinct Java simple name
+   -->
+<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_JCA_10050">
+           
+    <component name="TestClient">
+		<implementation.composite name="test:TestClient_0002"/>
+		<service name="TestInvocation">
+			<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(TestInvocation)"/>
+            <binding.ws/>
+		</service>
+        <reference name="reference1" target="TEST_JCA_10050Component1/Service1" />
+        <property name="testName">JCA_10050</property>
+    </component>
+    
+    <component name="TEST_JCA_10050Component1">
+        <implementation.java class="org.oasisopen.sca.test.duplicateSimpleNamesImpl"/>
+        <service name="Service1">
+            <interface.java interface="org.oasisopen.sca.test.Service1"/>
+        </service>
+        <property name="serviceName">service1</property>
+    </component> 
+
+</composite>
\ No newline at end of file
Index: sca-java-caa/JCA_10050/src/main/resources/JCA_10050.composite
===================================================================
--- sca-java-caa/JCA_10050/src/main/resources/JCA_10050.composite	(revision 92)
+++ sca-java-caa/JCA_10050/src/main/resources/JCA_10050.composite	(working copy)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *
- * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
- * OASIS trademark, IPR and other policies apply.    
- *   
--->
-<!--
- JCA-TA-10050
- Tests that where an implementation class declares 2 or more services, 
- that each service interface class has a distinct Java simple name
-   -->
-<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_JCA_10050">
-           
-    <component name="TestClient">
-		<implementation.composite name="test:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(TestInvocation)"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TEST_JCA_10050Component1/Service1" />
-        <property name="testName">JCA_10050</property>
-    </component>
-    
-    <component name="TEST_JCA_10050Component1">
-        <implementation.java class="org.oasisopen.sca.test.duplicateSimpleNamesImpl"/>
-        <service name="Service1">
-            <interface.java interface="org.oasisopen.sca.test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-    </component> 
-
-</composite>
\ No newline at end of file
Index: sca-java-caa/JCA_10051/src/main/resources/Test_JCA_10051.composite
===================================================================
--- sca-java-caa/JCA_10051/src/main/resources/Test_JCA_10051.composite	(revision 0)
+++ sca-java-caa/JCA_10051/src/main/resources/Test_JCA_10051.composite	(revision 0)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *
+ * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
+ * OASIS trademark, IPR and other policies apply.    
+ *   
+-->
+<!--
+ JCA-TA-10051
+ Tests that a @Service annotation has at least one element in its @value array
+-->
+<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_JCA_10051">
+           
+    <component name="TestClient">
+		<implementation.composite name="test:TestClient_0002"/>
+		<service name="TestInvocation">
+			<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(TestInvocation)"/>
+            <binding.ws/>
+		</service>
+        <reference name="reference1" target="TEST_JCA_10051Component1/Service1" />
+        <property name="testName">JCA_10051</property>
+    </component>
+    
+    <component name="TEST_JCA_10051Component1">
+        <implementation.java class="org.oasisopen.sca.test.emptyServiceAnnotationImpl"/>
+        <service name="Service1">
+            <interface.java interface="org.oasisopen.sca.test.Service1"/>
+        </service>
+        <property name="serviceName">service1</property>
+    </component> 
+
+</composite>
\ No newline at end of file
Index: sca-java-caa/JCA_10051/src/main/resources/JCA_10051.composite
===================================================================
--- sca-java-caa/JCA_10051/src/main/resources/JCA_10051.composite	(revision 92)
+++ sca-java-caa/JCA_10051/src/main/resources/JCA_10051.composite	(working copy)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *
- * Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
- * OASIS trademark, IPR and other policies apply.    
- *   
--->
-<!--
- JCA-TA-10051
- Tests that a @Service annotation has at least one element in its @value array
--->
-<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_JCA_10051">
-           
-    <component name="TestClient">
-		<implementation.composite name="test:TestClient_0002"/>
-		<service name="TestInvocation">
-			<interface.wsdl interface="http://test.sca.oasisopen.org/#wsdl.porttype(TestInvocation)"/>
-            <binding.ws/>
-		</service>
-        <reference name="reference1" target="TEST_JCA_10051Component1/Service1" />
-        <property name="testName">JCA_10051</property>
-    </component>
-    
-    <component name="TEST_JCA_10051Component1">
-        <implementation.java class="org.oasisopen.sca.test.emptyServiceAnnotationImpl"/>
-        <service name="Service1">
-            <interface.java interface="org.oasisopen.sca.test.Service1"/>
-        </service>
-        <property name="serviceName">service1</property>
-    </component> 
-
-</composite>
\ No newline at end of file
Index: sca-java-caa/pom.xml
===================================================================
--- sca-java-caa/pom.xml	(revision 92)
+++ sca-java-caa/pom.xml	(working copy)
@@ -23,6 +23,7 @@
         <module>JCA_0000</module>
         <module>JCA_2001</module>
         <module>JCA_2002</module>
+        <module>JCA_2003</module>
         <module>JCA_3001</module>
         <module>JCA_3002</module>
         <module>JCA_3003</module>
Index: sca-java-caa/JCA_10049/src/main/java/org/oasisopen/sca/test/serviceNamesMismatchImpl.java
===================================================================
--- sca-java-caa/JCA_10049/src/main/java/org/oasisopen/sca/test/serviceNamesMismatchImpl.java	(revision 92)
+++ sca-java-caa/JCA_10049/src/main/java/org/oasisopen/sca/test/serviceNamesMismatchImpl.java	(working copy)
@@ -18,7 +18,7 @@
  * This class has a @Service annotation with a list of Service interface classes and a list of names, but
  * the size of the interface class list is different from the size of the names list
  */
-@Service({Service1.class, Service1Superset.class}, names={"Service1", "AnotherService", "YetAnotherService"})
+@Service(value={Service1.class, Service1Superset.class}, names={"Service1", "AnotherService", "YetAnotherService"})
 public class serviceNamesMismatchImpl implements Service1 {
 
 	@Property