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 [7/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/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java (original)
+++ tuscany/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java Wed Jan 28 14:07:54 2009
@@ -18,9 +18,9 @@
  */
 package org.apache.tuscany.sca.itest.callablerefwsreturn;
 
-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;
 
 @Remotable
 @Conversational

Modified: tuscany/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java (original)
+++ tuscany/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java Wed Jan 28 14:07:54 2009
@@ -18,9 +18,9 @@
  */
 package org.apache.tuscany.sca.itest.callablerefwsreturn;
 
-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(Gamma.class)
 @Scope("CONVERSATION")

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

Modified: tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java (original)
+++ tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java Wed Jan 28 14:07:54 2009
@@ -22,12 +22,12 @@
 import java.io.ObjectOutputStream;
 
 import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary;
-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.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.Service;
 
 @Service(AComponent.class)
 public class AComponentImpl implements AComponent {

Modified: tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java (original)
+++ tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java Wed Jan 28 14:07:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.itest.callableref;
 
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 public interface BComponent {

Modified: tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java (original)
+++ tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java Wed Jan 28 14:07:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.itest.callableref;
 
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(BComponent.class)
 public class BComponentImpl implements BComponent {

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

Modified: tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java (original)
+++ tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.itest.callableref;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(CComponent.class)
 public class CComponentImpl implements CComponent {

Modified: tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java (original)
+++ tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java Wed Jan 28 14:07:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.itest.callableref;
 
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 public interface DComponent {

Modified: tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java (original)
+++ tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java Wed Jan 28 14:07:54 2009
@@ -24,10 +24,10 @@
 import java.io.ObjectOutputStream;
 
 import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.RequestContext;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(DComponent.class)
 public class DComponentImpl implements DComponent {

Modified: tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java (original)
+++ tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java Wed Jan 28 14:07:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.itest.callablerefconversational;
 
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Conversational;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Conversational;
 
 /**
  * Simple conversational Service that is used to testing the method

Modified: tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java (original)
+++ tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -18,12 +18,12 @@
  */
 package org.apache.tuscany.sca.itest.callablerefconversational;
 
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationID;
-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.ConversationID;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * Simple conversational Service that is used to testing the method

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

Modified: tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java (original)
+++ tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java Wed Jan 28 14:07:54 2009
@@ -18,12 +18,12 @@
  */
 package org.apache.tuscany.sca.itest.callablerefreturn;
 
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.Conversation;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.Conversation;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
 
 @Scope("COMPOSITE")
 public class AlphaImpl implements Alpha {

Modified: tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java (original)
+++ tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java Wed Jan 28 14:07:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.itest.callablerefreturn;
 
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 public interface Beta

Modified: tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java (original)
+++ tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java Wed Jan 28 14:07:54 2009
@@ -18,12 +18,12 @@
  */
 package org.apache.tuscany.sca.itest.callablerefreturn;
 
-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.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;
 
 @Scope("COMPOSITE")
 public class BetaImpl implements Beta

Modified: tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java (original)
+++ tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java Wed Jan 28 14:07:54 2009
@@ -18,9 +18,9 @@
  */
 package org.apache.tuscany.sca.itest.callablerefreturn;
 
-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;
 
 @Remotable
 @Conversational

Modified: tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java (original)
+++ tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java Wed Jan 28 14:07:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.itest.callablerefreturn;
 
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.ConversationID;
+import org.oasisopen.sca.annotation.Scope;
 
 @Scope("CONVERSATION")
 public class GammaImpl implements Gamma

Modified: tuscany/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java (original)
+++ tuscany/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java Wed Jan 28 14:07:54 2009
@@ -25,7 +25,7 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.osoa.sca.ServiceReference;
+import org.oasisopen.sca.ServiceReference;
 
 /**
  * Simple test case that creates a ServiceReference to a Conversational Component

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

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

Modified: tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java Wed Jan 28 14:07:54 2009
@@ -19,8 +19,8 @@
 package org.apache.tuscany.sca.test;
 
 import org.junit.Assert;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(CallBackApiClient.class)
 public class CallBackApiClientImpl implements CallBackApiClient, CallBackApiCallBack {

Modified: tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java (original)
+++ tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java Wed Jan 28 14:07:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.test;
 
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 @Callback(CallBackApiCallBack.class)

Modified: tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -18,12 +18,12 @@
  */
 package org.apache.tuscany.sca.test;
 
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.RequestContext;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(CallBackApiService.class)
 public class CallBackApiServiceImpl implements CallBackApiService {

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

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

Modified: tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java Wed Jan 28 14:07:54 2009
@@ -19,8 +19,8 @@
 package org.apache.tuscany.sca.test;
 
 import org.junit.Assert;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(CallBackBasicClient.class)
 public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBasicCallBack {

Modified: tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java (original)
+++ tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java Wed Jan 28 14:07:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.test;
 
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 @Callback(CallBackBasicCallBack.class)

Modified: tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.test;
 
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(CallBackBasicService.class)
 public class CallBackBasicServiceImpl implements CallBackBasicService {

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

Modified: tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java (original)
+++ tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.test;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 public interface CallBackCTypeClient {

Modified: tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java Wed Jan 28 14:07:54 2009
@@ -19,8 +19,8 @@
 package org.apache.tuscany.sca.test;
 
 import org.junit.Assert;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(CallBackCTypeClient.class)
 public class CallBackCTypeClientImpl implements CallBackCTypeClient, CallBackCTypeCallBack {

Modified: tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java (original)
+++ tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.test;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 // @Callback(CallBackCTypeCallBack.class)

Modified: tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.test;
 
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(CallBackCTypeService.class)
 public class CallBackCTypeServiceImpl implements CallBackCTypeService {

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

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

Modified: tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java Wed Jan 28 14:07:54 2009
@@ -19,12 +19,12 @@
 package org.apache.tuscany.sca.test;
 
 import org.junit.Assert;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.RequestContext;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(CallBackIdClient.class)
 public class CallBackIdClientImpl implements CallBackIdClient, CallBackIdCallBack {

Modified: tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java (original)
+++ tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java Wed Jan 28 14:07:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.test;
 
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 @Callback(CallBackIdCallBack.class)

Modified: tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -18,11 +18,11 @@
  */
 package org.apache.tuscany.sca.test;
 
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.RequestContext;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(CallBackIdService.class)
 public class CallBackIdServiceImpl implements CallBackIdService {

Modified: tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java (original)
+++ tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java Wed Jan 28 14:07:54 2009
@@ -18,9 +18,9 @@
  */
 package org.apache.tuscany.sca.test.callback;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * Demonstrates a component-to-component callback invocation

Modified: tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java (original)
+++ tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java Wed Jan 28 14:07:54 2009
@@ -18,9 +18,9 @@
  */
 package org.apache.tuscany.sca.test.callback;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * Demonstrates a component-to-component callback invocation

Modified: tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java (original)
+++ tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java Wed Jan 28 14:07:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.test.callback;
 
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.OneWay;
 
 /**
  * This service that will be invoked in a non-blocking fashion

Modified: tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -18,10 +18,10 @@
  */
 package org.apache.tuscany.sca.test.callback;
 
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.RequestContext;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * This class implements MyService and uses a callback.

Modified: tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java (original)
+++ tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java Wed Jan 28 14:07:54 2009
@@ -19,7 +19,7 @@
 
 package org.apache.tuscany.sca.itest;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the client interface for the call backs in a separate thread tests 

Modified: tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java Wed Jan 28 14:07:54 2009
@@ -22,8 +22,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Assert;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * This is the client implementation for the call backs in a separate thread tests 

Modified: tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java (original)
+++ tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java Wed Jan 28 14:07:54 2009
@@ -19,7 +19,7 @@
 
 package org.apache.tuscany.sca.itest;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * The call back interface for the EventProcessorService that is implemented

Modified: tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java (original)
+++ tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java Wed Jan 28 14:07:54 2009
@@ -19,9 +19,9 @@
 
 package org.apache.tuscany.sca.itest;
 
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Conversational;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * Sample Event Processor Service 

Modified: tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -25,11 +25,11 @@
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * Sample Event Processor Service Implementation 

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

Modified: tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java (original)
+++ tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java Wed Jan 28 14:07:54 2009
@@ -20,7 +20,7 @@
 
 import java.io.File;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(CallBackSetCallbackCallback.class)
 public class CallBackSetCallbackCallbackImpl implements CallBackSetCallbackCallback {

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

Modified: tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java Wed Jan 28 14:07:54 2009
@@ -21,10 +21,10 @@
 import java.io.File;
 
 import org.junit.Assert;
-import org.osoa.sca.NoRegisteredCallbackException;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.NoRegisteredCallbackException;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(CallBackSetCallbackClient.class)
 public class CallBackSetCallbackClientImpl implements CallBackSetCallbackClient {

Modified: tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -18,12 +18,12 @@
  */
 package org.apache.tuscany.sca.test;
 
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.RequestContext;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(CallBackSetCalbackService.class)
 public class CallBackSetCallbackServiceImpl implements CallBackSetCalbackService {

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

Modified: tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java (original)
+++ tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.tuscany.sca.test;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 public interface CallBackSetCallbackConvClient {

Modified: tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java Wed Jan 28 14:07:54 2009
@@ -19,12 +19,12 @@
 package org.apache.tuscany.sca.test;
 
 import org.junit.Assert;
-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.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;
 
 @Service(CallBackSetCallbackConvClient.class)
 @Scope("CONVERSATION")

Modified: tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java (original)
+++ tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java Wed Jan 28 14:07:54 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.test;
 
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Conversational;
 
 // @Remotable
 @Conversational

Modified: tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java Wed Jan 28 14:07:54 2009
@@ -20,13 +20,13 @@
 
 import java.io.File;
 
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.RequestContext;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(CallBackSetCallbackConvService.class)
 @Scope("CONVERSATION")

Modified: tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java (original)
+++ tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package supplychain.customer;
 
-import org.osoa.sca.annotations.OneWay;
+import org.oasisopen.sca.annotation.OneWay;
 
 /**
  * This is the business interface of the Customer service component.

Modified: tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java (original)
+++ tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java Wed Jan 28 14:07:54 2009
@@ -18,9 +18,9 @@
  */
 package supplychain.customer;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 import supplychain.retailer.Retailer;
 

Modified: tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java (original)
+++ tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java Wed Jan 28 14:07:54 2009
@@ -18,9 +18,9 @@
  */
 package supplychain.illegal;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 import supplychain.customer.Customer;
 import supplychain.retailer.JavaRetailerComponentImpl;

Modified: tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java (original)
+++ tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java Wed Jan 28 14:07:54 2009
@@ -19,9 +19,9 @@
 package supplychain.retailer;
 
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 import supplychain.warehouse.Warehouse;
 

Modified: tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java (original)
+++ tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java Wed Jan 28 14:07:54 2009
@@ -19,9 +19,9 @@
 package supplychain.shipper;
 
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 import supplychain.customer.Customer;
 

Modified: tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java (original)
+++ tuscany/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package supplychain.warehouse;
 
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.Scope;
 
 import supplychain.shipper.Shipper;
 

Modified: tuscany/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java (original)
+++ tuscany/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java Wed Jan 28 14:07:54 2009
@@ -36,7 +36,7 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.osoa.sca.ServiceReference;
+import org.oasisopen.sca.ServiceReference;
 
 /*
  * 

Modified: tuscany/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java (original)
+++ tuscany/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package hello;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the Hello service.

Modified: tuscany/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java (original)
+++ tuscany/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package hello;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * This class implements the HelloWorld service.

Modified: tuscany/java/sca/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.

Modified: tuscany/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java (original)
+++ tuscany/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java Wed Jan 28 14:07:54 2009
@@ -20,8 +20,8 @@
 
 import hello.Hello;
 
-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 the HelloWorld service.

Modified: tuscany/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.

Modified: tuscany/java/sca/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java (original)
+++ tuscany/java/sca/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package helloworld;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * This class implements the HelloWorld service.

Modified: tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java (original)
+++ tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package helloworld;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * This class implements the HelloWorld service.

Modified: tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package helloworld;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * This is the business interface of the HelloWorld greetings service.

Modified: tuscany/java/sca/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-multiple/src/test/java/hello/HelloImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-multiple/src/test/java/hello/HelloImpl.java (original)
+++ tuscany/java/sca/itest/contribution-multiple/src/test/java/hello/HelloImpl.java Wed Jan 28 14:07:54 2009
@@ -18,7 +18,7 @@
  */
 package hello;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * This class implements the HelloWorld service.

Modified: tuscany/java/sca/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java (original)
+++ tuscany/java/sca/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java Wed Jan 28 14:07:54 2009
@@ -20,8 +20,8 @@
 
 import hello.Hello;
 
-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 the HelloWorld service.

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

Modified: tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java (original)
+++ tuscany/java/sca/itest/conversations-ws/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-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java (original)
+++ tuscany/java/sca/itest/conversations-ws/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;
 
 
 /**

Modified: tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java (original)
+++ tuscany/java/sca/itest/conversations-ws/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-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java (original)
+++ tuscany/java/sca/itest/conversations-ws/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-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java (original)
+++ tuscany/java/sca/itest/conversations-ws/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;
 
 
 /**

Modified: tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java (original)
+++ tuscany/java/sca/itest/conversations-ws/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;
 
 
 /**

Modified: tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java?rev=738490&r1=738489&r2=738490&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java (original)
+++ tuscany/java/sca/itest/conversations-ws/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;
 
 
 /**

Modified: tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/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-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java (original)
+++ tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java Wed Jan 28 14:07:54 2009
@@ -21,9 +21,9 @@
 
 import org.apache.tuscany.sca.itest.conversational.BusinessException;
 import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.ConversationAttributes;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(ConversationalService.class)
 @Scope("CONVERSATION")

Modified: tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/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-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java (original)
+++ tuscany/java/sca/itest/conversations-ws/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-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations-ws/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-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java (original)
+++ tuscany/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java Wed Jan 28 14:07:54 2009
@@ -21,9 +21,9 @@
 
 import org.apache.tuscany.sca.itest.conversational.BusinessException;
 import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.ConversationAttributes;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 @Service(ConversationalService.class)
 @Scope("CONVERSATION")