You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by mc...@apache.org on 2009/01/28 15:09:11 UTC

svn commit: r738490 [8/22] - in /tuscany/java/sca: contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/ contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/ contrib...

Modified: tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java (original)
+++ tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java Wed Jan 28 14:07:54 2009
@@ -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.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

Modified: tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java (original)
+++ tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java Wed Jan 28 14:07:54 2009
@@ -23,15 +23,15 @@
 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

Modified: tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java (original)
+++ tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java Wed Jan 28 14:07:54 2009
@@ -23,13 +23,13 @@
 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

Modified: tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java (original)
+++ tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java Wed Jan 28 14:07:54 2009
@@ -20,8 +20,8 @@
 
 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

Modified: tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java (original)
+++ tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java Wed Jan 28 14:07:54 2009
@@ -23,12 +23,12 @@
 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;
 
 
 /**

Modified: tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java (original)
+++ tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java Wed Jan 28 14:07:54 2009
@@ -21,13 +21,13 @@
 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;
 
 
 /**

Modified: tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java (original)
+++ tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java Wed Jan 28 14:07:54 2009
@@ -21,13 +21,13 @@
 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;
 
 
 /**

Modified: tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java (original)
+++ tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java Wed Jan 28 14:07:54 2009
@@ -23,11 +23,11 @@
 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;
 
 
 /**

Modified: tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java (original)
+++ tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java Wed Jan 28 14:07:54 2009
@@ -24,8 +24,8 @@
 
 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 {

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java Wed Jan 28 14:07:54 2009
@@ -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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java Wed Jan 28 14:07:54 2009
@@ -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$

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java Wed Jan 28 14:07:54 2009
@@ -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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java Wed Jan 28 14:07:54 2009
@@ -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$

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java Wed Jan 28 14:07:54 2009
@@ -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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java Wed Jan 28 14:07:54 2009
@@ -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 {

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java Wed Jan 28 14:07:54 2009
@@ -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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java Wed Jan 28 14:07:54 2009
@@ -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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java Wed Jan 28 14:07:54 2009
@@ -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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java Wed Jan 28 14:07:54 2009
@@ -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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java Wed Jan 28 14:07:54 2009
@@ -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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java Wed Jan 28 14:07:54 2009
@@ -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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java Wed Jan 28 14:07:54 2009
@@ -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$

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java Wed Jan 28 14:07:54 2009
@@ -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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -21,10 +21,10 @@
 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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java Wed Jan 28 14:07:54 2009
@@ -23,12 +23,12 @@
 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$

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -20,9 +20,9 @@
 
 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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java Wed Jan 28 14:07:54 2009
@@ -20,13 +20,13 @@
 
 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$

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -20,10 +20,10 @@
 
 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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java Wed Jan 28 14:07:54 2009
@@ -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")

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java Wed Jan 28 14:07:54 2009
@@ -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")

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java Wed Jan 28 14:07:54 2009
@@ -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")

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java Wed Jan 28 14:07:54 2009
@@ -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.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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java Wed Jan 28 14:07:54 2009
@@ -22,15 +22,15 @@
 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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java Wed Jan 28 14:07:54 2009
@@ -22,13 +22,13 @@
 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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java Wed Jan 28 14:07:54 2009
@@ -20,8 +20,8 @@
 
 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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java Wed Jan 28 14:07:54 2009
@@ -22,12 +22,12 @@
 
 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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java Wed Jan 28 14:07:54 2009
@@ -20,13 +20,13 @@
 
 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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java Wed Jan 28 14:07:54 2009
@@ -20,13 +20,13 @@
 
 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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java Wed Jan 28 14:07:54 2009
@@ -22,12 +22,12 @@
 
 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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java Wed Jan 28 14:07:54 2009
@@ -23,8 +23,8 @@
 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 {

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -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

Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java Wed Jan 28 14:07:54 2009
@@ -22,9 +22,9 @@
 
 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$

Modified: tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java (original)
+++ tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java Wed Jan 28 14:07:54 2009
@@ -27,7 +27,7 @@
 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 {
 

Modified: tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java (original)
+++ tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java Wed Jan 28 14:07:54 2009
@@ -19,7 +19,7 @@
 
 package org.apache.tuscany.sca.test.corba.types;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * @version $Rev$ $Date$

Modified: tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java (original)
+++ tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java Wed Jan 28 14:07:54 2009
@@ -19,7 +19,7 @@
 
 package org.apache.tuscany.sca.test.corba.types;
 
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 /**
  * @version $Rev$ $Date$

Modified: tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java (original)
+++ tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java Wed Jan 28 14:07:54 2009
@@ -20,7 +20,7 @@
 package org.apache.tuscany.sca.test.corba.types;
 
 import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * @version $Rev$ $Date$

Modified: tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java (original)
+++ tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java Wed Jan 28 14:07:54 2009
@@ -19,7 +19,7 @@
 
 package org.apache.tuscany.sca.test.corba.types;
 
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 /**
  * @version $Rev$ $Date$

Modified: tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java (original)
+++ tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java Wed Jan 28 14:07:54 2009
@@ -24,7 +24,7 @@
 import org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations;
 import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
 import org.apache.tuscany.sca.test.corba.generated.WrongColor;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 /**
  * @version $Rev$ $Date$

Modified: tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java (original)
+++ tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java Wed Jan 28 14:07:54 2009
@@ -21,7 +21,7 @@
 
 import org.apache.tuscany.sca.test.corba.generated.UnexpectedException;
 import org.apache.tuscany.sca.test.corba.generated.WrongColor;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 /**
  * @version $Rev$ $Date$

Modified: tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java (original)
+++ tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java Wed Jan 28 14:07:54 2009
@@ -19,7 +19,7 @@
 
 package org.apache.tuscany.sca.test.corba.types;
 
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 /**
  * @version $Rev$ $Date$

Modified: tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java (original)
+++ tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java Wed Jan 28 14:07:54 2009
@@ -19,7 +19,7 @@
 
 package org.apache.tuscany.sca.test.corba.types;
 
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 /**
  * @version $Rev$ $Date$

Modified: tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java (original)
+++ tuscany/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java Wed Jan 28 14:07:54 2009
@@ -19,7 +19,7 @@
 
 package org.apache.tuscany.sca.test.corba.types;
 
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 /**
  * @version $Rev$ $Date$

Modified: tuscany/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm (original)
+++ tuscany/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm Wed Jan 28 14:07:54 2009
@@ -22,8 +22,8 @@
 import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.ServiceReference;
 
 import ${template.getJavaPackage()}.GreeterService;
 

Modified: tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm (original)
+++ tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm Wed Jan 28 14:07:54 2009
@@ -26,7 +26,7 @@
 #end
 #end
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * The automatically generated interface to the service that reflects data objects

Modified: tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm (original)
+++ tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm Wed Jan 28 14:07:54 2009
@@ -26,7 +26,7 @@
 #end
 #end
 
-import org.osoa.sca.annotations.AllowsPassByReference;
+import org.oasisopen.sca.annotation.AllowsPassByReference;
 
 /**
  * GreeterServiceClient

Modified: tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm (original)
+++ tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm Wed Jan 28 14:07:54 2009
@@ -19,8 +19,8 @@
 
 package $template.getJavaPackage();
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 #foreach($file in $fileList)
 #set($typeList = $file.getType_())

Modified: tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm (original)
+++ tuscany/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm Wed Jan 28 14:07:54 2009
@@ -26,7 +26,7 @@
 #end
 #end
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * The automatically generated service implementation that reflects data objects

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.itest.databindings.jaxb;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * The interface for AClientService.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java Wed Jan 28 14:07:54 2009
@@ -20,7 +20,7 @@
 
 import javax.jws.soap.SOAPBinding;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * The interface for AService.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.itest.databindings.jaxb;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * The interface for GenericsService.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.itest.databindings.jaxb;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * The interface for HelloServiceSimple.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.itest.databindings.jaxb;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * The interface for PrimitivesService.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.itest.databindings.jaxb;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 
 

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -20,8 +20,8 @@
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.AClientService;
 import org.apache.tuscany.sca.itest.databindings.jaxb.AService;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * This class implements AService.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -19,7 +19,7 @@
 package org.apache.tuscany.sca.itest.databindings.jaxb.impl;
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.AService;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * This class implements AService.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java Wed Jan 28 14:07:54 2009
@@ -24,8 +24,8 @@
 import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3;
 import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService;
 import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsServiceClient;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * An implementation of GenericsLocalServiceClient.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java Wed Jan 28 14:07:54 2009
@@ -21,8 +21,8 @@
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService;
 import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsServiceClient;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * An implementation of GenericsServiceClient.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -24,7 +24,7 @@
 import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3;
 import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService;
 import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * An implementation of GenericsService.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java Wed Jan 28 14:07:54 2009
@@ -26,8 +26,8 @@
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple;
 import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimpleClient;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * An implementation of HelloServiceSimpleClient.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java Wed Jan 28 14:07:54 2009
@@ -21,8 +21,8 @@
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple;
 import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimpleClient;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * An implementation of HelloServiceSimpleClient.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java Wed Jan 28 14:07:54 2009
@@ -26,7 +26,7 @@
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple;
 import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * An implementation of HelloServiceSimple.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java Wed Jan 28 14:07:54 2009
@@ -21,8 +21,8 @@
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService;
 import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * An implementation of PrimitivesLocalServiceClient.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java Wed Jan 28 14:07:54 2009
@@ -21,8 +21,8 @@
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService;
 import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * An implementation of PrimitivesServiceClient.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -21,7 +21,7 @@
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService;
 import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * An implementation of PrimitivesService.

Modified: tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java (original)
+++ tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java Wed Jan 28 14:07:54 2009
@@ -35,8 +35,8 @@
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService;
 import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * An implementation of StandardTypesLocalServiceClient.