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

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

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

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

26 files changed, 52 insertions, 52 deletions

diff --git a/java/sca/contrib/modules/core/META-INF/MANIFEST.MF b/java/sca/contrib/modules/core/META-INF/MANIFEST.MF
index 2cdef013e6..40e4bf6afb 100644
--- a/java/sca/contrib/modules/core/META-INF/MANIFEST.MF
+++ b/java/sca/contrib/modules/core/META-INF/MANIFEST.MF
@@ -5,12 +5,12 @@ Export-Package: org.apache.tuscany.sca.core.assembly;uses:="org.apache
  .sca.assembly.impl,org.apache.tuscany.sca.core,org.apache.tuscany.sca

  .core.conversation,javax.xml.namespace,javax.xml.stream,org.apache.tu

  scany.sca.endpointresolver,org.apache.tuscany.sca.contribution.resolv

- er,org.apache.tuscany.sca.core.invocation,org.osoa.sca,org.apache.tus

+ er,org.apache.tuscany.sca.core.invocation,org.oasisopen.sca,org.apache.tus

  cany.sca.core.scope,org.apache.tuscany.sca.assembly,org.apache.tuscan

  y.sca.monitor,org.apache.tuscany.sca.interfacedef.java,org.apache.tus

  cany.sca.interfacedef,org.apache.tuscany.sca.invocation,org.apache.tu

  scany.sca.work,org.apache.tuscany.sca.contribution.processor";version

- ="2.0",org.apache.tuscany.sca.core.work;uses:="javax.naming,org.osoa.

+ ="2.0",org.apache.tuscany.sca.core.work;uses:="javax.naming,org.oasisopen.

  sca.annotations,commonj.work,org.apache.tuscany.sca.work";version="1.

  4",org.apache.tuscany.sca.core.context;uses:="org.apache.tuscany.sca.

  runtime,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.contex

@@ -19,7 +19,7 @@ Export-Package: org.apache.tuscany.sca.core.assembly;uses:="org.apache
  .apache.tuscany.sca.interfacedef,javax.xml.namespace,org.apache.tusca

  ny.sca.invocation,javax.xml.stream,org.apache.tuscany.sca.core.assemb

  ly,org.apache.tuscany.sca.core.factory,org.apache.tuscany.sca.contrib

- ution.processor,org.osoa.sca,org.apache.tuscany.sca.core.invocation,o

+ ution.processor,org.oasisopen.sca,org.apache.tuscany.sca.core.invocation,o

  rg.apache.tuscany.sca.core.scope,org.apache.tuscany.sca.assembly.buil

  der";version="2.0",org.apache.tuscany.sca.core.factory;version="2.0",

  org.apache.tuscany.sca.core.invocation;uses:="org.apache.tuscany.sca.

@@ -30,9 +30,9 @@ Export-Package: org.apache.tuscany.sca.core.assembly;uses:="org.apache
  a,org.apache.tuscany.sca.extensibility,org.apache.tuscany.sca.interfa

  cedef,org.apache.tuscany.sca.invocation,org.apache.tuscany.sca.core.a

  ssembly,org.apache.tuscany.sca.work,org.apache.tuscany.sca.core.facto

- ry,org.osoa.sca,org.apache.tuscany.sca.core.scope";version="2.0",org.

+ ry,org.oasisopen.sca,org.apache.tuscany.sca.core.scope";version="2.0",org.

  apache.tuscany.sca.core.conversation;uses:="org.apache.tuscany.sca.ru

- ntime,org.apache.tuscany.sca.provider,org.osoa.sca,org.apache.tuscany

+ ntime,org.apache.tuscany.sca.provider,org.oasisopen.sca,org.apache.tuscany

  .sca.core.scope";version="2.0",org.apache.tuscany.sca.core.scope;uses

  :="org.apache.tuscany.sca.invocation,org.apache.tuscany.sca.runtime,o

  rg.apache.tuscany.sca.provider,org.apache.tuscany.sca.core.context,or

@@ -82,8 +82,8 @@ Import-Package: commonj.work,
  org.apache.tuscany.sca.runtime;version="2.0",

  org.apache.tuscany.sca.work;version="2.0",

  

- org.osoa.sca;version="2.0",

- org.osoa.sca.annotations;version="2.0"

+ org.oasisopen.sca;version="2.0",

+ org.oasisopen.sca.annotation;version="2.0"

 Bundle-SymbolicName: org.apache.tuscany.sca.core

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
index 4f463b105d..8fc3b629bf 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
@@ -35,7 +35,7 @@ import org.apache.tuscany.sca.runtime.EndpointReference;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
 import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.ServiceUnavailableException;
+import org.oasisopen.sca.ServiceUnavailableException;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
index af5230a163..1f2ffa2ae6 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
@@ -33,7 +33,7 @@ import org.apache.tuscany.sca.provider.PolicyProvider;
 import org.apache.tuscany.sca.provider.ServiceBindingProvider;
 import org.apache.tuscany.sca.runtime.RuntimeComponentService;
 import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.ServiceRuntimeException;
+import org.oasisopen.sca.ServiceRuntimeException;
 
 /**
  * Implementation of a Component Service.
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
index b6f949f081..133037a5c1 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
@@ -57,7 +57,7 @@ import org.apache.tuscany.sca.runtime.RuntimeComponentService;
 import org.apache.tuscany.sca.runtime.RuntimeWire;
 import org.apache.tuscany.sca.runtime.RuntimeWireProcessor;
 import org.apache.tuscany.sca.work.WorkScheduler;
-import org.osoa.sca.ServiceRuntimeException;
+import org.oasisopen.sca.ServiceRuntimeException;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
index fc6d7abf6a..bcc8b91569 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
@@ -55,9 +55,9 @@ import org.apache.tuscany.sca.runtime.ReferenceParameters;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
 import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.Conversation;
-import org.osoa.sca.ServiceRuntimeException;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.Conversation;
+import org.oasisopen.sca.ServiceRuntimeException;
 
 /**
  * Base class for implementations of service and callback references.
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
index 78b0887482..30808bff0f 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
@@ -57,7 +57,7 @@ import org.apache.tuscany.sca.runtime.EndpointReference;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
 import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.osoa.sca.ServiceRuntimeException;
+import org.oasisopen.sca.ServiceRuntimeException;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
index 2bcf13f679..a939d6d5da 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
@@ -48,10 +48,10 @@ import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentContext;
 import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
 import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.ServiceRuntimeException;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.RequestContext;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.ServiceRuntimeException;
 
 /**
  * Implementation of ComponentContext that delegates to a ComponentContextProvider.
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index c5b68389b2..1d1539c9ed 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
@@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.invocation.ProxyFactory;
 import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.osoa.sca.ComponentContext;
+import org.oasisopen.sca.ComponentContext;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
index ed6c3df8fa..3459aba2ff 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
@@ -33,8 +33,8 @@ import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
 import org.apache.tuscany.sca.runtime.RuntimeComponentService;
 import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.RequestContext;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.RequestContext;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
index 1d178421cf..1ee09598f5 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
@@ -29,8 +29,8 @@ import org.apache.tuscany.sca.runtime.ReferenceParameters;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
 import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ServiceReference;
 
 /**
  * Default implementation of a ServiceReference.
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
index 03c18c26b8..77064bd8e8 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
@@ -20,10 +20,10 @@
 package org.apache.tuscany.sca.core.conversation;
 
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.osoa.sca.Conversation;
+import org.oasisopen.sca.Conversation;
 
 /**
- * An extended interface over org.osoa.Conversation
+ * An extended interface over org.oasisopen.Conversation
  * 
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index 588c43b8b1..8a54b7568f 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
@@ -23,7 +23,7 @@ import org.apache.tuscany.sca.core.factory.ObjectCreationException;
 import org.apache.tuscany.sca.core.factory.ObjectFactory;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.osoa.sca.CallableReference;
+import org.oasisopen.sca.CallableReference;
 
 /**
  * Uses a wire to return a CallableReference
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index d19aa237cd..1ee922144f 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
@@ -22,7 +22,7 @@ import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.osoa.sca.NoRegisteredCallbackException;
+import org.oasisopen.sca.NoRegisteredCallbackException;
 
 /**
  * An interceptor applied to the forward direction of a wire that ensures the callback target implements the required
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index b5b40811ad..c07fd443e5 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
@@ -23,7 +23,7 @@ import java.util.List;
 import org.apache.tuscany.sca.core.factory.ObjectCreationException;

 import org.apache.tuscany.sca.core.factory.ObjectFactory;

 import org.apache.tuscany.sca.runtime.RuntimeWire;

-import org.osoa.sca.CallableReference;

+import org.oasisopen.sca.CallableReference;

 

 /**

  * Uses a wire to return a CallableReference

diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index 0fa1d27d2a..0afc9122de 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
@@ -34,8 +34,8 @@ import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
 import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
 import org.apache.tuscany.sca.invocation.MessageFactory;
 import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ServiceReference;
 
 /**
  * The implementation of a wire service that uses cglib dynamic proxies
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
index fcb48259b9..e20cfff007 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
@@ -22,12 +22,12 @@ package org.apache.tuscany.sca.core.invocation;
 import java.util.List;
 
 import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
+import org.oasisopen.sca.CallableReference;
 
 /**
  * An extensible proxy factory.
  *
- * @version $Rev: $ $Date: $
+ * @version $Rev$ $Date$
  */
 public class ExtensibleProxyFactory implements ProxyFactory {
     
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
index cade0499d3..cf4de5874f 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
@@ -27,8 +27,8 @@ import org.apache.tuscany.sca.core.conversation.ConversationState;
 import org.apache.tuscany.sca.invocation.InvocationChain;
 import org.apache.tuscany.sca.invocation.MessageFactory;
 import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.NoRegisteredCallbackException;
-import org.osoa.sca.ServiceRuntimeException;
+import org.oasisopen.sca.NoRegisteredCallbackException;
+import org.oasisopen.sca.ServiceRuntimeException;
 
 /**
  * Responsible for dispatching to a callback through a wire. <p/> TODO cache
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
index a23b9af9ad..c9d38cb2b7 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
@@ -53,10 +53,10 @@ import org.apache.tuscany.sca.runtime.EndpointReference;
 import org.apache.tuscany.sca.runtime.ReferenceParameters;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ConversationEndedException;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.ServiceRuntimeException;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ConversationEndedException;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.ServiceRuntimeException;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
index a2cbd1365b..e21d7cba0c 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
@@ -30,8 +30,8 @@ import org.apache.tuscany.sca.core.context.ServiceReferenceImpl;
 import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
 import org.apache.tuscany.sca.invocation.MessageFactory;
 import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ServiceReference;
 
 /**
  * the default implementation of a wire service that uses JDK dynamic proxies
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index 582d1ee141..92d6d25d46 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
@@ -31,7 +31,7 @@ import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.runtime.EndpointReference;
 import org.apache.tuscany.sca.runtime.RuntimeWire;
 import org.apache.tuscany.sca.work.WorkScheduler;
-import org.osoa.sca.ServiceRuntimeException;
+import org.oasisopen.sca.ServiceRuntimeException;
 
 /**
  * Adds non-blocking behavior to an invocation chain
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
index a3c8429c7b..8ee425fe9f 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
@@ -51,7 +51,7 @@ import java.util.logging.Logger;
 import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
 import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
 import org.apache.tuscany.sca.invocation.Phase;
-import org.osoa.sca.ServiceRuntimeException;
+import org.oasisopen.sca.ServiceRuntimeException;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index cb836e42c1..af9d44e473 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.core.invocation;
 import java.util.List;
 
 import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
+import org.oasisopen.sca.CallableReference;
 
 /**
  * Creates proxies that implement Java interfaces and invocation handlers for fronting wires
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
index 925a7c10a5..d3a6b20fb8 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
@@ -41,8 +41,8 @@ import org.apache.tuscany.sca.runtime.EndpointReference;
 import org.apache.tuscany.sca.runtime.ReferenceParameters;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.ConversationEndedException;
-import org.osoa.sca.ServiceRuntimeException;
+import org.oasisopen.sca.ConversationEndedException;
+import org.oasisopen.sca.ServiceRuntimeException;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
index 5b838116c5..62fbbe4616 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
@@ -32,11 +32,11 @@ import org.apache.tuscany.sca.store.Store;
 import org.apache.tuscany.sca.store.StoreExpirationEvent;
 import org.apache.tuscany.sca.store.StoreMonitor;
 import org.apache.tuscany.sca.store.StoreWriteException;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.EagerInit;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * Implements a non-durable, non-transactional store using a simple in-memory map
diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
index fb47a65edf..bfc34479ae 100644
--- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
+++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
@@ -27,7 +27,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ThreadFactory;
 
-import org.osoa.sca.annotations.Destroy;
+import org.oasisopen.sca.annotation.Destroy;
 
 import commonj.work.Work;
 import commonj.work.WorkEvent;
diff --git a/java/sca/contrib/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java b/java/sca/contrib/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
index 1aba9656d8..f960c8ebb1 100644
--- a/java/sca/contrib/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
+++ b/java/sca/contrib/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
@@ -26,7 +26,7 @@ import org.apache.tuscany.sca.core.invocation.MessageFactoryImpl;
 import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.Message;
 import org.easymock.EasyMock;
-import org.osoa.sca.NoRegisteredCallbackException;
+import org.oasisopen.sca.NoRegisteredCallbackException;
 
 /**
  * @version $Rev$ $Date$