31 files changed, 48 insertions, 48 deletions
diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
index 87773d8361..6cad998042 100644
--- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
+++ b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
@@ -19,8 +19,8 @@
 
 package mysca.test.myservice;
 
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(MyService.class)
 public class MyServiceImpl implements MyService {
diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
index a9afe052ba..f3c9280f96 100644
--- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
+++ b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
@@ -19,8 +19,8 @@
 
 package mysca.test.myservice;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(MySimpleTotalService.class)
 public class MySimpleTotalServiceImpl implements MySimpleTotalService {
diff --git a/java/sca/itest/recursive-ws/src/main/java/policy/Target.java b/java/sca/itest/recursive-ws/src/main/java/policy/Target.java
index c77fcea868..2366f6542a 100644
--- a/java/sca/itest/recursive-ws/src/main/java/policy/Target.java
+++ b/java/sca/itest/recursive-ws/src/main/java/policy/Target.java
@@ -18,7 +18,7 @@
  */
 package policy;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 public interface Target {
diff --git a/java/sca/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/java/sca/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
index 87e412829e..b2d59e925c 100644
--- a/java/sca/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
+++ b/java/sca/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
@@ -18,8 +18,8 @@
  */
 package policy;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(Target.class)
 public class TargetClientImpl implements Target {
diff --git a/java/sca/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/java/sca/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
index e565055252..6f52dfb26e 100644
--- a/java/sca/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
+++ b/java/sca/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
@@ -18,7 +18,7 @@
  */
 package policy;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(Target.class)
 public class TargetServiceImpl implements Target {
diff --git a/java/sca/itest/recursive-ws/src/main/java/recursive/Composer.java b/java/sca/itest/recursive-ws/src/main/java/recursive/Composer.java
index e53f99d9c3..18486115ae 100644
--- a/java/sca/itest/recursive-ws/src/main/java/recursive/Composer.java
+++ b/java/sca/itest/recursive-ws/src/main/java/recursive/Composer.java
@@ -18,7 +18,7 @@
  */
 package recursive;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 public interface Composer {
diff --git a/java/sca/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/java/sca/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
index 3d75b7b165..3c432bc26a 100644
--- a/java/sca/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
+++ b/java/sca/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
@@ -19,7 +19,7 @@
 
 package recursive;
 
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/java/sca/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
index 3e71246da2..7ff34c9787 100644
--- a/java/sca/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
+++ b/java/sca/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
@@ -28,7 +28,7 @@ import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.osoa.sca.annotations.EndsConversation;
+import org.oasisopen.sca.annotation.EndsConversation;
 
 public class PolicyTestCase{
 
diff --git a/java/sca/itest/recursive/src/main/java/composite/SourceImpl.java b/java/sca/itest/recursive/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..8e2b347604 100644
--- a/java/sca/itest/recursive/src/main/java/composite/SourceImpl.java
+++ b/java/sca/itest/recursive/src/main/java/composite/SourceImpl.java
@@ -18,9 +18,9 @@
  */
 package composite;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 
 @Service(Source.class)
diff --git a/java/sca/itest/recursive/src/main/java/composite/Target.java b/java/sca/itest/recursive/src/main/java/composite/Target.java
index 9a8f68a7fa..703e72fc10 100644
--- a/java/sca/itest/recursive/src/main/java/composite/Target.java
+++ b/java/sca/itest/recursive/src/main/java/composite/Target.java
@@ -18,8 +18,8 @@
  */
 package composite;
 
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.OneWay;
 
 
 @Callback(SourceCallback.class)
diff --git a/java/sca/itest/recursive/src/main/java/composite/TargetImpl.java b/java/sca/itest/recursive/src/main/java/composite/TargetImpl.java
index 86686e9233..cd9a9746fa 100644
--- a/java/sca/itest/recursive/src/main/java/composite/TargetImpl.java
+++ b/java/sca/itest/recursive/src/main/java/composite/TargetImpl.java
@@ -18,9 +18,9 @@
  */
 package composite;
 
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 
 @Service(Target.class)
diff --git a/java/sca/itest/recursive/src/main/java/foo/A.java b/java/sca/itest/recursive/src/main/java/foo/A.java
index e87cbde26d..65bf41920e 100644
--- a/java/sca/itest/recursive/src/main/java/foo/A.java
+++ b/java/sca/itest/recursive/src/main/java/foo/A.java
@@ -18,7 +18,7 @@
  */
 package foo;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(I.class)
 public class A implements I {
diff --git a/java/sca/itest/recursive/src/main/java/foo/B.java b/java/sca/itest/recursive/src/main/java/foo/B.java
index 9d060cab59..ecc04aff4c 100644
--- a/java/sca/itest/recursive/src/main/java/foo/B.java
+++ b/java/sca/itest/recursive/src/main/java/foo/B.java
@@ -18,8 +18,8 @@
  */
 package foo;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(I.class)
 public class B implements I {
diff --git a/java/sca/itest/recursive/src/main/java/policy/Target.java b/java/sca/itest/recursive/src/main/java/policy/Target.java
index c77fcea868..2366f6542a 100644
--- a/java/sca/itest/recursive/src/main/java/policy/Target.java
+++ b/java/sca/itest/recursive/src/main/java/policy/Target.java
@@ -18,7 +18,7 @@
  */
 package policy;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 public interface Target {
diff --git a/java/sca/itest/recursive/src/main/java/policy/TargetClientImpl.java b/java/sca/itest/recursive/src/main/java/policy/TargetClientImpl.java
index 87e412829e..b2d59e925c 100644
--- a/java/sca/itest/recursive/src/main/java/policy/TargetClientImpl.java
+++ b/java/sca/itest/recursive/src/main/java/policy/TargetClientImpl.java
@@ -18,8 +18,8 @@
  */
 package policy;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(Target.class)
 public class TargetClientImpl implements Target {
diff --git a/java/sca/itest/recursive/src/main/java/policy/TargetServiceImpl.java b/java/sca/itest/recursive/src/main/java/policy/TargetServiceImpl.java
index e565055252..6f52dfb26e 100644
--- a/java/sca/itest/recursive/src/main/java/policy/TargetServiceImpl.java
+++ b/java/sca/itest/recursive/src/main/java/policy/TargetServiceImpl.java
@@ -18,7 +18,7 @@
  */
 package policy;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(Target.class)
 public class TargetServiceImpl implements Target {
diff --git a/java/sca/itest/recursive/src/main/java/sample/ComponentAImpl.java b/java/sca/itest/recursive/src/main/java/sample/ComponentAImpl.java
index f513949105..458a7d28a3 100644
--- a/java/sca/itest/recursive/src/main/java/sample/ComponentAImpl.java
+++ b/java/sca/itest/recursive/src/main/java/sample/ComponentAImpl.java
@@ -19,8 +19,8 @@
 
 package sample;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/itest/recursive/src/main/java/sample/ComponentCImpl.java b/java/sca/itest/recursive/src/main/java/sample/ComponentCImpl.java
index 586a9ee6a7..f3b9fc014d 100644
--- a/java/sca/itest/recursive/src/main/java/sample/ComponentCImpl.java
+++ b/java/sca/itest/recursive/src/main/java/sample/ComponentCImpl.java
@@ -19,8 +19,8 @@
 
 package sample;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/itest/recursive/src/main/java/sample/ComponentEImpl.java b/java/sca/itest/recursive/src/main/java/sample/ComponentEImpl.java
index dbf2735aa7..445b622a72 100644
--- a/java/sca/itest/recursive/src/main/java/sample/ComponentEImpl.java
+++ b/java/sca/itest/recursive/src/main/java/sample/ComponentEImpl.java
@@ -19,8 +19,8 @@
 
 package sample;
 
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/itest/recursive/src/main/java/sample/ComponentFImpl.java b/java/sca/itest/recursive/src/main/java/sample/ComponentFImpl.java
index 5e136e536c..e2de8f3dc5 100644
--- a/java/sca/itest/recursive/src/main/java/sample/ComponentFImpl.java
+++ b/java/sca/itest/recursive/src/main/java/sample/ComponentFImpl.java
@@ -19,7 +19,7 @@
 
 package sample;
 
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/itest/recursive/src/main/java/test/AggregatorImpl.java b/java/sca/itest/recursive/src/main/java/test/AggregatorImpl.java
index f6ac6c8741..638219d431 100644
--- a/java/sca/itest/recursive/src/main/java/test/AggregatorImpl.java
+++ b/java/sca/itest/recursive/src/main/java/test/AggregatorImpl.java
@@ -21,8 +21,8 @@ package test;
 
 import java.util.List;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/itest/recursive/src/main/java/test/InnerSourceImpl.java b/java/sca/itest/recursive/src/main/java/test/InnerSourceImpl.java
index c8dad5ae35..aae9aba587 100644
--- a/java/sca/itest/recursive/src/main/java/test/InnerSourceImpl.java
+++ b/java/sca/itest/recursive/src/main/java/test/InnerSourceImpl.java
@@ -19,7 +19,7 @@
 
 package test;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/itest/recursive/src/main/java/test/OuterSourceImpl.java b/java/sca/itest/recursive/src/main/java/test/OuterSourceImpl.java
index 11816e82cf..bd31498ccc 100644
--- a/java/sca/itest/recursive/src/main/java/test/OuterSourceImpl.java
+++ b/java/sca/itest/recursive/src/main/java/test/OuterSourceImpl.java
@@ -19,7 +19,7 @@
 
 package test;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/itest/recursive/src/main/java/test/Source.java b/java/sca/itest/recursive/src/main/java/test/Source.java
index 9b93740d9d..bcad89bf4d 100644
--- a/java/sca/itest/recursive/src/main/java/test/Source.java
+++ b/java/sca/itest/recursive/src/main/java/test/Source.java
@@ -19,7 +19,7 @@
 
 package test;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/itest/recursive/src/main/java/test1/composite/TargetOne.java b/java/sca/itest/recursive/src/main/java/test1/composite/TargetOne.java
index a7c68f4ffd..831e3cbd7b 100644
--- a/java/sca/itest/recursive/src/main/java/test1/composite/TargetOne.java
+++ b/java/sca/itest/recursive/src/main/java/test1/composite/TargetOne.java
@@ -18,7 +18,7 @@
  */
 package test1.composite;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(Target.class)
 public class TargetOne implements Target {
diff --git a/java/sca/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/java/sca/itest/recursive/src/main/java/test1/composite/TargetTwo.java
index 7fff8e2e9b..8c32eca547 100644
--- a/java/sca/itest/recursive/src/main/java/test1/composite/TargetTwo.java
+++ b/java/sca/itest/recursive/src/main/java/test1/composite/TargetTwo.java
@@ -18,7 +18,7 @@
  */
 package test1.composite;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(Target.class)
 public class TargetTwo implements Target {
diff --git a/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java b/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
index f042113f7a..fb9872378d 100644
--- a/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
+++ b/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
@@ -77,8 +77,8 @@ public class LocateServiceEmbeddedSCADomainTestCase extends TestCase {
             source = domain.getService(Source.class, "SourceComponentXXX");
             // The source proxy can be created for the remote target but it will throw exception when a method is invoked
             source.clientMethod("ABC");
-            fail("Expected to generate org.osoa.sca.ServiceRuntimeException but did not when invoking service with async");
-        } catch (org.osoa.sca.ServiceRuntimeException e) {
+            fail("Expected to generate org.oasisopen.sca.ServiceRuntimeException but did not when invoking service with async");
+        } catch (org.oasisopen.sca.ServiceRuntimeException e) {
             // expected.
         }
     }
diff --git a/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java b/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
index 87eb948452..171f181438 100644
--- a/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
+++ b/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
@@ -54,8 +54,8 @@ public class LocateServiceSCADomainTestCase extends TestCase {
             source = domain.getService(Source.class, "SourceComponentXXX");
             // The source proxy can be created for the remote target but it will throw exception when a method is invoked
             source.clientMethod("ABC");
-            fail("Expected to generate org.osoa.sca.ServiceRuntimeException but did not when invoking service with async");
-        } catch (org.osoa.sca.ServiceRuntimeException e) {
+            fail("Expected to generate org.oasisopen.sca.ServiceRuntimeException but did not when invoking service with async");
+        } catch (org.oasisopen.sca.ServiceRuntimeException e) {
             // expected.
         }
     }
diff --git a/java/sca/itest/recursive/src/test/java/sample/CImpl.java b/java/sca/itest/recursive/src/test/java/sample/CImpl.java
index 466284983e..98610e32a6 100644
--- a/java/sca/itest/recursive/src/test/java/sample/CImpl.java
+++ b/java/sca/itest/recursive/src/test/java/sample/CImpl.java
@@ -20,8 +20,8 @@ package sample;
 
 import junit.framework.Assert;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * Implementation of a simple service
diff --git a/java/sca/itest/recursive/src/test/java/sample/XImpl.java b/java/sca/itest/recursive/src/test/java/sample/XImpl.java
index e430807568..7f80dfccb2 100644
--- a/java/sca/itest/recursive/src/test/java/sample/XImpl.java
+++ b/java/sca/itest/recursive/src/test/java/sample/XImpl.java
@@ -18,7 +18,7 @@
  */
 package sample;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * Implementation of a simple service
diff --git a/java/sca/itest/recursive/src/test/java/sample/YImpl.java b/java/sca/itest/recursive/src/test/java/sample/YImpl.java
index 994c9eb95f..b8e3a58974 100644
--- a/java/sca/itest/recursive/src/test/java/sample/YImpl.java
+++ b/java/sca/itest/recursive/src/test/java/sample/YImpl.java
@@ -18,7 +18,7 @@
  */
 package sample;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * Implementation of a Simple Service