summaryrefslogtreecommitdiffstats
path: root/java/sca/itest/osgi-implementation/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'java/sca/itest/osgi-implementation/src/main')
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java4
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java4
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java4
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java6
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java16
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java16
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java4
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java6
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java8
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java14
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java12
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/helloworld/Greetings.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java8
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java4
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java6
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java8
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java8
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java6
-rw-r--r--java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java6
-rw-r--r--java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf2
-rw-r--r--java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf2
42 files changed, 94 insertions, 94 deletions
diff --git a/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
index cfecd989fe..37e750d7ec 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
@@ -18,7 +18,7 @@
*/
package callback.client;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
/*
diff --git a/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
index 43bc26f2f5..9c145ff59f 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
@@ -18,7 +18,7 @@
*/
package callback.client;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
/**
diff --git a/java/sca/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/java/sca/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
index f78878ef47..b1bb8c2aa0 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
@@ -20,8 +20,8 @@ package callback.client;
import junit.framework.Assert;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import callback.service.CallbackService;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/java/sca/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
index 5383e1e268..958b0bf266 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
@@ -18,8 +18,8 @@
*/
package callback.service;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Remotable;
import callback.client.CallbackCallback;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/java/sca/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
index b2af2fa68d..88fd845acd 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
@@ -18,8 +18,8 @@
*/
package callback.service;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Service;
import callback.client.CallbackCallback;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/java/sca/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
index c05a3f52a8..21753cc33b 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
@@ -23,7 +23,7 @@ import java.util.Hashtable;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-import org.osoa.sca.annotations.Callback;
+import org.oasisopen.sca.annotation.Callback;
import callback.client.CallbackCallback;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
index c92f078e49..acef7fbf6a 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
@@ -18,9 +18,9 @@
*/
package conversation.client;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Conversational;
+import org.oasisopen.sca.annotation.EndsConversation;
+import org.oasisopen.sca.annotation.Remotable;
/**
diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
index af269052c7..19b2fed53e 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
@@ -18,7 +18,7 @@
*/
package conversation.client;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The client for the conversational itest. Is implemented by clients
diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
index 3aedabc29c..ed1f12de44 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
@@ -18,14 +18,14 @@
*/
package conversation.client;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.ConversationAttributes;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import conversation.referenceclient.ConversationalReferenceClient;
import conversation.service.ConversationalService;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
index b12e094bc1..e0f8c51262 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
@@ -19,14 +19,14 @@
package conversation.client;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import conversation.referenceclient.ConversationalReferenceClient;
import conversation.service.ConversationalService;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
index 59e128b993..9b8049164a 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
@@ -18,8 +18,8 @@
*/
package conversation.referenceclient;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.Remotable;
import conversation.service.ConversationalService;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
index 4524c6bd3d..d6d6bcf4b1 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
@@ -18,9 +18,9 @@
*/
package conversation.referenceclient;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.AllowsPassByReference;
+import org.oasisopen.sca.annotation.Service;
import conversation.service.ConversationalService;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
index bcd24ef0b1..1966bc76a4 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
@@ -18,10 +18,10 @@
*/
package conversation.service;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Conversational;
+import org.oasisopen.sca.annotation.EndsConversation;
+import org.oasisopen.sca.annotation.Remotable;
import conversation.client.ConversationalCallback;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
index ec30d641ac..96b23e771c 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
@@ -18,13 +18,13 @@
*/
package conversation.service;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.ConversationAttributes;
+import org.oasisopen.sca.annotation.ConversationID;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import conversation.client.ConversationalCallback;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
index 34baca71d1..9147c0ffa2 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
@@ -20,12 +20,12 @@ package conversation.service;
import java.util.HashMap;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.ConversationID;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import conversation.client.ConversationalCallback;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
index 9285c0a8d5..c55cb68d03 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
@@ -19,7 +19,7 @@
package helloworld;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Greetings {
diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
index 16d0eae990..0940f9baf4 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
@@ -19,7 +19,7 @@
package helloworld;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface HelloWorld {
diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
index 3d0e045225..50d8c26388 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
@@ -19,10 +19,10 @@
package helloworld;
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.AllowsPassByReference;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
@Service(Greetings.class)
@Scope("COMPOSITE")
diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
index c055aee142..a7bcb2ba06 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
@@ -19,8 +19,8 @@
package helloworld;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
@Scope("COMPOSITE")
public class JavaHelloWorldComponent implements HelloWorld {
diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
index 661eb5a8cb..9b3907c752 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
@@ -27,7 +27,7 @@ import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.BundleActivator;
-import org.osoa.sca.annotations.AllowsPassByReference;
+import org.oasisopen.sca.annotation.AllowsPassByReference;
public class OSGiGreetingsImpl implements Greetings, ServiceListener, BundleActivator {
diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
index fff67e1978..f48c91d518 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
@@ -18,7 +18,7 @@
*/
package helloworld.sdo;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The interface for the helloworld service
diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
index 98085449e6..e52565aedb 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
@@ -18,7 +18,7 @@
*/
package helloworld.sdo;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the HelloWorld service.
diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
index 5089019671..6548b409fb 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
@@ -18,7 +18,7 @@
*/
package helloworld.sdo.client;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The interface for the helloworld client
diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
index 039a214856..99a3d0087c 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
@@ -19,7 +19,7 @@
package helloworld.ws;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface HelloWorld {
diff --git a/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
index 2251bf5be6..305b3610d4 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
@@ -21,7 +21,7 @@ package stockquote;
import java.util.Dictionary;
import org.osgi.service.component.ComponentContext;
-import org.osoa.sca.annotations.Property;
+import org.oasisopen.sca.annotation.Property;
/**
* Declarative Stock quote with configurable properties.
diff --git a/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
index f2ae804ad1..4cd4fb36a5 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
@@ -27,7 +27,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
-import org.osoa.sca.annotations.Property;
+import org.oasisopen.sca.annotation.Property;
/**
*
diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
index 2762bc62be..ecbad11fa0 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
@@ -18,7 +18,7 @@
*/
package supplychain.customer;
-import org.osoa.sca.annotations.OneWay;
+import org.oasisopen.sca.annotation.OneWay;
/**
* This is the business interface of the Customer service component.
diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 80346311b1..03040d81d1 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
@@ -20,9 +20,9 @@ package supplychain.customer;
import java.util.ArrayList;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import supplychain.retailer.Retailer;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 546971860e..8ef4a2d8d8 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
@@ -21,7 +21,7 @@ package supplychain.customer;
import java.util.ArrayList;
-import org.osoa.sca.annotations.AllowsPassByReference;
+import org.oasisopen.sca.annotation.AllowsPassByReference;
import supplychain.OSGiBundleImpl;
import supplychain.retailer.Retailer;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
index 5ba42780f2..f3ea404997 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
@@ -18,7 +18,7 @@
*/
package supplychain.customer;
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.Scope;
/**
diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
index bc569d0ac0..eda77b0c5d 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
@@ -19,7 +19,7 @@
package supplychain.customer;
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.Scope;
/**
diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index df52c6c760..b9adacca55 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
@@ -19,10 +19,10 @@
package supplychain.retailer;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import supplychain.warehouse.Warehouse;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index d0cf43a960..3da2fb8e39 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
@@ -19,10 +19,10 @@
package supplychain.shipper;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import supplychain.customer.Customer;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
index 13bce67bb4..90f709bf95 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
@@ -18,7 +18,7 @@
*/
package supplychain.shipper;
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.Scope;
/**
diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
index 071a131f40..d265f42c1b 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
@@ -18,7 +18,7 @@
*/
package supplychain.shipper;
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.Scope;
/**
diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 9edf3567e5..9f636957ac 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
@@ -18,9 +18,9 @@
*/
package supplychain.warehouse;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import supplychain.shipper.Shipper;
diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
index 659f16be7f..e32028dd30 100644
--- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
+++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
@@ -18,9 +18,9 @@
*/
package supplychain.warehouse;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import supplychain.shipper.Shipper;
diff --git a/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
index 7a06030e32..510b3cdcce 100644
--- a/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
+++ b/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
@@ -4,7 +4,7 @@ Bundle-Name: ConversationTest
Bundle-SymbolicName: conversation.ConversationalClient
Bundle-Version: 1.0.0
Bundle-Localization: plugin
-Import-Package: org.osgi.framework, org.osoa.sca, org.osoa.sca.annotations,
+Import-Package: org.osgi.framework, org.oasisopen.sca, org.oasisopen.sca.annotation,
conversation.service, conversation.referenceclient
Export-Package: conversation.client
Bundle-Activator: conversation.client.ConversationalClientActivator
diff --git a/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
index 5c39b53b0a..a8270363d2 100644
--- a/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
+++ b/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
@@ -4,7 +4,7 @@ Bundle-Name: ConversationTest
Bundle-SymbolicName: conversation.ConversationalReferenceClient
Bundle-Version: 1.0.0
Bundle-Localization: plugin
-Import-Package: org.osgi.framework, org.osoa.sca, org.osoa.sca.annotations,
+Import-Package: org.osgi.framework, org.oasisopen.sca, org.oasisopen.sca.annotation,
conversation.service
Export-Package: conversation.referenceclient
Bundle-Activator: conversation.referenceclient.ConversationalReferenceClientActivator
diff --git a/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
index b8bb809319..6062757a32 100644
--- a/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
+++ b/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
@@ -4,7 +4,7 @@ Bundle-Name: ConversationTest
Bundle-SymbolicName: conversation.ConversationalService
Bundle-Version: 1.0.0
Bundle-Localization: plugin
-Import-Package: org.osgi.framework, org.osoa.sca, org.osoa.sca.annotations,
+Import-Package: org.osgi.framework, org.oasisopen.sca, org.oasisopen.sca.annotation,
conversation.client
Export-Package: conversation.service
Bundle-Activator: conversation.service.ConversationalServiceActivator
diff --git a/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf b/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
index 6a3c845cca..19b41cf4a4 100644
--- a/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
+++ b/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
@@ -5,7 +5,7 @@ Bundle-SymbolicName: ds.helloworld.sdo.HelloWorldClient
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Import-Package: org.osgi.framework, org.osgi.service.component,
- org.osoa.sca, org.osoa.sca.annotations,
+ org.oasisopen.sca, org.oasisopen.sca.annotation,
commonj.sdo, commonj.sdo.helper,
org.apache.tuscany.sdo.helper, org.apache.tuscany.sdo.impl, org.apache.tuscany.sdo.model, org.apache.tuscany.sdo.model.impl,
org.eclipse.emf.ecore, org.eclipse.emf.ecore.util, org.eclipse.emf.ecore.impl,
diff --git a/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf b/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
index 89871fa8f6..d730273c0e 100644
--- a/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
+++ b/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
@@ -5,7 +5,7 @@ Bundle-SymbolicName: ds.helloworld.sdo.HelloWorldService
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Import-Package: org.osgi.framework, org.osgi.service.component,
- org.osoa.sca, org.osoa.sca.annotations,
+ org.oasisopen.sca, org.oasisopen.sca.annotation,
commonj.sdo, commonj.sdo.helper,
org.apache.tuscany.sdo.helper, org.apache.tuscany.sdo.impl, org.apache.tuscany.sdo.model, org.apache.tuscany.sdo.model.impl,
org.eclipse.emf.ecore, org.eclipse.emf.ecore.util, org.eclipse.emf.ecore.impl