63 files changed, 152 insertions, 152 deletions
diff --git a/java/sca/contrib/modules/implementation-java-runtime/META-INF/MANIFEST.MF b/java/sca/contrib/modules/implementation-java-runtime/META-INF/MANIFEST.MF
index 91794eae05..e199165d5c 100644
--- a/java/sca/contrib/modules/implementation-java-runtime/META-INF/MANIFEST.MF
+++ b/java/sca/contrib/modules/implementation-java-runtime/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Export-Package: org.apache.tuscany.sca.implementation.java.context;use
  rg.apache.tuscany.sca.implementation.java,org.apache.tuscany.sca.inte
  rfacedef,org.w3c.dom,javax.xml.namespace,org.apache.tuscany.sca.invoc
  ation,org.apache.tuscany.sca.core.factory,org.apache.tuscany.sca.inte
- rfacedef.impl,org.osoa.sca,org.apache.tuscany.sca.core.invocation";ve
+ rfacedef.impl,org.oasisopen.sca,org.apache.tuscany.sca.core.invocation";ve
  rsion="2.0"
 Private-Package: org.apache.tuscany.sca.implementation.java.invocation
  ;version="2.0",org.apache.tuscany.sca.implementation.java.module;vers
@@ -52,8 +52,8 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.policy.util;version="2.0",
  org.apache.tuscany.sca.provider;version="2.0",
  org.apache.tuscany.sca.runtime;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",
  org.w3c.dom
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java.runtim
  e
diff --git a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
index ca9c08fe63..bab4d897d6 100644
--- a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
+++ b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
@@ -23,7 +23,7 @@ import org.apache.tuscany.sca.core.context.RequestContextImpl;
 import org.apache.tuscany.sca.core.factory.ObjectCreationException;
 import org.apache.tuscany.sca.core.factory.ObjectFactory;
 import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.osoa.sca.RequestContext;
+import org.oasisopen.sca.RequestContext;
 
 /**
  * Creates instances of
diff --git a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
index 2903cc6fc8..f2a0d576db 100644
--- a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
+++ b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
@@ -20,7 +20,7 @@ package org.apache.tuscany.sca.implementation.java.invocation;
 
 import org.apache.tuscany.sca.core.factory.ObjectCreationException;
 import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.osoa.sca.ComponentContext;
+import org.oasisopen.sca.ComponentContext;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
index e585b3d46f..f705e04587 100644
--- a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
+++ b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
@@ -63,8 +63,8 @@ import org.apache.tuscany.sca.invocation.Invoker;
 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.annotations.ConversationID;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.ConversationID;
 
 /**
  * The runtime instantiation of Java component implementations
@@ -119,7 +119,7 @@ public class JavaComponentContextProvider {
                     /*
                     if(Modifier.isPublic(field.getModifiers())) {
                         instanceFactoryProvider.getInjectionSites().add(element);
-                    } else if(field.getAnnotation(org.osoa.sca.annotations.Property.class) != null) {
+                    } else if(field.getAnnotation(org.oasisopen.sca.annotation.Property.class) != null) {
                         instanceFactoryProvider.getInjectionSites().add(element);
                     }
                     */
@@ -192,7 +192,7 @@ public class JavaComponentContextProvider {
                         Field field = (Field)element.getAnchor();
                         if(Modifier.isPublic(field.getModifiers())) {
                             instanceFactoryProvider.getInjectionSites().add(element);
-                        } else if(field.getAnnotation(org.osoa.sca.annotations.Reference.class) != null) {
+                        } else if(field.getAnnotation(org.oasisopen.sca.annotation.Reference.class) != null) {
                             instanceFactoryProvider.getInjectionSites().add(element);
                         }
                     } else {
diff --git a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
index 25d538cff4..19ce7a2778 100644
--- a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
+++ b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
@@ -36,7 +36,7 @@ import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.runtime.EndpointReference;
 import org.apache.tuscany.sca.runtime.ReferenceParameters;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.osoa.sca.ServiceRuntimeException;
+import org.oasisopen.sca.ServiceRuntimeException;
 
 /**
  * Responsible for synchronously dispatching an invocation to a Java component
diff --git a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
index e9eea607c9..2606430ffe 100644
--- a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
+++ b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
@@ -45,8 +45,8 @@ import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.RequestContext;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java-xml/META-INF/MANIFEST.MF b/java/sca/contrib/modules/implementation-java-xml/META-INF/MANIFEST.MF
index 6513277b12..4b09e5e4b0 100644
--- a/java/sca/contrib/modules/implementation-java-xml/META-INF/MANIFEST.MF
+++ b/java/sca/contrib/modules/implementation-java-xml/META-INF/MANIFEST.MF
@@ -33,7 +33,7 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.monitor;version="2.0",
  org.apache.tuscany.sca.policy;version="2.0",
  
- org.osoa.sca.annotations;version="2.0";resolution:=optional
+ org.oasisopen.sca.annotation;version="2.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java.xml
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
index 3f28d740a7..64298b6275 100644
--- a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
+++ b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
@@ -18,8 +18,8 @@
  */
 package calculator;
 
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.EagerInit;
+import org.oasisopen.sca.annotation.Scope;
 
 /**
  * An implementation of the Add service.
diff --git a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
index c1fceb575d..9f64dc8bca 100644
--- a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
@@ -18,8 +18,8 @@
  */
 package calculator;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
 
 /**
  * An implementation of the Calculator service.
diff --git a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
index e1f35f99b5..f5b8ff5be0 100644
--- a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
+++ b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
@@ -18,7 +18,7 @@
  */
 package calculator;
 
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.Scope;
 
 /**
  * An implementation of the Divide service.
diff --git a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
index d621407908..d146d23153 100644
--- a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
@@ -18,7 +18,7 @@
  */
 package calculator;
 
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.Scope;
 
 /**
  * An implementation of the Multiply service.
diff --git a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
index 4fed0a8c6a..ffe09c3dde 100644
--- a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
+++ b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
@@ -18,7 +18,7 @@
  */
 package calculator;
 
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.Scope;
 
 /**
  * An implementation of the subtract service.
diff --git a/java/sca/contrib/modules/implementation-java/META-INF/MANIFEST.MF b/java/sca/contrib/modules/implementation-java/META-INF/MANIFEST.MF
index 96d32c1e9e..d001fa9228 100644
--- a/java/sca/contrib/modules/implementation-java/META-INF/MANIFEST.MF
+++ b/java/sca/contrib/modules/implementation-java/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Export-Package: org.apache.tuscany.sca.implementation.java.introspect;
  uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.impleme
- ntation.java,org.osoa.sca";version="2.0",org.apache.tuscany.sca.imple
+ ntation.java,org.oasisopen.sca";version="2.0",org.apache.tuscany.sca.imple
  mentation.java;uses:="org.apache.tuscany.sca.assembly,org.apache.tusc
  any.sca.implementation.java.introspect,org.apache.tuscany.sca.core,or
  g.apache.tuscany.sca.policy,org.apache.tuscany.sca.interfacedef.java"
@@ -32,8 +32,8 @@ Import-Package: javax.jws,
  org.apache.tuscany.sca.interfacedef.util;version="2.0",
  org.apache.tuscany.sca.policy;version="2.0",
  org.apache.tuscany.sca.policy.util;version="2.0.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.implementation.java
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
index 4a3ce0c343..3368d2fde3 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.osoa.sca.annotations.AllowsPassByReference;
+import org.oasisopen.sca.annotation.AllowsPassByReference;
 
 /**
  * Processes {@link AllowsPassByReference} on an implementation
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
index 556f0b77e9..dd7720906e 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
@@ -26,7 +26,7 @@ import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
 import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl;
-import org.osoa.sca.annotations.ComponentName;
+import org.oasisopen.sca.annotation.ComponentName;
 
 /**
  * Processes {@link @ComponentName} annotations on a component implementation and adds
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
index 17e28479d3..269555bac7 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
@@ -28,7 +28,7 @@ import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;
 
 /**
  * Handles processing of a constructor decorated with
- * {@link org.osoa.sca.annotations.Constructor}
+ * {@link org.oasisopen.sca.annotation.Constructor}
  * 
  * @version $Rev$ $Date$
  */
@@ -46,7 +46,7 @@ public class ConstructorProcessor extends BaseJavaClassVisitor {
         for (Constructor constructor : ctors) {
             JavaConstructorImpl<?> definition = new JavaConstructorImpl(constructor);
             type.getConstructors().put(constructor, definition);
-            if (constructor.getAnnotation(org.osoa.sca.annotations.Constructor.class) != null) {
+            if (constructor.getAnnotation(org.oasisopen.sca.annotation.Constructor.class) != null) {
                 if (found) {
                     throw new DuplicateConstructorException("Multiple constructors marked with @Constructor", constructor);
                 }
@@ -59,8 +59,8 @@ public class ConstructorProcessor extends BaseJavaClassVisitor {
     @Override
     public <T> void visitConstructor(Constructor<T> constructor, JavaImplementation type)
         throws IntrospectionException {
-        org.osoa.sca.annotations.Constructor annotation = constructor
-            .getAnnotation(org.osoa.sca.annotations.Constructor.class);
+        org.oasisopen.sca.annotation.Constructor annotation = constructor
+            .getAnnotation(org.oasisopen.sca.annotation.Constructor.class);
         if (annotation == null) {
             return;
         }
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
index 177ceaa57c..04b1c9a97a 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
@@ -26,9 +26,9 @@ import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
 import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Context;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.RequestContext;
+import org.oasisopen.sca.annotation.Context;
 
 /**
  * Processes {@link @Context} annotations on a component implementation and adds
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
index 985f8baa82..e7a0aadb0c 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
@@ -26,7 +26,7 @@ import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
 import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl;
-import org.osoa.sca.annotations.ConversationID;
+import org.oasisopen.sca.annotation.ConversationID;
 
 /**
  * Processes {@link @ConversationID} annotations on a component implementation and adds
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
index efd04262dd..9c06ec52fe 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
@@ -24,9 +24,9 @@ import java.lang.reflect.Method;
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.ConversationAttributes;
+import org.oasisopen.sca.annotation.ConversationID;
+import org.oasisopen.sca.annotation.Scope;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
index 50e4d46e97..a98d1f25db 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
@@ -24,7 +24,7 @@ import java.lang.reflect.Modifier;
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.osoa.sca.annotations.Destroy;
+import org.oasisopen.sca.annotation.Destroy;
 
 /**
  * Processes the {@link @Destroy} annotation on a component implementation and
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
index 88a245cbf3..d6494e3845 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
@@ -24,7 +24,7 @@ import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 
 /**
  * Thrown when more than one component implementation constructor is annotated with {@link
- * org.osoa.sca.annotations.Constructor}
+ * org.oasisopen.sca.annotation.Constructor}
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
index 9b834e7e87..8bfae89162 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 
 /**
- * Thrown when an implementation is annotated multiple times with {@link org.osoa.sca.annotations.Destroy}
+ * Thrown when an implementation is annotated multiple times with {@link org.oasisopen.sca.annotation.Destroy}
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
index 4325faef26..38f6478531 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 
 /**
- * Thrown when an implementation is annotated multiple times with {@link @org.osoa.sca.annotations.Init}
+ * Thrown when an implementation is annotated multiple times with {@link @org.oasisopen.sca.annotation.Init}
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
index 5619275b82..2396471482 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
@@ -21,10 +21,10 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl;
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.osoa.sca.annotations.EagerInit;
+import org.oasisopen.sca.annotation.EagerInit;
 
 /**
- * Handles processing of {@link org.osoa.sca.annotations.EagerInit}
+ * Handles processing of {@link org.oasisopen.sca.annotation.EagerInit}
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
index b7f6748ed2..fd62cd41da 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
@@ -53,11 +53,11 @@ import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
 import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * Heuristically evaluates an un-annotated Java implementation type to determine
@@ -250,7 +250,7 @@ public class HeuristicPojoProcessor extends BaseJavaClassVisitor {
         Constructor constructor;
         boolean explict = false;
         if (definition != null && definition.getConstructor()
-            .isAnnotationPresent(org.osoa.sca.annotations.Constructor.class)) {
+            .isAnnotationPresent(org.oasisopen.sca.annotation.Constructor.class)) {
             // the constructor was already defined explicitly
             return;
         } else if (definition != null) {
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
index 9fe2fcd468..badd41fbb9 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Member;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 
 /**
- * Denotes an illegal use of {@link org.osoa.sca.annotations.Callback} on a reference
+ * Denotes an illegal use of {@link org.oasisopen.sca.annotation.Callback} on a reference
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
index f5696122df..fa1e67a336 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Member;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 
 /**
- * Denotes an illegal signature for a method decorated with {@link org.osoa.sca.annotations.Context}
+ * Denotes an illegal signature for a method decorated with {@link org.oasisopen.sca.annotation.Context}
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
index 6a0d60c92f..0c4c3d5646 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Member;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 
 /**
- * Denotes an illegal signature for a method decorated with {@link org.osoa.sca.annotations.Destroy}
+ * Denotes an illegal signature for a method decorated with {@link org.oasisopen.sca.annotation.Destroy}
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
index 8f50852c2d..2956b60b65 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Member;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 
 /**
- * Denotes an illegal signature for a method decorated with {@link @org.osoa.sca.annotations.Init}
+ * Denotes an illegal signature for a method decorated with {@link @org.oasisopen.sca.annotation.Init}
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
index e130f4221d..e0f90779a1 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 
 /**
- * Denotes an illegal use of the {@link @org.osoa.sca.annotations.Service} annotation
+ * Denotes an illegal use of the {@link @org.oasisopen.sca.annotation.Service} annotation
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
index 583ccc86cd..e34399e467 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
@@ -24,7 +24,7 @@ import java.lang.reflect.Modifier;
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.osoa.sca.annotations.Init;
+import org.oasisopen.sca.annotation.Init;
 
 /**
  * Processes the {@link @Init} annotation on a component implementation and
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
index 91b97b2caf..c75dfdaf46 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
@@ -22,7 +22,7 @@ import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 
 /**
  * Denotes an invalid constructor definition, e.g. when the number of injection names specified in {@link
- * org.osoa.sca.annotations.Constructor} do not match the number of actual constructor parameters
+ * org.oasisopen.sca.annotation.Constructor} do not match the number of actual constructor parameters
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
index 976b4da120..429b88aa1f 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 
 /**
- * Denotes an invalid usage of {@link org.osoa.sca.annotations.Property}
+ * Denotes an invalid usage of {@link org.oasisopen.sca.annotation.Property}
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
index e77a6beb0d..fbf3fc9ed3 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 
 /**
- * Denotes an invalid usage of {@link org.osoa.sca.annotations.Reference}
+ * Denotes an invalid usage of {@link org.oasisopen.sca.annotation.Reference}
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
index 7147da55b4..62337181e9 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
@@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 
 /**
- * Thrown when a service type specified by an {@link org.osoa.sca.annotations.Service} annotation is invalid, e.g. it is
+ * Thrown when a service type specified by an {@link org.oasisopen.sca.annotation.Service} annotation is invalid, e.g. it is
  * not an interface
  *
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
index 6039bd91f8..239c36aa9a 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
@@ -41,7 +41,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
 
-import org.osoa.sca.CallableReference;
+import org.oasisopen.sca.CallableReference;
 
 /**
  * Implements various reflection-related operations
@@ -68,7 +68,7 @@ public final class JavaIntrospectionHelper {
 
     private static void checkInvalidAnnotations(AnnotatedElement element) {
         for (Annotation a : element.getAnnotations()) {
-            if (a.annotationType().getName().startsWith("org.osoa.sca.annotations.")) {
+            if (a.annotationType().getName().startsWith("org.oasisopen.sca.annotation.")) {
                 logger.warning("Invalid annotation " + a + " is found on " + element);
             }
         }
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
index 954a3abbc8..ea05cdde3e 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
@@ -39,11 +39,11 @@ import org.apache.tuscany.sca.policy.Intent;
 import org.apache.tuscany.sca.policy.PolicyFactory;
 import org.apache.tuscany.sca.policy.PolicySet;
 import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.osoa.sca.annotations.PolicySets;
-import org.osoa.sca.annotations.Requires;
+import org.oasisopen.sca.annotation.PolicySets;
+import org.oasisopen.sca.annotation.Requires;
 
 /**
- * Processes an {@link org.osoa.sca.annotations.Requires} annotation
+ * Processes an {@link org.oasisopen.sca.annotation.Requires} annotation
  *
  * @version $Rev$ $Date$
  */
@@ -224,8 +224,8 @@ public class PolicyProcessor extends BaseJavaClassVisitor {
     private Reference getReference(Method method, JavaImplementation type) {
         //since the ReferenceProcessor is called ahead of the PolicyProcessor the type should have
         //picked up the reference setter method
-        org.osoa.sca.annotations.Reference annotation = 
-                                        method.getAnnotation(org.osoa.sca.annotations.Reference.class);
+        org.oasisopen.sca.annotation.Reference annotation = 
+                                        method.getAnnotation(org.oasisopen.sca.annotation.Reference.class);
         if (annotation != null) {
             if (JavaIntrospectionHelper.isSetter(method)) {
                 String name = annotation.name();
@@ -249,8 +249,8 @@ public class PolicyProcessor extends BaseJavaClassVisitor {
     
     @Override
     public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
-        org.osoa.sca.annotations.Reference annotation = 
-            field.getAnnotation( org.osoa.sca.annotations.Reference.class);
+        org.oasisopen.sca.annotation.Reference annotation = 
+            field.getAnnotation( org.oasisopen.sca.annotation.Reference.class);
         if (annotation == null) {
             return;
         }
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
index cf1b4a9830..a755146997 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
@@ -19,7 +19,7 @@
 package org.apache.tuscany.sca.implementation.java.introspect.impl;
 
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.osoa.sca.annotations.Property;
+import org.oasisopen.sca.annotation.Property;
 
 /**
  * Processes an {@link @Property} annotation, updating the component type with
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
index a1f8a766ae..1f66fc7c3d 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
@@ -37,8 +37,8 @@ import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.Reference;
 
 /**
  * Processes an {@link @Reference} annotation, updating the component type with
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
index a3d3889d30..15fff297c8 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
@@ -38,7 +38,7 @@ public class ScopeProcessor extends BaseJavaClassVisitor {
     public <T> void visitClass(Class<T> clazz,
                                JavaImplementation type)
         throws IntrospectionException {
-        org.osoa.sca.annotations.Scope annotation = clazz.getAnnotation(org.osoa.sca.annotations.Scope.class);
+        org.oasisopen.sca.annotation.Scope annotation = clazz.getAnnotation(org.oasisopen.sca.annotation.Scope.class);
         if (annotation == null) {
             type.setJavaScope(JavaScopeImpl.STATELESS);
             return;
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index 6854acdc2a..35505ec9ed 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
@@ -39,14 +39,14 @@ import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
- * Processes an {@link org.osoa.sca.annotations.Service} annotation and updates
+ * Processes an {@link org.oasisopen.sca.annotation.Service} annotation and updates
  * the component type with corresponding {@link Service}s. Also processes
- * related {@link org.osoa.sca.annotations.Callback} annotations.
+ * related {@link org.oasisopen.sca.annotation.Callback} annotations.
  * 
  * @version $Rev$ $Date$
  */
@@ -61,7 +61,7 @@ public class ServiceProcessor extends BaseJavaClassVisitor {
 
     @Override
     public <T> void visitClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
-        org.osoa.sca.annotations.Service annotation = clazz.getAnnotation(org.osoa.sca.annotations.Service.class);
+        org.oasisopen.sca.annotation.Service annotation = clazz.getAnnotation(org.oasisopen.sca.annotation.Service.class);
         if (annotation == null) {
             // scan interfaces for remotable
             Set<Class> interfaces = getAllInterfaces(clazz);
diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
index 57d224b2bf..bfaa759cd2 100644
--- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
+++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
@@ -19,7 +19,7 @@
 package org.apache.tuscany.sca.implementation.java.introspect.impl;
 
 /**
- * Thrown when a method or field marked with {@link org.osoa.sca.annotations.Context} takes an unknown type
+ * Thrown when a method or field marked with {@link org.oasisopen.sca.annotation.Context} takes an unknown type
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
index e5abb07760..34fc58d241 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
@@ -26,7 +26,7 @@ import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
 import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.osoa.sca.annotations.AllowsPassByReference;
+import org.oasisopen.sca.annotation.AllowsPassByReference;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
index fa1527fbe5..9a55c2a4ce 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
@@ -37,8 +37,8 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;
 import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
 
 /**
  * @version $Rev$ $Date$
@@ -105,19 +105,19 @@ public class ConstructorProcessorTestCase extends TestCase {
 
     private static class BadFoo {
 
-        @org.osoa.sca.annotations.Constructor("foo")
+        @org.oasisopen.sca.annotation.Constructor("foo")
         public BadFoo(String foo) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor( {"foo", "bar"})
+        @org.oasisopen.sca.annotation.Constructor( {"foo", "bar"})
         public BadFoo(String foo, String bar) {
 
         }
     }
 
     private static class Foo {
-        @org.osoa.sca.annotations.Constructor("foo")
+        @org.oasisopen.sca.annotation.Constructor("foo")
         public Foo(String foo) {
 
         }
@@ -129,13 +129,13 @@ public class ConstructorProcessorTestCase extends TestCase {
     }
 
     private static class BadAnnotation {
-        @org.osoa.sca.annotations.Constructor("foo")
+        @org.oasisopen.sca.annotation.Constructor("foo")
         public BadAnnotation(String foo, Foo ref) {
         }
     }
 
     public static final class Mixed {
-        @org.osoa.sca.annotations.Constructor
+        @org.oasisopen.sca.annotation.Constructor
         public Mixed(@Reference
         String param1, @Property(name = "foo")
         String param2, @Reference(name = "bar")
@@ -144,7 +144,7 @@ public class ConstructorProcessorTestCase extends TestCase {
     }
 
     public static final class Multiple {
-        @org.osoa.sca.annotations.Constructor
+        @org.oasisopen.sca.annotation.Constructor
         public Multiple(@Reference
         Collection<String> param1, @Property(name = "foo")
         String[] param2, @Reference(name = "bar", required = true)
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
index 690869ccb8..8ca8f195b4 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
@@ -26,7 +26,7 @@ import java.util.List;
 import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.osoa.sca.annotations.Property;
+import org.oasisopen.sca.annotation.Property;
 
 /**
  * @version $Rev$ $Date$
@@ -109,22 +109,22 @@ public class ConstructorPropertyTestCase extends AbstractProcessorTest {
 
     private static class Foo {
 
-        @org.osoa.sca.annotations.Constructor()
+        @org.oasisopen.sca.annotation.Constructor()
         public Foo(@Property(name = "myProp", required = true)String prop) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor("myProp")
+        @org.oasisopen.sca.annotation.Constructor("myProp")
         public Foo(@Property Integer prop) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor()
+        @org.oasisopen.sca.annotation.Constructor()
         public Foo(@Property(name = "myProp1")String prop1, @Property(name = "myProp2")String prop2) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor()
+        @org.oasisopen.sca.annotation.Constructor()
         public Foo(@Property List prop) {
 
         }
@@ -132,22 +132,22 @@ public class ConstructorPropertyTestCase extends AbstractProcessorTest {
 
     private static class BadFoo {
 
-        @org.osoa.sca.annotations.Constructor()
+        @org.oasisopen.sca.annotation.Constructor()
         public BadFoo(@Property(name = "myProp")String prop1, @Property(name = "myProp")String prop2) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor()
+        @org.oasisopen.sca.annotation.Constructor()
         public BadFoo(@Property String prop) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor("myProp")
+        @org.oasisopen.sca.annotation.Constructor("myProp")
         public BadFoo(@Property Integer prop, @Property Integer prop2) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor({"myRef", "myRef2"})
+        @org.oasisopen.sca.annotation.Constructor({"myRef", "myRef2"})
         public BadFoo(@Property List ref, @Property(name = "myOtherRef")List ref2) {
 
         }
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
index 8c10df2146..51ab00644a 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
@@ -27,7 +27,7 @@ import org.apache.tuscany.sca.assembly.Multiplicity;
 import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 /**
  * @version $Rev$ $Date$
@@ -111,22 +111,22 @@ public class ConstructorReferenceTestCase extends AbstractProcessorTest {
 
     private static class Foo {
 
-        @org.osoa.sca.annotations.Constructor()
+        @org.oasisopen.sca.annotation.Constructor()
         public Foo(@Reference(name = "myRef", required = true)String prop) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor()
+        @org.oasisopen.sca.annotation.Constructor()
         public Foo(@Reference(name = "myRef1")String prop1, @Reference(name = "myRef2")String prop2) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor("myRef")
+        @org.oasisopen.sca.annotation.Constructor("myRef")
         public Foo(@Reference Integer prop) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor()
+        @org.oasisopen.sca.annotation.Constructor()
         public Foo(@Reference List prop) {
 
         }
@@ -134,7 +134,7 @@ public class ConstructorReferenceTestCase extends AbstractProcessorTest {
 
     private static class NoNameFoo {
 
-        @org.osoa.sca.annotations.Constructor
+        @org.oasisopen.sca.annotation.Constructor
         public NoNameFoo(@Reference String prop) {
 
         }
@@ -142,22 +142,22 @@ public class ConstructorReferenceTestCase extends AbstractProcessorTest {
 
     private static class BadFoo {
 
-        @org.osoa.sca.annotations.Constructor
+        @org.oasisopen.sca.annotation.Constructor
         public BadFoo(@Reference(name = "myRef")String prop1, @Reference(name = "myRef")String prop2) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor
+        @org.oasisopen.sca.annotation.Constructor
         public BadFoo(@Reference String prop) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor("myRef")
+        @org.oasisopen.sca.annotation.Constructor("myRef")
         public BadFoo(@Reference Integer ref, @Reference Integer ref2) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor({"myRef", "myRef2"})
+        @org.oasisopen.sca.annotation.Constructor({"myRef", "myRef2"})
         public BadFoo(@Reference List ref, @Reference(name = "myOtherRef")List ref2) {
 
         }
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
index 365fb12afe..42cd1ace1f 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
@@ -104,22 +104,22 @@ public class ConstructorResourceTestCase extends AbstractProcessorTest {
 
     private static class Foo {
 
-        @org.osoa.sca.annotations.Constructor
+        @org.oasisopen.sca.annotation.Constructor
         public Foo(@Resource(name = "myResource") String resource) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor("myResource")
+        @org.oasisopen.sca.annotation.Constructor("myResource")
         public Foo(@Resource Integer resource) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor
+        @org.oasisopen.sca.annotation.Constructor
         public Foo(@Resource(name = "myResource1") String res1, @Resource(name = "myResource2") String res2) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor
+        @org.oasisopen.sca.annotation.Constructor
         public Foo(@Resource List res) {
 
         }
@@ -127,22 +127,22 @@ public class ConstructorResourceTestCase extends AbstractProcessorTest {
 
     private static class BadFoo {
 
-        @org.osoa.sca.annotations.Constructor
+        @org.oasisopen.sca.annotation.Constructor
         public BadFoo(@Resource(name = "myResource") String res1, @Resource(name = "myResource") String res2) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor
+        @org.oasisopen.sca.annotation.Constructor
         public BadFoo(@Resource String res) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor("myProp")
+        @org.oasisopen.sca.annotation.Constructor("myProp")
         public BadFoo(@Resource Integer res, @Resource Integer res2) {
 
         }
 
-        @org.osoa.sca.annotations.Constructor({"myRes", "myRes2"})
+        @org.oasisopen.sca.annotation.Constructor({"myRes", "myRes2"})
         public BadFoo(@Resource List res, @Resource(name = "myOtherRes") List res2) {
 
         }
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
index f77c9abad9..0a14f9babd 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
 import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.ComponentName;
-import org.osoa.sca.annotations.Context;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.RequestContext;
+import org.oasisopen.sca.annotation.ComponentName;
+import org.oasisopen.sca.annotation.Context;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
index c6b2626e9c..7591095fff 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
@@ -27,7 +27,7 @@ import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
 import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.osoa.sca.annotations.ConversationID;
+import org.oasisopen.sca.annotation.ConversationID;
 
 /**
  * Test the ConversationIDProcessor
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
index 4555736813..f8b0a04595 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
@@ -27,9 +27,9 @@ import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
 import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.ConversationAttributes;
+import org.oasisopen.sca.annotation.ConversationID;
+import org.oasisopen.sca.annotation.Scope;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
index ffc67325fa..47561aabde 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
@@ -27,7 +27,7 @@ import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
 import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.osoa.sca.annotations.Destroy;
+import org.oasisopen.sca.annotation.Destroy;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
index 09bcc7ab6c..3c32b7c680 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
@@ -26,7 +26,7 @@ import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFacto
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.osoa.sca.annotations.EagerInit;
+import org.oasisopen.sca.annotation.EagerInit;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
index c7f340bd46..9fc0dde0d1 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
@@ -29,7 +29,7 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl;
 import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.osoa.sca.annotations.Property;
+import org.oasisopen.sca.annotation.Property;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
index e98a8fec1f..b2661e49e8 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
@@ -31,9 +31,9 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
 import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
index ff267cd938..e0ae754dea 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
@@ -34,10 +34,10 @@ import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl;
 import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
 import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
 import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Remotable;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * Verifies component type information is properly introspected from an unadorned
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
index ed0527d3d7..5870b8c450 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
@@ -76,7 +76,7 @@ public class HeutisticExtensibleConstructorTestCase extends AbstractProcessorTes
      * annotation processors is called. <p/> For example, given:
      * 
      * <pre>
-     *  Foo(@Bar String prop, @org.osoa.sca.annotations.Property(name = &quot;foo&quot;) String prop2)
+     *  Foo(@Bar String prop, @org.oasisopen.sca.annotation.Property(name = &quot;foo&quot;) String prop2)
      * </pre>
      * 
      * <p/> Heuristic evaluation of
@@ -132,15 +132,15 @@ public class HeutisticExtensibleConstructorTestCase extends AbstractProcessorTes
 
     public static class Foo {
         public Foo(@Bar
-        String prop, @org.osoa.sca.annotations.Property(name = "foo")
+        String prop, @org.oasisopen.sca.annotation.Property(name = "foo")
         String prop2) {
         }
     }
 
     public static class Foo2 {
-        public Foo2(@org.osoa.sca.annotations.Reference(name = "baz")
+        public Foo2(@org.oasisopen.sca.annotation.Reference(name = "baz")
         String prop1, @Bar
-        String prop2, @org.osoa.sca.annotations.Property(name = "foo")
+        String prop2, @org.oasisopen.sca.annotation.Property(name = "foo")
         String prop3) {
         }
     }
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
index 70c615ca24..72660b2206 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
@@ -26,7 +26,7 @@ import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
 import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.osoa.sca.annotations.Init;
+import org.oasisopen.sca.annotation.Init;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
index 4a625982b0..3007724765 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
@@ -37,8 +37,8 @@ import org.apache.tuscany.sca.interfacedef.java.impl.PolicyJavaInterfaceVisitor;
 import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
 import org.apache.tuscany.sca.policy.Intent;
 import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.osoa.sca.annotations.Requires;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Requires;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
index 8d5e816a08..a410e22c4e 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
@@ -30,7 +30,7 @@ import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFacto
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
-import org.osoa.sca.annotations.Property;
+import org.oasisopen.sca.annotation.Property;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
index d68b1530f0..1011a0dc72 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
@@ -32,7 +32,7 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
 import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
index d7de4e522e..5f0a497c6e 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
@@ -87,23 +87,23 @@ public class ScopeProcessorTestCase extends TestCase {
         parent = EasyMock.createNiceMock(Component.class);
     }
 
-    @org.osoa.sca.annotations.Scope("COMPOSITE")
+    @org.oasisopen.sca.annotation.Scope("COMPOSITE")
     private class Composite {
     }
 
-    @org.osoa.sca.annotations.Scope("SESSION")
+    @org.oasisopen.sca.annotation.Scope("SESSION")
     private class Session {
     }
 
-    @org.osoa.sca.annotations.Scope("CONVERSATION")
+    @org.oasisopen.sca.annotation.Scope("CONVERSATION")
     private class Conversation {
     }
 
-    @org.osoa.sca.annotations.Scope("REQUEST")
+    @org.oasisopen.sca.annotation.Scope("REQUEST")
     private class Request {
     }
 
-    @org.osoa.sca.annotations.Scope("STATELESS")
+    @org.oasisopen.sca.annotation.Scope("STATELESS")
     private class Stateless {
     }
 
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
index 10f0500e4d..1fc4445f28 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
@@ -32,9 +32,9 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
 import org.apache.tuscany.sca.interfacedef.InvalidCallbackException;
 import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index aea90aa6eb..19355f5c62 100644
--- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
+++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
@@ -28,9 +28,9 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
 import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Remotable;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * @version $Rev$ $Date$