TUSCANY-2790 - Updated package names from org.osoa.sca to org.oasisopen.sca and from org.osoa.sca.annotations to org.oasisopen.sca.annotation to reflect the new package names in the OASIS Open SCA specifications.

To do this, I:
   * Renamed the org.osoa.sca package to org.oasisopen.sca using Eclipse refactoring
   * Renamed the org.osoa.sca.annotations package to org.oasisopen.sca.annotation using Eclipse refactoring
   * Did a global search and replace for all remaining instances of the old org.osoa package names and replaced with the new org.oasisopen version

Hopefully, I have not missed too many instances of the old package name

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

19 files changed, 79 insertions, 79 deletions

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index 53dadc3dc7..b6c694c8a9 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
@@ -19,7 +19,7 @@
 

 package org.apache.tuscany.sca.itest.conversational;

 

-import org.osoa.sca.annotations.Conversational;

+import org.oasisopen.sca.annotation.Conversational;

 

 @Conversational

 public interface ConversationIdService {

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index cb7a032e85..b6645aec23 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
@@ -18,9 +18,9 @@
  */

 package org.apache.tuscany.sca.itest.conversational;

 

-import org.osoa.sca.annotations.Conversational;

-import org.osoa.sca.annotations.EndsConversation;

-import org.osoa.sca.annotations.Remotable;

+import org.oasisopen.sca.annotation.Conversational;

+import org.oasisopen.sca.annotation.EndsConversation;

+import org.oasisopen.sca.annotation.Remotable;

 

 

 /**

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index 2532346349..772602568c 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
@@ -18,7 +18,7 @@
  */

 package org.apache.tuscany.sca.itest.conversational;

 

-import org.osoa.sca.annotations.Remotable;

+import org.oasisopen.sca.annotation.Remotable;

 

 /**

  * The client for the conversational itest. Is implemented by clients

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 8f008fa711..481ed7b388 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
@@ -18,8 +18,8 @@
  */

 package org.apache.tuscany.sca.itest.conversational;

 

-import org.osoa.sca.CallableReference;

-import org.osoa.sca.annotations.Remotable;

+import org.oasisopen.sca.CallableReference;

+import org.oasisopen.sca.annotation.Remotable;

 

 /**

  * The client that calls into an existing conversation by accepting

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 1e36ce6917..c9d46b9072 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
@@ -18,10 +18,10 @@
  */

 package org.apache.tuscany.sca.itest.conversational;

 

-import org.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.Conversational;

-import org.osoa.sca.annotations.EndsConversation;

-import org.osoa.sca.annotations.Remotable;

+import org.oasisopen.sca.annotation.Callback;

+import org.oasisopen.sca.annotation.Conversational;

+import org.oasisopen.sca.annotation.EndsConversation;

+import org.oasisopen.sca.annotation.Remotable;

 

 

 /**

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index b4d3fe3d71..b46cb831df 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
@@ -18,10 +18,10 @@
  */

 package org.apache.tuscany.sca.itest.conversational;

 

-import org.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.Conversational;

-import org.osoa.sca.annotations.EndsConversation;

-import org.osoa.sca.annotations.Remotable;

+import org.oasisopen.sca.annotation.Callback;

+import org.oasisopen.sca.annotation.Conversational;

+import org.oasisopen.sca.annotation.EndsConversation;

+import org.oasisopen.sca.annotation.Remotable;

 

 

 /**

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index ed3a01c10b..4c3809676c 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
@@ -18,7 +18,7 @@
  */

 package org.apache.tuscany.sca.itest.conversational;

 

-import org.osoa.sca.annotations.Remotable;

+import org.oasisopen.sca.annotation.Remotable;

 

 

 /**

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 1603916cca..2d048a76b5 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
@@ -21,9 +21,9 @@ package org.apache.tuscany.sca.itest.conversational.impl;
 

 import org.apache.tuscany.sca.itest.conversational.BusinessException;

 import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.Service;

+import org.oasisopen.sca.annotation.ConversationAttributes;

+import org.oasisopen.sca.annotation.Scope;

+import org.oasisopen.sca.annotation.Service;

 

 @Service(ConversationalService.class)

 @Scope("CONVERSATION")

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index accc1eee27..34b8fbe9d0 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
@@ -20,9 +20,9 @@
 package org.apache.tuscany.sca.itest.conversational.impl;

 

 import org.apache.tuscany.sca.itest.conversational.ConversationIdService;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.Service;

+import org.oasisopen.sca.annotation.ConversationID;

+import org.oasisopen.sca.annotation.Scope;

+import org.oasisopen.sca.annotation.Service;

 

 @Service(ConversationIdService.class)

 @Scope("CONVERSATION")

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index 90f6de86ac..0d3ca8d350 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
@@ -21,9 +21,9 @@ package org.apache.tuscany.sca.itest.conversational.impl;
 

 import org.apache.tuscany.sca.itest.conversational.BusinessException;

 import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.Service;

+import org.oasisopen.sca.annotation.ConversationAttributes;

+import org.oasisopen.sca.annotation.Scope;

+import org.oasisopen.sca.annotation.Service;

 

 @Service(ConversationalService.class)

 @Scope("CONVERSATION")

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 3f7a90b3dc..db3bcabe02 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
@@ -23,15 +23,15 @@ import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
 import org.apache.tuscany.sca.itest.conversational.ConversationalClient;

 import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

 import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

-import org.osoa.sca.annotations.Context;

-import org.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.Service;

+import org.oasisopen.sca.ComponentContext;

+import org.oasisopen.sca.ServiceReference;

+import org.oasisopen.sca.annotation.Context;

+import org.oasisopen.sca.annotation.ConversationAttributes;

+import org.oasisopen.sca.annotation.Destroy;

+import org.oasisopen.sca.annotation.Init;

+import org.oasisopen.sca.annotation.Reference;

+import org.oasisopen.sca.annotation.Scope;

+import org.oasisopen.sca.annotation.Service;

 

 /**

  * The client for the conversational itest which presents a stateful

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index ab91498132..e25f367cf6 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
@@ -23,15 +23,15 @@ import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
 import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

 import org.apache.tuscany.sca.itest.conversational.ConversationalService;

 import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;

-import org.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

-import org.osoa.sca.annotations.Context;

-import org.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.Service;

+import org.oasisopen.sca.ComponentContext;

+import org.oasisopen.sca.ServiceReference;

+import org.oasisopen.sca.annotation.Context;

+import org.oasisopen.sca.annotation.ConversationAttributes;

+import org.oasisopen.sca.annotation.Destroy;

+import org.oasisopen.sca.annotation.Init;

+import org.oasisopen.sca.annotation.Reference;

+import org.oasisopen.sca.annotation.Scope;

+import org.oasisopen.sca.annotation.Service;

 

 /**

  * The client for the conversational itest which presents a stateful

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index e4f83656de..3ac259ed7c 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
@@ -23,13 +23,13 @@ import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
 import org.apache.tuscany.sca.itest.conversational.ConversationalClient;

 import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

 import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

-import org.osoa.sca.annotations.Context;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Service;

+import org.oasisopen.sca.ComponentContext;

+import org.oasisopen.sca.ServiceReference;

+import org.oasisopen.sca.annotation.Context;

+import org.oasisopen.sca.annotation.Destroy;

+import org.oasisopen.sca.annotation.Init;

+import org.oasisopen.sca.annotation.Reference;

+import org.oasisopen.sca.annotation.Service;

 

 /**

  * The client for the conversational itest which presents a stateful

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 8fe7c5b6ba..1abe9e51c3 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
@@ -20,8 +20,8 @@ package org.apache.tuscany.sca.itest.conversational.impl;
 

 import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;

 import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.CallableReference;

-import org.osoa.sca.annotations.Service;

+import org.oasisopen.sca.CallableReference;

+import org.oasisopen.sca.annotation.Service;

 

 /**

  * A client component that accepts a reference to an ongoing conversation

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index 9f4857f703..fc485b6c4b 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
@@ -23,12 +23,12 @@ import java.util.HashMap;
 import org.apache.tuscany.sca.itest.conversational.BusinessException;

 import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

 import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.Service;

+import org.oasisopen.sca.annotation.Callback;

+import org.oasisopen.sca.annotation.ConversationID;

+import org.oasisopen.sca.annotation.Destroy;

+import org.oasisopen.sca.annotation.Init;

+import org.oasisopen.sca.annotation.Scope;

+import org.oasisopen.sca.annotation.Service;

 

 

 /**

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index 4b06251414..a783e79cae 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
@@ -21,13 +21,13 @@ package org.apache.tuscany.sca.itest.conversational.impl;
 import org.apache.tuscany.sca.itest.conversational.BusinessException;

 import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

 import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.Service;

+import org.oasisopen.sca.annotation.Callback;

+import org.oasisopen.sca.annotation.ConversationAttributes;

+import org.oasisopen.sca.annotation.ConversationID;

+import org.oasisopen.sca.annotation.Destroy;

+import org.oasisopen.sca.annotation.Init;

+import org.oasisopen.sca.annotation.Scope;

+import org.oasisopen.sca.annotation.Service;

 

 

 /**

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index be039748fc..5f34de66b3 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
@@ -21,13 +21,13 @@ package org.apache.tuscany.sca.itest.conversational.impl;
 import org.apache.tuscany.sca.itest.conversational.BusinessException;

 import org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback;

 import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;

-import org.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.Service;

+import org.oasisopen.sca.annotation.Callback;

+import org.oasisopen.sca.annotation.ConversationAttributes;

+import org.oasisopen.sca.annotation.ConversationID;

+import org.oasisopen.sca.annotation.Destroy;

+import org.oasisopen.sca.annotation.Init;

+import org.oasisopen.sca.annotation.Scope;

+import org.oasisopen.sca.annotation.Service;

 

 

 /**

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index 42f2f1a603..02a2fb1d4d 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
@@ -23,11 +23,11 @@ import java.util.HashMap;
 import org.apache.tuscany.sca.itest.conversational.BusinessException;

 import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

 import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Service;

+import org.oasisopen.sca.annotation.Callback;

+import org.oasisopen.sca.annotation.ConversationID;

+import org.oasisopen.sca.annotation.Destroy;

+import org.oasisopen.sca.annotation.Init;

+import org.oasisopen.sca.annotation.Service;

 

 

 /**

diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index a852aeda56..4550e3eaa1 100644
--- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
@@ -24,8 +24,8 @@ import java.util.Map;
 

 import org.apache.tuscany.sca.itest.conversational.BusinessException;

 import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Service;

+import org.oasisopen.sca.annotation.ConversationID;

+import org.oasisopen.sca.annotation.Service;

 

 @Service(ConversationalService.class)

 public class ConversationalServiceStatelessScopeImpl implements ConversationalService {