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

34 files changed, 123 insertions, 123 deletions

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
index e7583c339a..27939e3996 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
@@ -18,7 +18,7 @@
  */

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

 

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

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

 

 /**

  * Simple conversational Service that uses another Conversational Service

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
index bc4a5fc571..7887417e55 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.itest.conversational;
 
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
index eeb7aa98e2..735bcee176 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
@@ -18,7 +18,7 @@
  */

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

 

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

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

 

 /**

  * Simple conversational Service

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
index e422938b27..1c5d2cdbb8 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.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;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
index e8887071c3..cebbea0701 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.itest.conversational;
 
-import org.osoa.sca.annotations.Conversational;
+import org.oasisopen.sca.annotation.Conversational;
 
 /**
  * Simple conversational Service that uses another Conversational Service
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index f0f5ac041d..9ca4abb9d3 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/java/sca/itest/conversations/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/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index fff6320e76..734fb9fe7b 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/java/sca/itest/conversations/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;

 

 /**

  * The callback interface used when testing conversational callbacks

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index d9d989c830..99f4c85d8f 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/java/sca/itest/conversations/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/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 3de73e4f42..fb4ecb56e7 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/java/sca/itest/conversations/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/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 2aba0799bc..21a4db737e 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/java/sca/itest/conversations/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;

 

 /**

  * The service interface used when testing conversations

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index 9fb4a0b473..48c1644b87 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/java/sca/itest/conversations/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;

 

 /**

  * The service interface used when testing conversations

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
index e7295a6aee..2c205c2cae 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.itest.conversational;
 
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
+import org.oasisopen.sca.annotation.Conversational;
+import org.oasisopen.sca.annotation.EndsConversation;
 
 /**
  * Simple conversational Service
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
index 5f97b16088..48c203ab35 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
@@ -19,9 +19,9 @@
 package org.apache.tuscany.sca.itest.conversational;
 
 import org.apache.tuscany.sca.itest.Record;
-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;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index d356b7d20a..614c0a96b5 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/java/sca/itest/conversations/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;

 

 /**

  * The callback interface used when testing conversational callbacks

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
index 3b71679675..86a96aaa75 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.itest.conversational.impl;
 import org.apache.tuscany.sca.itest.conversational.AService;

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

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

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

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

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

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

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

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

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

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

 

 /**

  * Simple conversational Service that uses another Conversational Service

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
index 1a3cc562d6..b56186ea88 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
@@ -23,12 +23,12 @@ import org.apache.tuscany.sca.itest.TestResult;
 import org.apache.tuscany.sca.itest.conversational.Alpha;
 import org.apache.tuscany.sca.itest.conversational.Beta;
 import org.apache.tuscany.sca.itest.conversational.Gamma;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
index fd3734a953..f394770ffc 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
@@ -20,9 +20,9 @@ package org.apache.tuscany.sca.itest.conversational.impl;
 

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

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

-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;

 

 /**

  * Simple conversational Service

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
index e2bca68220..b94e8a6452 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
@@ -20,13 +20,13 @@ package org.apache.tuscany.sca.itest.conversational.impl;
 
 import org.apache.tuscany.sca.itest.conversational.Beta;
 import org.apache.tuscany.sca.itest.conversational.Gamma;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
index d13ff53350..737c2940dd 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
@@ -20,10 +20,10 @@ package org.apache.tuscany.sca.itest.conversational.impl;
 
 import org.apache.tuscany.sca.itest.conversational.CService;
 import org.apache.tuscany.sca.itest.conversational.DService;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * Simple conversational Service that uses another Conversational Service
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 8dccf41820..8f2736ad2d 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
@@ -20,9 +20,9 @@
 package org.apache.tuscany.sca.itest.conversational.impl;
 
 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/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index efbae3ad16..8b3a8663d8 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/java/sca/itest/conversations/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/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index 0604d0ca98..ae8bee8040 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
@@ -20,9 +20,9 @@
 package org.apache.tuscany.sca.itest.conversational.impl;
 
 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/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 08d618018d..3784dfd53e 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
@@ -22,15 +22,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/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index 7dbf7bcd3e..137dfc4108 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
@@ -22,15 +22,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/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index ddfed4519f..c9c5138515 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
@@ -22,13 +22,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/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 14487dcf69..134ffda75d 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/java/sca/itest/conversations/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/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index ee24fca53d..73a6d7d27e 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
@@ -22,12 +22,12 @@ import java.util.HashMap;
 

 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;

 

 /**

  * The service used when testing stateful conversations

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index cf95cc83f3..5bafa5e075 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
@@ -20,13 +20,13 @@ package org.apache.tuscany.sca.itest.conversational.impl;
 

 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;

 

 /**

  * The service used when testing stateful conversations

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index ebb474e3fe..8d63ebbbef 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
@@ -20,13 +20,13 @@ package org.apache.tuscany.sca.itest.conversational.impl;
 

 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;

 

 /**

  * The service used when testing stateful conversations

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index cc02d048b6..ecf108c656 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
@@ -22,12 +22,12 @@ import java.util.HashMap;
 

 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;

 

 /**

  * The service used when testing stateful conversations

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index 3abeda9ba3..ee09e99f1b 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
@@ -23,8 +23,8 @@ import java.util.HashMap;
 import java.util.Map;

 

 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 {

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
index 610a81aaa8..ad0c1fb7da 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
@@ -19,9 +19,9 @@
 package org.apache.tuscany.sca.itest.conversational.impl;
 
 import org.apache.tuscany.sca.itest.conversational.DService;
-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;
 
 /**
  * Simple conversational Service
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
index 67305698f1..55390189cf 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
@@ -22,9 +22,9 @@ import java.util.ArrayList;
 
 import org.apache.tuscany.sca.itest.Record;
 import org.apache.tuscany.sca.itest.conversational.Gamma;
-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;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
index 58afba0d10..a686754d3a 100644
--- a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
+++ b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
@@ -27,7 +27,7 @@ import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.osoa.sca.ConversationEndedException;
+import org.oasisopen.sca.ConversationEndedException;
 
 public class ConversationalAgeTestCase {