Update JMS itests for 2.x APIs

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

37 files changed, 74 insertions, 122 deletions

diff --git a/java/sca/itest/jms/format/pom.xml b/java/sca/itest/jms/format/pom.xml
index 3adca6f921..da72ff58e1 100644
--- a/java/sca/itest/jms/format/pom.xml
+++ b/java/sca/itest/jms/format/pom.xml
@@ -39,6 +39,12 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index b1f62c1422..646cecc2b7 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index efed4842ea..c6fa73a42a 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld;
 
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 
 public class HelloWorldReferenceImpl implements HelloWorldReference {
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index 5ae7032993..d9f6a18f18 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index 5fad413ebe..be358fbac1 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
index dd58c9554e..4dec30540d 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
index 02a3d944f7..9d8525ab26 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld;
 
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 public class HelloWorldReferenceImpl implements HelloWorldReference {
     
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
index 9c2198e6ca..af98fb09b1 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
index 8744a57daf..82ebdb3aec 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
index f465767056..a8cbc080da 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld;
 
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 public class HelloWorldReferenceImpl implements HelloWorldReference {
     
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
index 545fcc894d..41800b6c7a 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
@@ -18,8 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld;
 
-import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.CheckedException;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
index aca727a9db..d7c2f10f43 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
@@ -18,7 +18,6 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld;
 
-import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.CheckedException;
 
 public class HelloWorldServiceImpl implements HelloWorldService {
     
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
index 948732adb4..e67f2ba8fa 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
index ed697f8a38..21b4d0461e 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld;
 
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 
 public class HelloWorldReferenceImpl implements HelloWorldReference {
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
index 574188d466..43e623f192 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld;
 
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
index 39af400f6a..feee945ccd 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
@@ -20,8 +20,8 @@ package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld;
 
 import javax.jws.soap.SOAPBinding;
 
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
index e89598cb96..3affec3f72 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
index bb853673e8..2438044656 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld;
 
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 
 public class HelloWorldReferenceImpl implements HelloWorldReference {
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
index 8976887daa..1c3a46a70c 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
index 304e145161..ab93ac8dc5 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
index 2587a51704..7a6dbb195b 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld;
 
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 
 public class HelloWorldReferenceImpl implements HelloWorldReference {
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
index f46f3e2d04..3873991456 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
index 6015ab8930..a233a2cb03 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
index e5cd9db281..808263e409 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
index c54e195178..02b62ef1ac 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld;
 
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 public class HelloWorldReferenceImpl implements HelloWorldReference {
     
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
index a98f589b9a..0530d57db9 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
@@ -18,8 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld;
 
-import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.CheckedException;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
index 7965388013..476595adc2 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
@@ -18,7 +18,6 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld;
 
-import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.CheckedException;
 
 public class HelloWorldServiceImpl implements HelloWorldService {
 
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
index 732b49ea6c..4cedd3b7f0 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld;
 
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 
 public class HelloWorldReferenceImpl implements HelloWorldService {
diff --git a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
index 65323a3d63..c478aeb0b6 100644
--- a/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
+++ b/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
index a0429aa59f..eefd0a762d 100644
--- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
+++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
@@ -21,10 +21,8 @@ package org.apache.tuscany.sca.binding.jms.format;
 import static org.junit.Assert.assertEquals;
 
 import org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReference;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -35,20 +33,16 @@ import org.junit.Test;
  */
 public class FormatJMSBytesTestCase {
 
-    private static SCANode node;
+    private Node node;
 
     @Before
     public void init() {
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANode("jmsbytes/helloworld.composite", 
-                                     new SCAContribution("test", "./target/classes"));
-
-        node.start();
+        node = NodeFactory.newInstance().createNode().start();
     }
 
     @Test
     public void testHelloWorldCreate() throws Exception {
-        HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+        HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
         
         System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
 /* TUSCANY-2967 - disable this change while we decide what to do and
diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
index ec9a1adeb4..e5ea718a05 100644
--- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
+++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
@@ -21,10 +21,8 @@ package org.apache.tuscany.sca.binding.jms.format;
 import static org.junit.Assert.assertEquals;
 
 import org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReference;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -35,20 +33,16 @@ import org.junit.Test;
  */
 public class FormatJMSBytesXMLTestCase {
 
-    private static SCANode node;
+    private static Node node;
 
     @Before
     public void init() {
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANode("jmsbytesxml/helloworld.composite", 
-                                     new SCAContribution("test", "./target/classes"));
-
-        node.start();
+        node = NodeFactory.newInstance().createNode().start();
     }
 
     @Test
     public void testHelloWorldCreate() throws Exception {
-        HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+        HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
         
         System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
         assertEquals("Hello Fred Bloggs foo remote service exception, see nested exception", helloWorldService.getGreetings("Fred Bloggs"));
diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
index dc2cc13679..eb434fa0a8 100644
--- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
+++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
@@ -23,10 +23,8 @@ import static org.junit.Assert.assertEquals;
 import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldReference;
 import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl;
 import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.Person;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -38,20 +36,16 @@ import org.junit.Test;
  */
 public class FormatJMSDefaultTestCase {
 
-    private static SCANode node;
+    private static Node node;
 
     @Before
     public void init() {
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANode("jmsdefault/helloworld.composite", 
-                                     new SCAContribution("test", "./target/classes"));
-
-        node.start();
+        node = NodeFactory.newInstance().createNode().start();
     }
 
     @Test
     public void testHelloWorldCreate() throws Exception {
-        HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+        HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
         
         assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs foo remote service exception, see nested exception foo remote service exception, see nested exception", helloWorldService.getGreetings("Fred Bloggs"));
         
diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
index c617a984ef..7644e914e5 100644
--- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
+++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
@@ -21,10 +21,8 @@ package org.apache.tuscany.sca.binding.jms.format;
 import static org.junit.Assert.assertEquals;
 
 import org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldReference;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -35,20 +33,16 @@ import org.junit.Test;
  */
 public class FormatJMSMessageTestCase {
 
-    private static SCANode node;
+    private static Node node;
 
     @Before
     public void init() {
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANode("jmsmessage/helloworld.composite", 
-                                     new SCAContribution("test", "./target/classes"));
-
-        node.start();
+        node = NodeFactory.newInstance().createNode().start();
     }
 
     @Test
     public void testHelloWorldCreate() throws Exception {
-        HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+        HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
         
         System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
         assertEquals("Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
index 462ebb557e..5a3ca436e6 100644
--- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
+++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
@@ -21,10 +21,8 @@ package org.apache.tuscany.sca.binding.jms.format;
 import static org.junit.Assert.assertEquals;
 
 import org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld.HelloWorldReference;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -36,21 +34,16 @@ import org.junit.Test;
  */
 public class FormatJMSObjectTestCase {
 
-    private static SCANode node;
+    private static Node node;
 
     @Before
     public void init() {
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANode("jmsobject/helloworld.composite",
-                new SCAContribution("test", "./target/classes"));
-
-        node.start();
+        node = NodeFactory.newInstance().createNode().start();
     }
 
     @Test
     public void testHelloWorldCreate() throws Exception {
-        HelloWorldReference helloWorldService = ((SCAClient) node).getService(
-                HelloWorldReference.class, "HelloWorldReferenceComponent");
+        HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
 
         assertEquals("Hello1 Fred Hello1 Bloggs Hello2 null Hello3 Fred Hello4 Fred Bloggs Hello5 Fred Bloggs Hello6 Fred Bloggs Hello7 Fred Bloggs", 
                      helloWorldService.getGreetingsWrapSingle("Fred", "Bloggs"));
diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
index d45e6492ce..8aeb6803f8 100644
--- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
+++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
@@ -21,10 +21,8 @@ package org.apache.tuscany.sca.binding.jms.format;
 import static org.junit.Assert.assertEquals;
 
 import org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReference;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -35,20 +33,16 @@ import org.junit.Test;
  */
 public class FormatJMSTextTestCase {
 
-    private static SCANode node;
+    private static Node node;
 
     @Before
     public void init() {
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANode("jmstext/helloworld.composite", 
-                                     new SCAContribution("test", "./target/classes"));
-
-        node.start();
+        node = NodeFactory.newInstance().createNode().start();
     }
 
     @Test
     public void testHelloWorldCreate() throws Exception {
-        HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+        HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
         
         System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
         assertEquals("Hello Fred Bloggs " +
diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
index 5d3b0ac9e3..98ac2554d4 100644
--- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
+++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
@@ -22,13 +22,10 @@ import static org.junit.Assert.assertEquals;
 
 import org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.HelloWorldService;
 import org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.Person;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 
@@ -37,20 +34,16 @@ import org.junit.Test;
  */
 public class FormatJMSTextXMLInJMSObjectOutTestCase {
 
-    private static SCANode node;
+    private static Node node;
 
     @Before
     public void init() {
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANode("jmstextxmlinjmsobjectout/helloworld.composite", 
-                                     new SCAContribution("test", "./target/classes"));
-
-        node.start();
+        node = NodeFactory.newInstance().createNode().start();
     }
 
     @Test
     public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldReferenceComponent");
+        HelloWorldService helloWorldService = node.getService(HelloWorldService.class, "HelloWorldReferenceComponent");
         
         assertEquals("Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
         
diff --git a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
index 5650d06a36..a9fed8a11e 100644
--- a/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
+++ b/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
@@ -22,10 +22,8 @@ import static org.junit.Assert.assertEquals;
 
 import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldReference;
 import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.Person;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,20 +34,16 @@ import org.junit.Test;
  */
 public class FormatJMSTextXMLTestCase {
 
-    private static SCANode node;
+    private static Node node;
 
     @Before
     public void init() {
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        node = factory.createSCANode("jmstextxml/helloworld.composite", 
-                                     new SCAContribution("test", "./target/classes"));
-
-        node.start();
+        node = NodeFactory.newInstance().createNode().start();
     }
 
     @Test
     public void testHelloWorldCreate() throws Exception {
-        HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+        HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
         
         assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));