36 files changed, 42 insertions, 42 deletions
diff --git a/java/sca/modules/sca-api/META-INF/MANIFEST.MF b/java/sca/modules/sca-api/META-INF/MANIFEST.MF
index b8b81f1930..ca64e30235 100644
--- a/java/sca/modules/sca-api/META-INF/MANIFEST.MF
+++ b/java/sca/modules/sca-api/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Export-Package: org.osoa.sca.annotations;version="2.0.0",org.osoa.sca;us
+Export-Package: org.oasisopen.sca.annotation;version="2.0.0",org.oasisopen.sca;us
  es:="javax.security.auth";version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA API
@@ -10,8 +10,8 @@ Bnd-LastModified: 1225397105046
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: API classes for the Service Component Architecture
-Import-Package: javax.security.auth,org.osoa.sca;version="2.0.0",org.oso
- a.sca.annotations;version="2.0.0"
+Import-Package: javax.security.auth,org.oasisopen.sca;version="2.0.0",org.oas
+ isopen.sca.annotation;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.api
 Bundle-DocURL: http://www.apache.org/
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/CallableReference.java
index 7f6756bcbd..cdfaded693 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/CallableReference.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca;
+package org.oasisopen.sca;
 
 /**
  * Common superclass for references that can be passed between components.
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java
index e25917e0f8..7e1a2e6b2e 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca;
+package org.oasisopen.sca;
 
 import java.util.Collection;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/Constants.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
index b1b2af8048..5135c23dde 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osoa.sca;
+package org.oasisopen.sca;
 
 /**
  * @version $Rev$ $Date$
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Conversation.java
index 12733a7bd2..d4e4034eed 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Conversation.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca;
+package org.oasisopen.sca;
 
 /**
  * Interface representing a Conversation providing access to the conversation id and and a mechanism
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ConversationEndedException.java
index 2e3b71fd1c..72944d6dfc 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ConversationEndedException.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca;
+package org.oasisopen.sca;
 
 /**
  * Exception thrown to indicate the conversation being used for a stateful interaction has been ended.
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/NoRegisteredCallbackException.java
index 0a0c2afff9..fcf88f75c1 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/NoRegisteredCallbackException.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca;
+package org.oasisopen.sca;
 
 /**
  * Exception thrown to indicate that no callback has been registered
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java
index cdcfa9a791..5c8fe61073 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca;
+package org.oasisopen.sca;
 
 import javax.security.auth.Subject;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java
index 8da6bcd1f3..55d875a5f3 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca;
+package org.oasisopen.sca;
 
 
 /**
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java
index 70f5f904a4..d11c1904c5 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca;
+package org.oasisopen.sca;
 
 
 /**
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java
index dd6b1c3242..5d8e4af6ff 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca;
+package org.oasisopen.sca;
 
 /**
  * Exception used to indicate that a runtime exception occurred during the invocation of and external service.
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java
index 556dd4e68e..dbc08a7655 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java
index f7fca41212..cfc0af0318 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java
@@ -5,14 +5,14 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static org.osoa.sca.Constants.SCA_PREFIX;
+import static org.oasisopen.sca.Constants.SCA_PREFIX;
 
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java
index 0ee613fdcb..b8d71dac05 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java
index bc73d22c9d..8fc3cd4013 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java
index 25ade6f091..5c594bc7d3 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java
@@ -5,14 +5,14 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static org.osoa.sca.Constants.SCA_PREFIX;
+import static org.oasisopen.sca.Constants.SCA_PREFIX;
 
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java
index bc09c8ccdd..a5728e51d4 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java
index baacb2f520..e7f7aef069 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationAttributes.java
index e9fcfee2d3..498cc3eea3 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationAttributes.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationID.java
index b2f6f17129..2cc62afdbf 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationID.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Conversational.java
index f0350f8ff5..6a406f2acc 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Conversational.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java
index d65558653b..2ad6fdc892 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java
index 21bf986705..d53e9e4fc4 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EndsConversation.java
index c65ff5838f..4f58c50802 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EndsConversation.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java
index d610e21d64..3fe9bf585f 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java
index a8cf28475b..0c196f1ce5 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java
@@ -5,14 +5,14 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static org.osoa.sca.Constants.SCA_PREFIX;
+import static org.oasisopen.sca.Constants.SCA_PREFIX;
 
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java
index fc925aa402..c3e9914f23 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java
index eaf9e3207c..458d05cc92 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java
index b22a6a840c..150d8dabc8 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java
index 71af35634d..0ab54ef6e4 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java
index 44388bea74..a5fd102859 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java
index 4d71b3f357..9a7154fcf3 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java
index 53d58b7dc1..77ff4e26f9 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
index 3af699de07..e44775398e 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
@@ -29,7 +29,7 @@ import java.lang.annotation.Target;
  * <li>{http://www.osoa.org/xmlns/sca/1.0}confidentiality.message</li>
  * </ul>
  * This annotation supports general purpose intents specified as strings.  Users may also define
- * specific intents using the {@link @org.osoa.sca.annotations.Intent} annotation.
+ * specific intents using the {@link @org.oasisopen.sca.annotation.Intent} annotation.
  *
  * @version $Rev$ $Date$
  */
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java
index cd88df1128..d7cfaab3f5 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java
index 62f4abdbee..36c5bff5e9 100644
--- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
+++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java
@@ -5,7 +5,7 @@
  * 
  * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
-package org.osoa.sca.annotations;
+package org.oasisopen.sca.annotation;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;