diff options
| author | mcombellack <mcombellack@13f79535-47bb-0310-9956-ffa450edef68> | 2009-01-28 14:07:54 +0000 |
|---|---|---|
| committer | mcombellack <mcombellack@13f79535-47bb-0310-9956-ffa450edef68> | 2009-01-28 14:07:54 +0000 |
| commit | cd174bad484f3d6f2f755d9fe517b0b37d7f928b (patch) | |
| tree | 064000c6d9c5f6ee61031848b46e8299f07086ec /java/sca/itest | |
| parent | 85060ec6b7a53cb76d969e5d30d80538c7f7ccb9 (diff) | |
TUSCANY-2790 - Updated package names from org.osoa.sca to org.oasisopen.sca and from org.osoa.sca.annotations to org.oasisopen.sca.annotation to reflect the new package names in the OASIS Open SCA specifications.
To do this, I:
* Renamed the org.osoa.sca package to org.oasisopen.sca using Eclipse refactoring
* Renamed the org.osoa.sca.annotations package to org.oasisopen.sca.annotation using Eclipse refactoring
* Did a global search and replace for all remaining instances of the old org.osoa package names and replaced with the new org.oasisopen version
Hopefully, I have not missed too many instances of the old package name
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@738490 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
482 files changed, 993 insertions, 993 deletions
diff --git a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java index b3d2137767..f081537dab 100644 --- a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java +++ b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java @@ -1,6 +1,6 @@ package org.apache.tuscany.sca.itest.admin;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface MyListService {
diff --git a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java index 025302fb6d..b4224e286e 100644 --- a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java +++ b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java @@ -1,6 +1,6 @@ package org.apache.tuscany.sca.itest.admin;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface MyListServiceByYear {
diff --git a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java index de480e6d85..550303d856 100644 --- a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java +++ b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java @@ -3,9 +3,9 @@ package org.apache.tuscany.sca.itest.admin; import java.util.List;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import org.apache.tuscany.sca.itest.admin.MyListService;
import org.apache.tuscany.sca.itest.admin.MyListServiceByYear;
diff --git a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java index bd820884e7..344d0cb6b5 100644 --- a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java +++ b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java @@ -2,7 +2,7 @@ package org.apache.tuscany.sca.itest.admin; import java.util.Date;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface MyServiceByDate {
diff --git a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java index fa2720001b..9789726156 100644 --- a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java +++ b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java @@ -2,11 +2,11 @@ package org.apache.tuscany.sca.itest.admin; import java.util.Date;
-import org.osoa.sca.annotations.ComponentName;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.ComponentName;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Service;
import org.apache.tuscany.sca.itest.admin.MyListService;
import org.apache.tuscany.sca.itest.admin.MyListServiceByYear;
import org.apache.tuscany.sca.itest.admin.MyLogger;
diff --git a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java index d712662cb3..dbb190beee 100644 --- a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java +++ b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java @@ -3,9 +3,9 @@ package org.apache.tuscany.sca.itest.admin; import java.util.Date;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.ComponentName;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
+import org.oasisopen.sca.annotation.ComponentName;
import org.apache.tuscany.sca.itest.admin.MyListService;
import org.apache.tuscany.sca.itest.admin.MyListServiceByYear;
import org.apache.tuscany.sca.itest.admin.MyService;
diff --git a/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java b/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java index d1b4ecbd15..3a546dcf72 100644 --- a/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java +++ b/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java @@ -19,7 +19,7 @@ package itest;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class MyClientImpl implements MyService {
diff --git a/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyService.java b/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyService.java index e5123f087c..b1daa53c86 100644 --- a/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyService.java +++ b/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyService.java @@ -19,7 +19,7 @@ package itest;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface MyService {
diff --git a/java/sca/itest/binding-sca-jms/service/src/main/java/itest/MyService.java b/java/sca/itest/binding-sca-jms/service/src/main/java/itest/MyService.java index e5123f087c..b1daa53c86 100644 --- a/java/sca/itest/binding-sca-jms/service/src/main/java/itest/MyService.java +++ b/java/sca/itest/binding-sca-jms/service/src/main/java/itest/MyService.java @@ -19,7 +19,7 @@ package itest;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface MyService {
diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java index 532b84bd22..d7dff093f9 100644 --- a/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java +++ b/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java @@ -18,7 +18,7 @@ */ package greetings; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java index 86d7f245e8..5ecf5494be 100644 --- a/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java +++ b/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java @@ -18,7 +18,7 @@ */ package greetings; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java index 672dbdc0b5..f46893481b 100644 --- a/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for the helloworld service diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java index d7ebd5cbb8..a687534bb2 100644 --- a/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java +++ b/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java @@ -20,7 +20,7 @@ package helloworld; import greetings.GreetingsService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * The HelloWorld service implementation diff --git a/java/sca/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/java/sca/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java index ffdbc50a22..0999e97065 100644 --- a/java/sca/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java +++ b/java/sca/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java @@ -20,7 +20,7 @@ package helloworld; import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/java/sca/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java index ffdbc50a22..0999e97065 100644 --- a/java/sca/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java +++ b/java/sca/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java @@ -20,7 +20,7 @@ package helloworld; import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java index 932ae3987a..fb23a4e60f 100644 --- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java +++ b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.itest.builder; import java.util.List;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* Implementation class for ComponentD.
diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java index f9ef0a1b4f..5ee020e181 100644 --- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java +++ b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.itest.builder; import java.util.List;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* Implementation class for ComponentD.
diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java index c041a76b47..2d8a37d5f0 100644 --- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java +++ b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.itest.builder;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* Implementation class for ComponentD.
diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java index ccfeff0997..4fdaac1fb1 100644 --- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java +++ b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.itest.builder;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* Implementation class for ComponentD.
diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java index 9a775feec9..1feb08b876 100644 --- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java +++ b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java @@ -18,7 +18,7 @@ */
package org.apache.tuscany.sca.itest.builder;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* Interface for Service3 in ComponentD.
diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java index 98a1741fb6..3a872376ea 100644 --- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java +++ b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java @@ -18,7 +18,7 @@ */
package org.apache.tuscany.sca.itest.builder;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* Interface for Service3a in ComponentD.
diff --git a/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java b/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java index c46087d865..9a486b3be0 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java @@ -18,13 +18,13 @@ */
package com.example;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
@Service(ExampleClient.class)
@Scope("COMPOSITE")
diff --git a/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java b/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java index 670c145cc3..9264def0dc 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java @@ -18,9 +18,9 @@ */
package com.example;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface ExampleService {
diff --git a/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java b/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java index eb4d647a22..22aecc8b27 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java @@ -18,8 +18,8 @@ */
package com.example;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ServiceReference;
public class ExampleServiceImpl implements ExampleService {
diff --git a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java index bb5e57397d..6ecf3d662e 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.callablerefwsreturn; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Alpha { diff --git a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java index 6e5f1cedf9..64a11f0bf3 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java @@ -18,13 +18,13 @@ */ package org.apache.tuscany.sca.itest.callablerefwsreturn; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.Conversation; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.Conversation; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(Alpha.class) @Scope("COMPOSITE") diff --git a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java index 995e4fcf39..9861b0a85e 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.callablerefwsreturn; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Beta { diff --git a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java index be72fd779e..c870cd87fe 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java @@ -18,13 +18,13 @@ */ package org.apache.tuscany.sca.itest.callablerefwsreturn; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(Beta.class) @Scope("COMPOSITE") diff --git a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java index b73f26b573..ee9d0f0b26 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.callablerefwsreturn; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; +import org.oasisopen.sca.annotation.Remotable; @Remotable @Conversational diff --git a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java index c3abc4c65d..9a4f31d79d 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.callablerefwsreturn; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(Gamma.class) @Scope("CONVERSATION") diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java index 5934f16851..33783be887 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.callableref; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface AComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java index 7c2fd092dc..f99051cd5f 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java @@ -22,12 +22,12 @@ import java.io.ByteArrayOutputStream; import java.io.ObjectOutputStream; import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(AComponent.class) public class AComponentImpl implements AComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java index ade672b0ab..1cf3029d82 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.callableref; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface BComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java index 518e77d3a8..084572b6e5 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.callableref; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Service; @Service(BComponent.class) public class BComponentImpl implements BComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java index fdf80cc1c8..059f42c4d3 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.callableref; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java index cc8ec8f000..76fdd61191 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.callableref; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(CComponent.class) public class CComponentImpl implements CComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java index 48b697df31..8b2988b700 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.callableref; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface DComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java index 27ad48b9fe..a43b3818c5 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java @@ -24,10 +24,10 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary; -import org.osoa.sca.CallableReference; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Service; @Service(DComponent.class) public class DComponentImpl implements DComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java index abcedfa6e1..33bc49e4d8 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.callablerefconversational; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Conversational; /** * Simple conversational Service that is used to testing the method diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java index f2e0ce7582..36bafba562 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java @@ -18,12 +18,12 @@ */ package org.apache.tuscany.sca.itest.callablerefconversational; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Simple conversational Service that is used to testing the method diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java index ab21421c4d..bf5a2e65cc 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.callablerefreturn; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Alpha diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java index 5b5984b164..59fed12279 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java @@ -18,12 +18,12 @@ */ package org.apache.tuscany.sca.itest.callablerefreturn; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.Conversation; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.Conversation; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; @Scope("COMPOSITE") public class AlphaImpl implements Alpha { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java index 223c467f47..b8dd1c5640 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.callablerefreturn; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Beta diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java index ed4e66bec3..8425425c16 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java @@ -18,12 +18,12 @@ */ package org.apache.tuscany.sca.itest.callablerefreturn; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; @Scope("COMPOSITE") public class BetaImpl implements Beta diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java index e32051373f..445fb7bf7f 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.callablerefreturn; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; +import org.oasisopen.sca.annotation.Remotable; @Remotable @Conversational diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java index adf5a1c1ce..0670629bae 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.callablerefreturn; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; @Scope("CONVERSATION") public class GammaImpl implements Gamma diff --git a/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java b/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java index a9cbb5d0a1..fb3a5d79b9 100644 --- a/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java +++ b/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java @@ -25,7 +25,7 @@ import org.apache.tuscany.sca.itest.callablerefconversational.ConversationalServ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.ServiceReference; /** * Simple test case that creates a ServiceReference to a Conversational Component diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java index 11996c82d7..b013462f9f 100644 --- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java +++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable /** diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java index 71709410b6..252e4dc45f 100644 --- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java +++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CallBackApiClient { diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java index e5526f6745..d883dc2d6f 100644 --- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java +++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.test; import org.junit.Assert; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(CallBackApiClient.class) public class CallBackApiClientImpl implements CallBackApiClient, CallBackApiCallBack { diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java index cef9418988..afb7c45e2c 100644 --- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java +++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; @Remotable @Callback(CallBackApiCallBack.class) diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java index 42ca10aa2d..bdac56d222 100644 --- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java +++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java @@ -18,12 +18,12 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Service; @Service(CallBackApiService.class) public class CallBackApiServiceImpl implements CallBackApiService { diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java index c1fb05c036..291a72b9d6 100644 --- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java +++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable /** diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java index fbda3a6d9f..19f366c423 100644 --- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java +++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CallBackBasicClient { diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java index 5cb87510b8..4bb6b29a8d 100644 --- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java +++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.test; import org.junit.Assert; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(CallBackBasicClient.class) public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBasicCallBack { diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java index 5b3bacd1a2..5396879e83 100644 --- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java +++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; @Remotable @Callback(CallBackBasicCallBack.class) diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java index 83b909ef37..07010f61e1 100644 --- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java +++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; @Service(CallBackBasicService.class) public class CallBackBasicServiceImpl implements CallBackBasicService { diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java index e8ab5c8205..627d37e27d 100644 --- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java +++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable /** diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java index 9f2af0f3dc..966ad17b9a 100644 --- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java +++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CallBackCTypeClient { diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java index afccce516e..d2dc0add75 100644 --- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java +++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.test; import org.junit.Assert; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(CallBackCTypeClient.class) public class CallBackCTypeClientImpl implements CallBackCTypeClient, CallBackCTypeCallBack { diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java index d3e207de18..e3fb7d6238 100644 --- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java +++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable // @Callback(CallBackCTypeCallBack.class) diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java index 5691b9d747..f7a1a195ed 100644 --- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java +++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; @Service(CallBackCTypeService.class) public class CallBackCTypeServiceImpl implements CallBackCTypeService { diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java index 2c90dfa84d..643cb3beb8 100644 --- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java +++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable /** diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java index cd1461b3c6..6e5a0c7654 100644 --- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java +++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CallBackIdClient { diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java index 4c57a433cd..aaf99a534b 100644 --- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java +++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java @@ -19,12 +19,12 @@ package org.apache.tuscany.sca.test; import org.junit.Assert; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(CallBackIdClient.class) public class CallBackIdClientImpl implements CallBackIdClient, CallBackIdCallBack { diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java index a0231ce458..cc7907f6ae 100644 --- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java +++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; @Remotable @Callback(CallBackIdCallBack.class) diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java index d21767167c..4f04959b9d 100644 --- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java +++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java @@ -18,11 +18,11 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Service; @Service(CallBackIdService.class) public class CallBackIdServiceImpl implements CallBackIdService { diff --git a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java index df91f3d268..0fe34b9d68 100644 --- a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java +++ b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.test.callback; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Demonstrates a component-to-component callback invocation diff --git a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java index a0a9564002..6b455a1f5b 100644 --- a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java +++ b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.test.callback; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Demonstrates a component-to-component callback invocation diff --git a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java index cfd601f546..66758a1e73 100644 --- a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java +++ b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.test.callback; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.OneWay; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.OneWay; /** * This service that will be invoked in a non-blocking fashion diff --git a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java index 856fbc4bde..49df5aa17a 100644 --- a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java +++ b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java @@ -18,10 +18,10 @@ */ package org.apache.tuscany.sca.test.callback; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * This class implements MyService and uses a callback. diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java index f812a39058..dc66003604 100644 --- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java +++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the client interface for the call backs in a separate thread tests diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java index c6cc285bcc..f03144db8a 100644 --- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java +++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java @@ -22,8 +22,8 @@ package org.apache.tuscany.sca.itest; import java.util.concurrent.atomic.AtomicInteger; import org.junit.Assert; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This is the client implementation for the call backs in a separate thread tests diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java index 3f86d14059..137ea6a658 100644 --- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java +++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The call back interface for the EventProcessorService that is implemented diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java index 127c63eb9e..a00578427c 100644 --- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java +++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java @@ -19,9 +19,9 @@ package org.apache.tuscany.sca.itest; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.Remotable; /** * Sample Event Processor Service diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java index 5c14dc9659..692ffbe8dd 100644 --- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java +++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java @@ -25,11 +25,11 @@ import java.util.TimerTask; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Sample Event Processor Service Implementation diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java index 8012fceb98..e54b9b4004 100644 --- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java +++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Callback; +import org.oasisopen.sca.annotation.Callback; // @Remotable @Callback(CallBackSetCallbackCallback.class) diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java index 0a22b0e01f..3e72b7ef3c 100644 --- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java +++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.test; import java.io.File; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(CallBackSetCallbackCallback.class) public class CallBackSetCallbackCallbackImpl implements CallBackSetCallbackCallback { diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java index 1161a5bf40..6fd13eec5f 100644 --- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java +++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CallBackSetCallbackClient { diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java index 98eb44de84..08c8b94a2f 100644 --- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java +++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java @@ -21,10 +21,10 @@ package org.apache.tuscany.sca.test; import java.io.File; import org.junit.Assert; -import org.osoa.sca.NoRegisteredCallbackException; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.NoRegisteredCallbackException; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(CallBackSetCallbackClient.class) public class CallBackSetCallbackClientImpl implements CallBackSetCallbackClient { diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java index 4ec37f0d8b..78bc793c81 100644 --- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java +++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java @@ -18,12 +18,12 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Service; @Service(CallBackSetCalbackService.class) public class CallBackSetCallbackServiceImpl implements CallBackSetCalbackService { diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java index b2096b28e7..825d1d6486 100644 --- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java +++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.annotation.Conversational; // @Remotable @Conversational diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java index 2a5fcd9bb2..b5c3e6e8b8 100644 --- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java +++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CallBackSetCallbackConvClient { diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java index 35f64d1344..12a206affa 100644 --- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java +++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java @@ -19,12 +19,12 @@ package org.apache.tuscany.sca.test; import org.junit.Assert; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(CallBackSetCallbackConvClient.class) @Scope("CONVERSATION") diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java index 7a7b47d04e..74c19961ba 100644 --- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java +++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Conversational; // @Remotable @Conversational diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java index 5532943943..d79b9278e2 100644 --- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java +++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java @@ -20,13 +20,13 @@ package org.apache.tuscany.sca.test; import java.io.File; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(CallBackSetCallbackConvService.class) @Scope("CONVERSATION") diff --git a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java index 814c38777a..8cadb2420e 100644 --- a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java +++ b/java/sca/itest/contribution-classloader/contribution-classes/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/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java index e4daf0ec02..6a4bb82953 100644 --- a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java @@ -18,9 +18,9 @@ */ package supplychain.customer; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.retailer.Retailer; diff --git a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java index e4b3bc7048..3c88ac9272 100644 --- a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java +++ b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java @@ -18,9 +18,9 @@ */ package supplychain.illegal; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.customer.Customer; import supplychain.retailer.JavaRetailerComponentImpl; diff --git a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java index 698aa2aa5d..e8342ee7b9 100644 --- a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.retailer; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.warehouse.Warehouse; diff --git a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java index 9e01f00a79..cf016617a6 100644 --- a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java +++ b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.shipper; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.customer.Customer; diff --git a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java index cdd12d589d..e81a11e55a 100644 --- a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java +++ b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java @@ -18,7 +18,7 @@ */ package supplychain.warehouse; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; import supplychain.shipper.Shipper; diff --git a/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java index b123951ef6..9918ce8fca 100644 --- a/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java +++ b/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java @@ -36,7 +36,7 @@ import org.junit.After; import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.osoa.sca.ServiceReference;
+import org.oasisopen.sca.ServiceReference;
/*
*
diff --git a/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java index e65422136f..32b024bccb 100644 --- a/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java +++ b/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java @@ -18,7 +18,7 @@ */
package hello;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* This is the business interface of the Hello service.
diff --git a/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java index 5369c18497..0c60e62d35 100644 --- a/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java +++ b/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java @@ -18,7 +18,7 @@ */
package hello;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the HelloWorld service.
diff --git a/java/sca/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java index 74d22ed830..134da7e34b 100644 --- a/java/sca/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */
package helloworld;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java index 966f56d7d5..05bd7b7138 100644 --- a/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java +++ b/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java @@ -20,8 +20,8 @@ package helloworld; import hello.Hello;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the HelloWorld service.
diff --git a/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java index 74d22ed830..134da7e34b 100644 --- a/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */
package helloworld;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java index 4cdcc1fd0b..2186c00e57 100644 --- a/java/sca/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java +++ b/java/sca/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java @@ -18,7 +18,7 @@ */
package helloworld;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the HelloWorld service.
diff --git a/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java index 4cdcc1fd0b..2186c00e57 100644 --- a/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java +++ b/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java @@ -18,7 +18,7 @@ */
package helloworld;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the HelloWorld service.
diff --git a/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java index 74d22ed830..134da7e34b 100644 --- a/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */
package helloworld;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/java/sca/itest/contribution-multiple/src/test/java/hello/HelloImpl.java index ff9f6e75f3..7cd950453d 100644 --- a/java/sca/itest/contribution-multiple/src/test/java/hello/HelloImpl.java +++ b/java/sca/itest/contribution-multiple/src/test/java/hello/HelloImpl.java @@ -18,7 +18,7 @@ */ package hello; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/java/sca/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java index c062afaed0..e90d10dc24 100644 --- a/java/sca/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java +++ b/java/sca/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java @@ -20,8 +20,8 @@ package helloworld; import hello.Hello; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java index ae4ed12b7b..d3fa7a8f41 100644 --- a/java/sca/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */
package calculator;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
/**
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java index 53dadc3dc7..b6c694c8a9 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.annotations.Conversational;
+import org.oasisopen.sca.annotation.Conversational;
@Conversational
public interface ConversationIdService {
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java index cb7a032e85..b6645aec23 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java @@ -18,9 +18,9 @@ */
package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Conversational;
+import org.oasisopen.sca.annotation.EndsConversation;
+import org.oasisopen.sca.annotation.Remotable;
/**
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java index 2532346349..772602568c 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java @@ -18,7 +18,7 @@ */
package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The client for the conversational itest. Is implemented by clients
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java index 8f008fa711..481ed7b388 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The client that calls into an existing conversation by accepting
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java index 1e36ce6917..c9d46b9072 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java @@ -18,10 +18,10 @@ */
package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Conversational;
+import org.oasisopen.sca.annotation.EndsConversation;
+import org.oasisopen.sca.annotation.Remotable;
/**
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java index b4d3fe3d71..b46cb831df 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java @@ -18,10 +18,10 @@ */
package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Conversational;
+import org.oasisopen.sca.annotation.EndsConversation;
+import org.oasisopen.sca.annotation.Remotable;
/**
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java index ed3a01c10b..4c3809676c 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java @@ -18,7 +18,7 @@ */
package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java index 1603916cca..2d048a76b5 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java @@ -21,9 +21,9 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.BusinessException;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.ConversationAttributes;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
@Service(ConversationalService.class)
@Scope("CONVERSATION")
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java index accc1eee27..34b8fbe9d0 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java @@ -20,9 +20,9 @@ package org.apache.tuscany.sca.itest.conversational.impl;
import org.apache.tuscany.sca.itest.conversational.ConversationIdService;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.ConversationID;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
@Service(ConversationIdService.class)
@Scope("CONVERSATION")
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java index 90f6de86ac..0d3ca8d350 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java @@ -21,9 +21,9 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.BusinessException;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.ConversationAttributes;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
@Service(ConversationalService.class)
@Scope("CONVERSATION")
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java index 3f7a90b3dc..db3bcabe02 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java @@ -23,15 +23,15 @@ import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-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.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.ConversationAttributes;
+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;
/**
* The client for the conversational itest which presents a stateful
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java index ab91498132..e25f367cf6 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java @@ -23,15 +23,15 @@ import org.apache.tuscany.sca.itest.conversational.ConversationalClient; import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;
-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.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.ConversationAttributes;
+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;
/**
* The client for the conversational itest which presents a stateful
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java index e4f83656de..3ac259ed7c 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java @@ -23,13 +23,13 @@ import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-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.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.Service;
/**
* The client for the conversational itest which presents a stateful
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java index 8fe7c5b6ba..1abe9e51c3 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.Service;
/**
* A client component that accepts a reference to an ongoing conversation
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java index 9f4857f703..fc485b6c4b 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java @@ -23,12 +23,12 @@ import java.util.HashMap; import org.apache.tuscany.sca.itest.conversational.BusinessException;
import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-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;
/**
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java index 4b06251414..a783e79cae 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java @@ -21,13 +21,13 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.BusinessException;
import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-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;
/**
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java index be039748fc..5f34de66b3 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java @@ -21,13 +21,13 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.BusinessException;
import org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback;
import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;
-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;
/**
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java index 42f2f1a603..02a2fb1d4d 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java @@ -23,11 +23,11 @@ import java.util.HashMap; import org.apache.tuscany.sca.itest.conversational.BusinessException;
import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-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.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.Service;
/**
diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java index a852aeda56..4550e3eaa1 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java @@ -24,8 +24,8 @@ import java.util.Map; import org.apache.tuscany.sca.itest.conversational.BusinessException;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.ConversationID;
+import org.oasisopen.sca.annotation.Service;
@Service(ConversationalService.class)
public class ConversationalServiceStatelessScopeImpl implements ConversationalService {
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java index e7583c339a..27939e3996 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java @@ -18,7 +18,7 @@ */
package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.annotations.Conversational;
+import org.oasisopen.sca.annotation.Conversational;
/**
* Simple conversational Service that uses another Conversational Service
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java index bc4a5fc571..7887417e55 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java index eeb7aa98e2..735bcee176 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java @@ -18,7 +18,7 @@ */
package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.annotations.Conversational;
+import org.oasisopen.sca.annotation.Conversational;
/**
* Simple conversational Service
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java index e422938b27..1c5d2cdbb8 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java index e8887071c3..cebbea0701 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.annotation.Conversational; /** * Simple conversational Service that uses another Conversational Service diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java index f0f5ac041d..9ca4abb9d3 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.annotations.Conversational;
+import org.oasisopen.sca.annotation.Conversational;
@Conversational
public interface ConversationIdService {
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java index fff6320e76..734fb9fe7b 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java @@ -18,9 +18,9 @@ */
package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Conversational;
+import org.oasisopen.sca.annotation.EndsConversation;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The callback interface used when testing conversational callbacks
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java index d9d989c830..99f4c85d8f 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java @@ -18,7 +18,7 @@ */
package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The client for the conversational itest. Is implemented by clients
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java index 3de73e4f42..fb4ecb56e7 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The client that calls into an existing conversation by accepting
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java index 2aba0799bc..21a4db737e 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java @@ -18,10 +18,10 @@ */
package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Conversational;
+import org.oasisopen.sca.annotation.EndsConversation;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The service interface used when testing conversations
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java index 9fb4a0b473..48c1644b87 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java @@ -18,10 +18,10 @@ */
package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Conversational;
+import org.oasisopen.sca.annotation.EndsConversation;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The service interface used when testing conversations
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java index e7295a6aee..2c205c2cae 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; /** * Simple conversational Service diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java index 5f97b16088..48c203ab35 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java @@ -19,9 +19,9 @@ package org.apache.tuscany.sca.itest.conversational; import org.apache.tuscany.sca.itest.Record; -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; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java index d356b7d20a..614c0a96b5 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java @@ -18,7 +18,7 @@ */
package org.apache.tuscany.sca.itest.conversational;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The callback interface used when testing conversational callbacks
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java index 3b71679675..86a96aaa75 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java @@ -21,10 +21,10 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.AService;
import org.apache.tuscany.sca.itest.conversational.BService;
import org.apache.tuscany.sca.itest.conversational.Constants;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.ConversationID;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
/**
* Simple conversational Service that uses another Conversational Service
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java index 1a3cc562d6..b56186ea88 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java @@ -23,12 +23,12 @@ import org.apache.tuscany.sca.itest.TestResult; import org.apache.tuscany.sca.itest.conversational.Alpha; import org.apache.tuscany.sca.itest.conversational.Beta; import org.apache.tuscany.sca.itest.conversational.Gamma; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java index fd3734a953..f394770ffc 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java @@ -20,9 +20,9 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.BService;
import org.apache.tuscany.sca.itest.conversational.Constants;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.ConversationID;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
/**
* Simple conversational Service
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java index e2bca68220..b94e8a6452 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java @@ -20,13 +20,13 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.Beta; import org.apache.tuscany.sca.itest.conversational.Gamma; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java index d13ff53350..737c2940dd 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java @@ -20,10 +20,10 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.CService; import org.apache.tuscany.sca.itest.conversational.DService; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Simple conversational Service that uses another Conversational Service diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java index 8dccf41820..8f2736ad2d 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java @@ -20,9 +20,9 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(ConversationalService.class) @Scope("CONVERSATION") diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java index efbae3ad16..8b3a8663d8 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java @@ -20,9 +20,9 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.ConversationIdService; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(ConversationIdService.class) @Scope("CONVERSATION") diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java index 0604d0ca98..ae8bee8040 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java @@ -20,9 +20,9 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(ConversationalService.class) @Scope("CONVERSATION") diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java index 08d618018d..3784dfd53e 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java @@ -22,15 +22,15 @@ import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-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.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.ConversationAttributes;
+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;
/**
* The client for the conversational itest which presents a stateful
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java index 7dbf7bcd3e..137dfc4108 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java @@ -22,15 +22,15 @@ import org.apache.tuscany.sca.itest.conversational.ConversationalClient; import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;
-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.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.ConversationAttributes;
+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;
/**
* The client for the conversational itest which presents a stateful
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java index ddfed4519f..c9c5138515 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java @@ -22,13 +22,13 @@ import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-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.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.Service;
/**
* The client for the conversational itest which presents a stateful
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java index 14487dcf69..134ffda75d 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.annotation.Service;
/**
* A client component that accepts a reference to an ongoing conversation
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java index ee24fca53d..73a6d7d27e 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java @@ -22,12 +22,12 @@ import java.util.HashMap; import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-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;
/**
* The service used when testing stateful conversations
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java index cf95cc83f3..5bafa5e075 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java @@ -20,13 +20,13 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-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;
/**
* The service used when testing stateful conversations
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java index ebb474e3fe..8d63ebbbef 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java @@ -20,13 +20,13 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback;
import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;
-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;
/**
* The service used when testing stateful conversations
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java index cc02d048b6..ecf108c656 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java @@ -22,12 +22,12 @@ import java.util.HashMap; import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-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;
/**
* The service used when testing stateful conversations
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java index 3abeda9ba3..ee09e99f1b 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java @@ -23,8 +23,8 @@ import java.util.HashMap; import java.util.Map;
import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.ConversationID;
+import org.oasisopen.sca.annotation.Service;
@Service(ConversationalService.class)
public class ConversationalServiceStatelessScopeImpl implements ConversationalService {
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java index 610a81aaa8..ad0c1fb7da 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java @@ -19,9 +19,9 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.DService; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Simple conversational Service diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java index 67305698f1..55390189cf 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java @@ -22,9 +22,9 @@ import java.util.ArrayList; import org.apache.tuscany.sca.itest.Record; import org.apache.tuscany.sca.itest.conversational.Gamma; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java index 58afba0d10..a686754d3a 100644 --- a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java +++ b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java @@ -27,7 +27,7 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.osoa.sca.ConversationEndedException; +import org.oasisopen.sca.ConversationEndedException; public class ConversationalAgeTestCase { diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java index 4f6eacc9ff..1bc2156183 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.corba.types; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java index a3be6daa23..a198eaf646 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.corba.types; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java index aec0f7b1bf..aa2f06909b 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.test.corba.types; import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java index 04aef326af..c7569720f0 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.corba.types; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java index 30e4e2994a..1813de4e67 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java @@ -24,7 +24,7 @@ import org.apache.tuscany.sca.test.corba.generated.ScenarioOne; import org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations; import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; import org.apache.tuscany.sca.test.corba.generated.WrongColor; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java index a4f15488cd..ac7b0af175 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.test.corba.types; import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; import org.apache.tuscany.sca.test.corba.generated.WrongColor; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java index 7d43badb23..13bc1d499e 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.corba.types; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java index 917cceedf5..12b0f404ae 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.corba.types; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java index d7c72b40da..937d82b33e 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.corba.types; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm index b2346aa973..db24ceab14 100644 --- a/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm +++ b/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm @@ -22,8 +22,8 @@ package $template.getJavaPackage(); import junit.framework.TestCase; import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; import ${template.getJavaPackage()}.GreeterService; diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm index 77a12e92ec..2df4a558e6 100644 --- a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm +++ b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm @@ -26,7 +26,7 @@ import $file.getJavaPackage().$typeInstance.getTypeName(); #end #end -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The automatically generated interface to the service that reflects data objects diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm index ee73db6152..b73173247f 100644 --- a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm +++ b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm @@ -26,7 +26,7 @@ import $file.getJavaPackage().$typeInstance.getTypeName(); #end #end -import org.osoa.sca.annotations.AllowsPassByReference; +import org.oasisopen.sca.annotation.AllowsPassByReference; /** * GreeterServiceClient diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm index aab564dc1e..46c74ec819 100644 --- a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm +++ b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm @@ -19,8 +19,8 @@ package $template.getJavaPackage(); -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; #foreach($file in $fileList) #set($typeList = $file.getType_()) diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm index 5507a0b747..2fd10ef0bf 100644 --- a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm +++ b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm @@ -26,7 +26,7 @@ import $file.getJavaPackage().$typeInstance.getTypeName(); #end #end -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * The automatically generated service implementation that reflects data objects diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java index 7f9b62f9b4..5d389643cc 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.databindings.jaxb; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for AClientService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java index 1762812c1f..52f1c01fd8 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.itest.databindings.jaxb; import javax.jws.soap.SOAPBinding; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for AService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java index 12ed7d0ec7..be446c9759 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.databindings.jaxb; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for GenericsService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java index 34ac9024f6..df9e6e53ec 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.databindings.jaxb; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for HelloServiceSimple. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java index c5553688e2..690a2adb3d 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.databindings.jaxb; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for PrimitivesService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java index 2842205085..3b9690b7d2 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.databindings.jaxb; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java index 8b484e93f0..2f3bd3f2cb 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.AClientService; import org.apache.tuscany.sca.itest.databindings.jaxb.AService; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements AService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java index 4a35d41c04..078be8896e 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.AService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements AService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java index 9e042ffe6a..4d451e6d32 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java @@ -24,8 +24,8 @@ import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2; import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3; import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService; import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of GenericsLocalServiceClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java index ec929ddece..d520e64881 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService; import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of GenericsServiceClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java index 58808eec4f..27dc25289e 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java @@ -24,7 +24,7 @@ import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2; import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3; import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService; import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of GenericsService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java index 51e48edbc9..37b3f1b680 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java @@ -26,8 +26,8 @@ import java.util.Map; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimpleClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of HelloServiceSimpleClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java index de52cdfac3..44b6e9d906 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimpleClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of HelloServiceSimpleClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java index 199335c38c..5c389bf67f 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java @@ -26,7 +26,7 @@ import java.util.Map; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of HelloServiceSimple. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java index fe9121be9d..eea19521c4 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of PrimitivesLocalServiceClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java index 28ace6aab7..263d1212ca 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of PrimitivesServiceClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java index ab1a3b4ab8..9e14140752 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of PrimitivesService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java index 0a8f6772b5..3ceee3c4b1 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java @@ -35,8 +35,8 @@ import javax.xml.transform.Source; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of StandardTypesLocalServiceClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java index 626b0e9844..6aefb05c83 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of StandardTypesServiceClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java index 19a6cae01b..42fb9cbac2 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java @@ -35,7 +35,7 @@ import javax.xml.transform.Source; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of StandardTypesService. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java index 352f805c7d..ab2d9630eb 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for HelloService. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java index 8c0fb24da9..ac6c8d5a60 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.databindings.jaxb; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for PrimitivesService. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java index 4be057fe68..1f3b7ec633 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java @@ -32,7 +32,7 @@ import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import javax.xml.transform.Source; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java index c4026fdb9a..61449c8981 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java @@ -26,8 +26,8 @@ import java.util.Map; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloService; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of HelloServiceClient. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java index fc2dc64b7d..c0868f0146 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of HelloService. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java index ef1a907b29..e55d2527f4 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of PrimitivesServiceClient. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java index e60ae41767..72ff27b85e 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of PrimitivesService. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java index 8803eb262a..b3d3c3eb3a 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java @@ -35,8 +35,8 @@ import javax.xml.transform.Source; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of StandardTypesServiceClient. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java index 46569311ff..b58d04a04c 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java @@ -34,7 +34,7 @@ import javax.xml.namespace.QName; import javax.xml.transform.Source; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of StandardTypesService. diff --git a/java/sca/itest/definitions-multiple/src/main/java/calculator/AddService.java b/java/sca/itest/definitions-multiple/src/main/java/calculator/AddService.java index 3e56bf3fad..198a38b657 100644 --- a/java/sca/itest/definitions-multiple/src/main/java/calculator/AddService.java +++ b/java/sca/itest/definitions-multiple/src/main/java/calculator/AddService.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.annotation.Service; /** * The Add service interface diff --git a/java/sca/itest/definitions-multiple/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/itest/definitions-multiple/src/main/java/calculator/CalculatorServiceImpl.java index c4cb5ad9d2..b4a797e597 100644 --- a/java/sca/itest/definitions-multiple/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/itest/definitions-multiple/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/itest/definitions-multiple/src/main/java/calculator/DivideService.java b/java/sca/itest/definitions-multiple/src/main/java/calculator/DivideService.java index f72b05cece..8f4c675370 100644 --- a/java/sca/itest/definitions-multiple/src/main/java/calculator/DivideService.java +++ b/java/sca/itest/definitions-multiple/src/main/java/calculator/DivideService.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.annotation.Service; /** * The divide service interface diff --git a/java/sca/itest/domain/src/main/java/calculator/AddService.java b/java/sca/itest/domain/src/main/java/calculator/AddService.java index 797ebb4024..138213b5fc 100644 --- a/java/sca/itest/domain/src/main/java/calculator/AddService.java +++ b/java/sca/itest/domain/src/main/java/calculator/AddService.java @@ -18,7 +18,7 @@ */
package calculator;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The Add service interface
diff --git a/java/sca/itest/domain/src/main/java/calculator/CalculatorService.java b/java/sca/itest/domain/src/main/java/calculator/CalculatorService.java index 2718ab8772..12d80ffd1c 100644 --- a/java/sca/itest/domain/src/main/java/calculator/CalculatorService.java +++ b/java/sca/itest/domain/src/main/java/calculator/CalculatorService.java @@ -18,7 +18,7 @@ */
package calculator;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
diff --git a/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java index 3cb255843f..6250563a09 100644 --- a/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */
package calculator;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
/**
diff --git a/java/sca/itest/domain/src/main/java/calculator/SubtractService.java b/java/sca/itest/domain/src/main/java/calculator/SubtractService.java index 615320e670..be3f1a61fc 100644 --- a/java/sca/itest/domain/src/main/java/calculator/SubtractService.java +++ b/java/sca/itest/domain/src/main/java/calculator/SubtractService.java @@ -18,7 +18,7 @@ */
package calculator;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The interface for the multiply service
diff --git a/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java index 4f4fe50041..ffef7a4d71 100644 --- a/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java +++ b/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.test.exceptions.impl.jaxb.ObjectFactory; import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest; import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer; import org.apache.tuscany.sca.test.exceptions.impl.jaxb.TestNotDeclaredAtSourceFault; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * JAXB version of StockExceptionTest impl diff --git a/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java index 842dd4e602..1147b4c715 100644 --- a/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java +++ b/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java @@ -24,8 +24,8 @@ import java.rmi.RemoteException; import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException; import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException; import org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest; -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 stockexceptiontestservice.scatesttool.ScatesttoolFactory; import stockexceptiontestservice.scatesttool.StockOffer; diff --git a/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java index ab65efbb58..4ee01fa303 100644 --- a/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java +++ b/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java @@ -24,7 +24,7 @@ */ package org.apache.tuscany.sca.test.exceptions.sdohandgen; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; import stockexceptiontestservice.scatesttool.StockOffer; diff --git a/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java index fc49fa1d7d..3e9febb6bc 100644 --- a/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java +++ b/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java @@ -23,7 +23,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.host.embedded.SCADomain; import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO; import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; import stockexceptiontestservice.scatesttool.InvalidSymbolFault; import stockexceptiontestservice.scatesttool.StockOffer; diff --git a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java index f5e36db7cd..456cf07116 100644 --- a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java +++ b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.test.exceptions.impl; import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * diff --git a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java index 65751175fb..ed2a287bcc 100644 --- a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java +++ b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java @@ -25,7 +25,7 @@ import org.apache.tuscany.sca.test.exceptions.impl.jaxb.MarketClosedFault; import org.apache.tuscany.sca.test.exceptions.impl.jaxb.ObjectFactory; import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer; import org.apache.tuscany.sca.test.exceptions.impl.jaxb.TestNotDeclaredAtSourceFault; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * diff --git a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java index e84ae633e7..32ba65bd6b 100644 --- a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java +++ b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java @@ -24,8 +24,8 @@ import java.rmi.RemoteException; import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException; import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException; import org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest; -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 stockexceptiontestservice.scatesttool.ScatesttoolFactory; import stockexceptiontestservice.scatesttool.StockOffer; diff --git a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java index ab65efbb58..4ee01fa303 100644 --- a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java +++ b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java @@ -24,7 +24,7 @@ */ package org.apache.tuscany.sca.test.exceptions.sdohandgen; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; import stockexceptiontestservice.scatesttool.StockOffer; diff --git a/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java index 3371f63e4a..e65a1d4b64 100644 --- a/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java +++ b/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java @@ -23,7 +23,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.host.embedded.SCADomain; import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO; import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; import stockexceptiontestservice.scatesttool.InvalidSymbolFault; import stockexceptiontestservice.scatesttool.StockOffer; diff --git a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java index d6545b5a23..5e80b7bdde 100644 --- a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java +++ b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java @@ -18,9 +18,9 @@ */ package com.example; -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; @Service(ExampleClient.class) @Scope("COMPOSITE") diff --git a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java index 987d2107b5..35f55b525a 100644 --- a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java +++ b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java @@ -18,9 +18,9 @@ */ package com.example; -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; //@Service(ExampleClient.class) @Scope("COMPOSITE") diff --git a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java index 30ea559694..1e887995dd 100644 --- a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java +++ b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java @@ -18,7 +18,7 @@ */ package com.example; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface ExampleService { diff --git a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java index aa8591872e..2a305913c8 100644 --- a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java +++ b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java @@ -18,7 +18,7 @@ */ package com.example; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface ExampleServiceMinimal { diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java index f923133ee9..53a6c70b57 100644 --- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java +++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.exceptions; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * Remote exception thrower diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java index 98cb71bdc0..26b9f0a383 100644 --- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java +++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java @@ -23,8 +23,8 @@ import org.apache.tuscany.sca.test.exceptions.Checked; import org.apache.tuscany.sca.test.exceptions.ExceptionHandler; import org.apache.tuscany.sca.test.exceptions.ExceptionThrower; import org.apache.tuscany.sca.test.exceptions.UnChecked; -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 ExceptionHandlerImpl implements ExceptionHandler { diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java index c4cb52f94c..cd62338841 100644 --- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java +++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.test.exceptions.impl; import org.apache.tuscany.sca.test.exceptions.Checked; import org.apache.tuscany.sca.test.exceptions.ExceptionRemoteThrower; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java index cf8740ba56..56b9fc6f5b 100644 --- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java +++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.test.exceptions.impl; import org.apache.tuscany.sca.test.exceptions.Checked; import org.apache.tuscany.sca.test.exceptions.ExceptionThrower; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java index bca32122f6..c5b54ff902 100644 --- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java +++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java @@ -24,8 +24,8 @@ import org.apache.tuscany.sca.test.exceptions.ExceptionHandler; import org.apache.tuscany.sca.test.exceptions.ExceptionRemoteThrower; import org.apache.tuscany.sca.test.exceptions.ExceptionThrower; import org.apache.tuscany.sca.test.exceptions.UnChecked; -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 RemoteExceptionHandlerImpl implements ExceptionHandler { diff --git a/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java index 523d238f2e..b716c0dd07 100644 --- a/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java +++ b/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java @@ -21,9 +21,9 @@ package org.apache.tuscany.sca.test.extended.impl; import org.apache.tuscany.sca.host.embedded.SCADomain; import org.apache.tuscany.sca.test.extended.BasicService; import org.apache.tuscany.sca.test.extended.MathService; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Service; @Service(BasicService.class) public class BasicServiceImpl implements BasicService { diff --git a/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java index ab4300a7dd..869f951342 100644 --- a/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java +++ b/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.extended.impl; import org.apache.tuscany.sca.test.extended.MathService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(MathService.class) public class MathServiceImpl implements MathService { diff --git a/java/sca/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/java/sca/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java index c480235d88..d0f20f98fc 100644 --- a/java/sca/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java +++ b/java/sca/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java @@ -24,7 +24,7 @@ import org.apache.tuscany.sca.host.embedded.SCADomain; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; public class ServiceLocateTestCase { diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java index 7bfcf5de11..5fc9ed51b3 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.OneWay; +import org.oasisopen.sca.annotation.OneWay; /* * itest for interface: local,method-overloading diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java index d4f7694e8f..6cd937af12 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(LocalClientComponent.class) public class LocalClientComponentImpl implements LocalClientComponent, LocalCallbackInterface { diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java index 4772303fab..05a9d09bdd 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.Callback; +import org.oasisopen.sca.annotation.Callback; /** * Local be-directional callBackService diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java index e100636b23..ab0b18191c 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; @Service(LocalServiceComponent.class) public class LocalServiceComponentImpl implements LocalServiceComponent { diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java index 703e1fd111..be3fa4c15a 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * only for callBack diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java index c877fb7b4c..9f34dfd274 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java @@ -37,7 +37,7 @@ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /* * different signatures diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java index 5773d1e83f..541b1f1508 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java @@ -19,9 +19,9 @@ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.AllowsPassByReference; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(RemoteClientComponent.class) public class RemoteClientComponentImpl implements RemoteClientComponent, RemoteCallbackInterface { diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java index 065e39a8a9..b29b298ab6 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; @Remotable @Callback(RemoteCallbackInterface.class) diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java index 3804d31902..00a0f5645b 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; @Service(RemoteServiceComponent.class) public class RemoteServiceComponentImpl implements RemoteServiceComponent { diff --git a/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java b/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java index ffffb96686..f210545130 100644 --- a/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java +++ b/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java @@ -20,7 +20,7 @@ package org.apache.tuscany.test.interop.client; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; import org.soapinterop.ComplexDocument; import org.soapinterop.DocTestPortType; import org.soapinterop.SimpleDocument1; diff --git a/java/sca/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java b/java/sca/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java index bb379c89cd..251f64bd6b 100644 --- a/java/sca/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java +++ b/java/sca/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java @@ -23,8 +23,8 @@ import java.util.Arrays; import java.util.List; import org.apache.tuscany.test.SCATestCase; -import org.osoa.sca.CompositeContext; -import org.osoa.sca.CurrentCompositeContext; +import org.oasisopen.sca.CompositeContext; +import org.oasisopen.sca.CurrentCompositeContext; import org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType; import org.soapinterop.xsd.ArrayOfstring_literal; import org.soapinterop.xsd.SOAPStruct; diff --git a/java/sca/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java b/java/sca/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java index c34941f43e..9892828ca2 100644 --- a/java/sca/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java +++ b/java/sca/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java @@ -20,7 +20,7 @@ package org.apache.tuscany.test.interop.server; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; import org.soapinterop.ComplexDocument; import org.soapinterop.DocTestPortType; import org.soapinterop.SimpleDocument1; diff --git a/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java index 51ce5f4f24..68506b857b 100644 --- a/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java +++ b/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the OneWay service.
diff --git a/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java index 487e5f2cbb..5f19aa1fa5 100644 --- a/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java +++ b/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface MyService {
diff --git a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java index 9d75685a8a..a4d5190af3 100644 --- a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java +++ b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* Remote Web service client with callback interface
diff --git a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java index 9c2c657b55..b78feab413 100644 --- a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java +++ b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java @@ -18,9 +18,9 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The remote service that will be invoked by the client
diff --git a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java index 5697d819c7..20b74ccc1a 100644 --- a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java +++ b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The callback interface for {@link JMSService}.
diff --git a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java index b15b40c8a6..e8357338ae 100644 --- a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java +++ b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements MyService and uses a callback.
diff --git a/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java index 4d00d2df0d..b572b1012a 100644 --- a/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java +++ b/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the OneWay service.
diff --git a/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java index 377f227ceb..9cec2d9b3e 100644 --- a/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java +++ b/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface OneWayService {
diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java index b1f62c1422..646cecc2b7 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java index 878fdb4fe4..25a7e36fce 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldReference { diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java index 82c57dfe75..f5596df894 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java index ba563b658f..735725e9c2 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsdelimited.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java index e5677169fe..c2c991f857 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsdelimited.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldReference { diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java index 623fd43871..2fb1c49685 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsdelimited.helloworld; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java index 948732adb4..e67f2ba8fa 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java index ed697f8a38..21b4d0461e 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldReference { diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java index 574188d466..43e623f192 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java index 39af400f6a..feee945ccd 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld; import javax.jws.soap.SOAPBinding; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java index 7a4f4df2e7..3444789d01 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldService { diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java index bf19e9069b..f42a1e2de1 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java index dd15a83453..a58cb87714 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; public class Person { diff --git a/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java index 0ad6440593..b589d5e8bc 100644 --- a/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java +++ b/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the OneWay service.
diff --git a/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java index f26a3ce68b..1aff0d454e 100644 --- a/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java +++ b/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface SelectorService {
diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java index 46bf911def..0643fc8376 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface ExceptionService { diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java index cd3c09e17f..2c9e822ac1 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java index 86d4719646..65a4b32694 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java index abb29aec4c..33298eb555 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface HelloWorldService { diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java index b4d1cbccda..4140fa0b89 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
@Service(MsgClient.class)
public class MsgClientImpl implements MsgClient {
diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java index e8242467cc..2be4f2ad3e 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java @@ -18,7 +18,7 @@ */
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java index d376d74295..d5684ca56c 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.AllowsPassByReference;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java index 142343e349..e18de0456c 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.binding.jms; import javax.jms.Message;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
@Service(MsgService.class)
public class MsgServiceImpl implements MsgService {
diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java index 218cccf64c..6ec88aac6c 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the OneWay service. diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java index 9795089952..fc155d0324 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface OneWayObjectService { diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java index f16f853ba7..8fd6cc94bf 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface OneWayService { diff --git a/java/sca/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java b/java/sca/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java index 3575d94f48..b661f0c518 100644 --- a/java/sca/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java +++ b/java/sca/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.itest.trninq; import org.ifxforum.xsd._1.DepAcctTrnInqRq_Type; import org.ifxforum.xsd._1.DepAcctTrnInqRs_Type; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/late-reference-resolution/src/main/java/calculator/AddService.java b/java/sca/itest/late-reference-resolution/src/main/java/calculator/AddService.java index d7dc4473ad..dd7ecb827d 100644 --- a/java/sca/itest/late-reference-resolution/src/main/java/calculator/AddService.java +++ b/java/sca/itest/late-reference-resolution/src/main/java/calculator/AddService.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The Add service interface diff --git a/java/sca/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java index da869e00fd..c927500cc7 100644 --- a/java/sca/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java b/java/sca/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java index 78ab9c6ee0..f03b9b94d4 100644 --- a/java/sca/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java +++ b/java/sca/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for the multiply service diff --git a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java index e91adb71eb..80c339abd6 100644 --- a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java +++ b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java @@ -18,8 +18,8 @@ */
package org.apache.tuscany.sca.itest.oneway;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The service interface used when testing @OneWay interactions.
diff --git a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java index 3920083484..d941693f46 100644 --- a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java +++ b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest.oneway.impl; import org.apache.tuscany.sca.itest.oneway.OneWayClient;
import org.apache.tuscany.sca.itest.oneway.OneWayService;
import org.junit.Assert;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
/**
* The client for the oneway itest.
diff --git a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java index e5d5083a2d..a30d3611fb 100644 --- a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java +++ b/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java @@ -22,8 +22,8 @@ package org.apache.tuscany.sca.test.opoverload.impl; import java.util.ArrayList; import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class Implements the interface OverloadASourceTarget, and gives implementation for all methods which are diff --git a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java index e206a86768..9ec60eb78f 100644 --- a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java +++ b/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.test.opoverload.impl; import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class Implements the interface OverloadASourceTarget, and gives implementation for all methods which are diff --git a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java index 225dce0236..b70ddede4f 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java +++ b/java/sca/itest/osgi-contribution/contribution-classes-v2/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-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java index 2b8c973e2c..34b1b0e94f 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java @@ -18,9 +18,9 @@ */ package supplychain.customer; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.retailer.Retailer; diff --git a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java index cc5d44d279..aa91ef663c 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.retailer; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.warehouse.Warehouse; diff --git a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java index 2d1bb68e5b..32015b9b60 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.shipper; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.customer.Customer; diff --git a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java index c39a34cb96..c904f07693 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes-v2/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-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java index 225dce0236..b70ddede4f 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java +++ b/java/sca/itest/osgi-contribution/contribution-classes/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-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java index d0b0a13e6d..958d1cf111 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java @@ -18,9 +18,9 @@ */ package supplychain.customer; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.retailer.Retailer; diff --git a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java index d2bf71ed28..9f1e8b63e5 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.retailer; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.warehouse.Warehouse; diff --git a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java index 2556a0cfa0..5c8903fe5a 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.shipper; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.customer.Customer; diff --git a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java index e180c37e3f..7dd7adda6b 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes/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/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
diff --git a/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF index 8985947286..5966311f0e 100644 --- a/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF +++ b/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Import-Package: org.osgi.framework, junit.framework,
org.junit,
org.apache.tuscany.sca.host.embedded,
- org.osoa.sca,
- org.osoa.sca.annotations,
+ org.oasisopen.sca,
+ org.oasisopen.sca.annotation,
org.apache.tuscany.sca.databinding.annotation
DynamicImport-Package: *
diff --git a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java index a3aa2531fc..b7da27733d 100644 --- a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java +++ b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java @@ -18,8 +18,8 @@ */
package supplychain.customer;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
/**
* This is the business interface of the Customer service component.
diff --git a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java index 5f1342c40b..950606d044 100644 --- a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java @@ -18,9 +18,9 @@ */
package supplychain.customer;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import supplychain.retailer.Retailer;
diff --git a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java index f5708dec40..08e2f8df08 100644 --- a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.retailer;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import supplychain.warehouse.Warehouse;
diff --git a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java index afaf7aea02..6bdec3615f 100644 --- a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java +++ b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.shipper;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import supplychain.customer.Customer;
diff --git a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java index ca720085c5..cbb55c969f 100644 --- a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java +++ b/java/sca/itest/osgi-tuscany/test-bundles/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-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf b/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf index f71d822bbe..645a94f6bf 100644 --- a/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf +++ b/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf @@ -5,8 +5,8 @@ Bundle-SymbolicName: supplychain.SupplyChain Bundle-Version: 1.0.0
Bundle-Localization: plugin
Import-Package: org.osgi.framework,
- org.osoa.sca,
- org.osoa.sca.annotations,
+ org.oasisopen.sca,
+ org.oasisopen.sca.annotation,
javax.xml.bind.annotation
Export-Package: supplychain.customer, supplychain
diff --git a/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf b/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf index 13a3c9b82a..4cbd41b627 100644 --- a/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf +++ b/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf @@ -13,8 +13,8 @@ Import-Package: org.osgi.framework, org.apache.tuscany.sca.contribution.service,
org.apache.tuscany.sca.core.assembly,
org.apache.tuscany.sca.assembly.builder,
- org.osoa.sca,
- org.osoa.sca.annotations,
+ org.oasisopen.sca,
+ org.oasisopen.sca.annotation,
javax.xml.bind.annotation
Export-Package: supplychain.client
Bundle-Activator: supplychain.client.SupplyChainClient
diff --git a/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java b/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java index 7345af7f7c..a7e60e7e09 100644 --- a/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java +++ b/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java @@ -18,8 +18,8 @@ */ package helloworld; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java index 268d90e910..18f74b083f 100644 --- a/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java b/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java index 6372570d1f..e9787bfac3 100644 --- a/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java +++ b/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java @@ -20,9 +20,9 @@ package helloworld; import javax.security.auth.Subject; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java index 3e752144a0..bf4e1edaaa 100644 --- a/java/sca/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java b/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java index 55b798edbe..2150cb63c6 100644 --- a/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java +++ b/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java @@ -18,8 +18,8 @@ */ package helloworld; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java index 268d90e910..18f74b083f 100644 --- a/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java b/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java index 6372570d1f..e9787bfac3 100644 --- a/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java +++ b/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java @@ -20,9 +20,9 @@ package helloworld; import javax.security.auth.Subject; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java index 0de3c70303..a75187f0d7 100644 --- a/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java +++ b/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldService.java index 268d90e910..18f74b083f 100644 --- a/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/policy/src/main/java/calculator/AddService.java b/java/sca/itest/policy/src/main/java/calculator/AddService.java index 3e56bf3fad..198a38b657 100644 --- a/java/sca/itest/policy/src/main/java/calculator/AddService.java +++ b/java/sca/itest/policy/src/main/java/calculator/AddService.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.annotation.Service; /** * The Add service interface diff --git a/java/sca/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java index 28ce0ec78a..e1726250de 100644 --- a/java/sca/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Requires; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Requires; /** diff --git a/java/sca/itest/policy/src/main/java/calculator/DivideService.java b/java/sca/itest/policy/src/main/java/calculator/DivideService.java index f72b05cece..8f4c675370 100644 --- a/java/sca/itest/policy/src/main/java/calculator/DivideService.java +++ b/java/sca/itest/policy/src/main/java/calculator/DivideService.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.annotation.Service; /** * The divide service interface diff --git a/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java b/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java index d6545b5a23..5e80b7bdde 100644 --- a/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java +++ b/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java @@ -18,9 +18,9 @@ */ package com.example; -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; @Service(ExampleClient.class) @Scope("COMPOSITE") diff --git a/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java b/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java index 30ea559694..1e887995dd 100644 --- a/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java +++ b/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java @@ -18,7 +18,7 @@ */ package com.example; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface ExampleService { diff --git a/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java index 51d064ba81..7b44ef02e4 100644 --- a/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java +++ b/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java @@ -21,11 +21,11 @@ package mysca.test.myservice.impl; import java.util.logging.Logger; -import org.osoa.sca.annotations.ComponentName; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ComponentName; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; /** * This class Implements the interface MyService and gives implementation for all methods which are declared in that diff --git a/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java index 38c26e70d6..e8c4341cf2 100644 --- a/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java +++ b/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java @@ -18,8 +18,8 @@ */ package mysca.test.myservice.impl; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class Implements the interface MyService and gives implementation for all methods which are declared in that diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java index 6b714c0d67..c8d0d4cae4 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.itest; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; /** * This class Implements the interface ABCDComponent and gives implementation for all methods which are declared in that diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java index 586d4864a9..b727935bc1 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import java.util.Collection; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java index 5e3c985144..e402131ce2 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import java.util.Collection; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * This class Implements the interface ABComponent and gives implementation for all methods which are declared in that diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java index 5b93bd8b8a..fceda9d9ae 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import java.util.Collection; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * This class Implements the interface CDComponent and gives implementation for all methods which are declared in that diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java index 16029a6584..5f8f28e46a 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java @@ -21,9 +21,9 @@ package org.apache.tuscany.sca.itest; import java.util.Collection;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Property;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Property;
import test.jaxb.props.ReturnCodeProperties;
diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java index 0a84e93828..7c700903d6 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.cdi; -import org.osoa.sca.annotations.Constructor; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Constructor; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; @Service(Bar.class) public class Foo1 implements Bar { diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java index 6344a8aa83..1d2e563095 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.cdi; -import org.osoa.sca.annotations.Constructor; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Constructor; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; @Service(Bar.class) public class Foo2 implements Bar { diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java index 11a0a758cd..54082e297a 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.cdi; -import org.osoa.sca.annotations.Constructor; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Constructor; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; @Service(Bar.class) public class Foo3 implements Bar { diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java index 87773d8361..6cad998042 100644 --- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java +++ b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java @@ -19,8 +19,8 @@ package mysca.test.myservice; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; @Service(MyService.class) public class MyServiceImpl implements MyService { diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java index a9afe052ba..f3c9280f96 100644 --- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java +++ b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java @@ -19,8 +19,8 @@ package mysca.test.myservice; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(MySimpleTotalService.class) public class MySimpleTotalServiceImpl implements MySimpleTotalService { diff --git a/java/sca/itest/recursive-ws/src/main/java/policy/Target.java b/java/sca/itest/recursive-ws/src/main/java/policy/Target.java index c77fcea868..2366f6542a 100644 --- a/java/sca/itest/recursive-ws/src/main/java/policy/Target.java +++ b/java/sca/itest/recursive-ws/src/main/java/policy/Target.java @@ -18,7 +18,7 @@ */ package policy; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Target { diff --git a/java/sca/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/java/sca/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java index 87e412829e..b2d59e925c 100644 --- a/java/sca/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java +++ b/java/sca/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java @@ -18,8 +18,8 @@ */ package policy; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(Target.class) public class TargetClientImpl implements Target { diff --git a/java/sca/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/java/sca/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java index e565055252..6f52dfb26e 100644 --- a/java/sca/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java +++ b/java/sca/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java @@ -18,7 +18,7 @@ */ package policy; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(Target.class) public class TargetServiceImpl implements Target { diff --git a/java/sca/itest/recursive-ws/src/main/java/recursive/Composer.java b/java/sca/itest/recursive-ws/src/main/java/recursive/Composer.java index e53f99d9c3..18486115ae 100644 --- a/java/sca/itest/recursive-ws/src/main/java/recursive/Composer.java +++ b/java/sca/itest/recursive-ws/src/main/java/recursive/Composer.java @@ -18,7 +18,7 @@ */ package recursive; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Composer { diff --git a/java/sca/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/java/sca/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java index 3d75b7b165..3c432bc26a 100644 --- a/java/sca/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java +++ b/java/sca/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java @@ -19,7 +19,7 @@ package recursive; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/java/sca/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java index 3e71246da2..7ff34c9787 100644 --- a/java/sca/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java +++ b/java/sca/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java @@ -28,7 +28,7 @@ import org.apache.tuscany.sca.policy.PolicySetAttachPoint; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.annotations.EndsConversation; +import org.oasisopen.sca.annotation.EndsConversation; public class PolicyTestCase{ diff --git a/java/sca/itest/recursive/src/main/java/composite/SourceImpl.java b/java/sca/itest/recursive/src/main/java/composite/SourceImpl.java index b9a0c7ff74..8e2b347604 100644 --- a/java/sca/itest/recursive/src/main/java/composite/SourceImpl.java +++ b/java/sca/itest/recursive/src/main/java/composite/SourceImpl.java @@ -18,9 +18,9 @@ */ package composite; -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; @Service(Source.class) diff --git a/java/sca/itest/recursive/src/main/java/composite/Target.java b/java/sca/itest/recursive/src/main/java/composite/Target.java index 9a8f68a7fa..703e72fc10 100644 --- a/java/sca/itest/recursive/src/main/java/composite/Target.java +++ b/java/sca/itest/recursive/src/main/java/composite/Target.java @@ -18,8 +18,8 @@ */ package composite; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.OneWay; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.OneWay; @Callback(SourceCallback.class) diff --git a/java/sca/itest/recursive/src/main/java/composite/TargetImpl.java b/java/sca/itest/recursive/src/main/java/composite/TargetImpl.java index 86686e9233..cd9a9746fa 100644 --- a/java/sca/itest/recursive/src/main/java/composite/TargetImpl.java +++ b/java/sca/itest/recursive/src/main/java/composite/TargetImpl.java @@ -18,9 +18,9 @@ */ package composite; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(Target.class) diff --git a/java/sca/itest/recursive/src/main/java/foo/A.java b/java/sca/itest/recursive/src/main/java/foo/A.java index e87cbde26d..65bf41920e 100644 --- a/java/sca/itest/recursive/src/main/java/foo/A.java +++ b/java/sca/itest/recursive/src/main/java/foo/A.java @@ -18,7 +18,7 @@ */ package foo; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(I.class) public class A implements I { diff --git a/java/sca/itest/recursive/src/main/java/foo/B.java b/java/sca/itest/recursive/src/main/java/foo/B.java index 9d060cab59..ecc04aff4c 100644 --- a/java/sca/itest/recursive/src/main/java/foo/B.java +++ b/java/sca/itest/recursive/src/main/java/foo/B.java @@ -18,8 +18,8 @@ */ package foo; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(I.class) public class B implements I { diff --git a/java/sca/itest/recursive/src/main/java/policy/Target.java b/java/sca/itest/recursive/src/main/java/policy/Target.java index c77fcea868..2366f6542a 100644 --- a/java/sca/itest/recursive/src/main/java/policy/Target.java +++ b/java/sca/itest/recursive/src/main/java/policy/Target.java @@ -18,7 +18,7 @@ */ package policy; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Target { diff --git a/java/sca/itest/recursive/src/main/java/policy/TargetClientImpl.java b/java/sca/itest/recursive/src/main/java/policy/TargetClientImpl.java index 87e412829e..b2d59e925c 100644 --- a/java/sca/itest/recursive/src/main/java/policy/TargetClientImpl.java +++ b/java/sca/itest/recursive/src/main/java/policy/TargetClientImpl.java @@ -18,8 +18,8 @@ */ package policy; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(Target.class) public class TargetClientImpl implements Target { diff --git a/java/sca/itest/recursive/src/main/java/policy/TargetServiceImpl.java b/java/sca/itest/recursive/src/main/java/policy/TargetServiceImpl.java index e565055252..6f52dfb26e 100644 --- a/java/sca/itest/recursive/src/main/java/policy/TargetServiceImpl.java +++ b/java/sca/itest/recursive/src/main/java/policy/TargetServiceImpl.java @@ -18,7 +18,7 @@ */ package policy; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(Target.class) public class TargetServiceImpl implements Target { diff --git a/java/sca/itest/recursive/src/main/java/sample/ComponentAImpl.java b/java/sca/itest/recursive/src/main/java/sample/ComponentAImpl.java index f513949105..458a7d28a3 100644 --- a/java/sca/itest/recursive/src/main/java/sample/ComponentAImpl.java +++ b/java/sca/itest/recursive/src/main/java/sample/ComponentAImpl.java @@ -19,8 +19,8 @@ package sample; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive/src/main/java/sample/ComponentCImpl.java b/java/sca/itest/recursive/src/main/java/sample/ComponentCImpl.java index 586a9ee6a7..f3b9fc014d 100644 --- a/java/sca/itest/recursive/src/main/java/sample/ComponentCImpl.java +++ b/java/sca/itest/recursive/src/main/java/sample/ComponentCImpl.java @@ -19,8 +19,8 @@ package sample; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive/src/main/java/sample/ComponentEImpl.java b/java/sca/itest/recursive/src/main/java/sample/ComponentEImpl.java index dbf2735aa7..445b622a72 100644 --- a/java/sca/itest/recursive/src/main/java/sample/ComponentEImpl.java +++ b/java/sca/itest/recursive/src/main/java/sample/ComponentEImpl.java @@ -19,8 +19,8 @@ package sample; -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$ diff --git a/java/sca/itest/recursive/src/main/java/sample/ComponentFImpl.java b/java/sca/itest/recursive/src/main/java/sample/ComponentFImpl.java index 5e136e536c..e2de8f3dc5 100644 --- a/java/sca/itest/recursive/src/main/java/sample/ComponentFImpl.java +++ b/java/sca/itest/recursive/src/main/java/sample/ComponentFImpl.java @@ -19,7 +19,7 @@ package sample; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive/src/main/java/test/AggregatorImpl.java b/java/sca/itest/recursive/src/main/java/test/AggregatorImpl.java index f6ac6c8741..638219d431 100644 --- a/java/sca/itest/recursive/src/main/java/test/AggregatorImpl.java +++ b/java/sca/itest/recursive/src/main/java/test/AggregatorImpl.java @@ -21,8 +21,8 @@ package test; import java.util.List; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive/src/main/java/test/InnerSourceImpl.java b/java/sca/itest/recursive/src/main/java/test/InnerSourceImpl.java index c8dad5ae35..aae9aba587 100644 --- a/java/sca/itest/recursive/src/main/java/test/InnerSourceImpl.java +++ b/java/sca/itest/recursive/src/main/java/test/InnerSourceImpl.java @@ -19,7 +19,7 @@ package test; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive/src/main/java/test/OuterSourceImpl.java b/java/sca/itest/recursive/src/main/java/test/OuterSourceImpl.java index 11816e82cf..bd31498ccc 100644 --- a/java/sca/itest/recursive/src/main/java/test/OuterSourceImpl.java +++ b/java/sca/itest/recursive/src/main/java/test/OuterSourceImpl.java @@ -19,7 +19,7 @@ package test; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive/src/main/java/test/Source.java b/java/sca/itest/recursive/src/main/java/test/Source.java index 9b93740d9d..bcad89bf4d 100644 --- a/java/sca/itest/recursive/src/main/java/test/Source.java +++ b/java/sca/itest/recursive/src/main/java/test/Source.java @@ -19,7 +19,7 @@ package test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive/src/main/java/test1/composite/TargetOne.java b/java/sca/itest/recursive/src/main/java/test1/composite/TargetOne.java index a7c68f4ffd..831e3cbd7b 100644 --- a/java/sca/itest/recursive/src/main/java/test1/composite/TargetOne.java +++ b/java/sca/itest/recursive/src/main/java/test1/composite/TargetOne.java @@ -18,7 +18,7 @@ */ package test1.composite; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(Target.class) public class TargetOne implements Target { diff --git a/java/sca/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/java/sca/itest/recursive/src/main/java/test1/composite/TargetTwo.java index 7fff8e2e9b..8c32eca547 100644 --- a/java/sca/itest/recursive/src/main/java/test1/composite/TargetTwo.java +++ b/java/sca/itest/recursive/src/main/java/test1/composite/TargetTwo.java @@ -18,7 +18,7 @@ */ package test1.composite; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(Target.class) public class TargetTwo implements Target { diff --git a/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java b/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java index f042113f7a..fb9872378d 100644 --- a/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java +++ b/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java @@ -77,8 +77,8 @@ public class LocateServiceEmbeddedSCADomainTestCase extends TestCase { source = domain.getService(Source.class, "SourceComponentXXX");
// The source proxy can be created for the remote target but it will throw exception when a method is invoked
source.clientMethod("ABC");
- fail("Expected to generate org.osoa.sca.ServiceRuntimeException but did not when invoking service with async");
- } catch (org.osoa.sca.ServiceRuntimeException e) {
+ fail("Expected to generate org.oasisopen.sca.ServiceRuntimeException but did not when invoking service with async");
+ } catch (org.oasisopen.sca.ServiceRuntimeException e) {
// expected.
}
}
diff --git a/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java b/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java index 87eb948452..171f181438 100644 --- a/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java +++ b/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java @@ -54,8 +54,8 @@ public class LocateServiceSCADomainTestCase extends TestCase { source = domain.getService(Source.class, "SourceComponentXXX");
// The source proxy can be created for the remote target but it will throw exception when a method is invoked
source.clientMethod("ABC");
- fail("Expected to generate org.osoa.sca.ServiceRuntimeException but did not when invoking service with async");
- } catch (org.osoa.sca.ServiceRuntimeException e) {
+ fail("Expected to generate org.oasisopen.sca.ServiceRuntimeException but did not when invoking service with async");
+ } catch (org.oasisopen.sca.ServiceRuntimeException e) {
// expected.
}
}
diff --git a/java/sca/itest/recursive/src/test/java/sample/CImpl.java b/java/sca/itest/recursive/src/test/java/sample/CImpl.java index 466284983e..98610e32a6 100644 --- a/java/sca/itest/recursive/src/test/java/sample/CImpl.java +++ b/java/sca/itest/recursive/src/test/java/sample/CImpl.java @@ -20,8 +20,8 @@ package sample; 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; /** * Implementation of a simple service diff --git a/java/sca/itest/recursive/src/test/java/sample/XImpl.java b/java/sca/itest/recursive/src/test/java/sample/XImpl.java index e430807568..7f80dfccb2 100644 --- a/java/sca/itest/recursive/src/test/java/sample/XImpl.java +++ b/java/sca/itest/recursive/src/test/java/sample/XImpl.java @@ -18,7 +18,7 @@ */ package sample; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a simple service diff --git a/java/sca/itest/recursive/src/test/java/sample/YImpl.java b/java/sca/itest/recursive/src/test/java/sample/YImpl.java index 994c9eb95f..b8e3a58974 100644 --- a/java/sca/itest/recursive/src/test/java/sample/YImpl.java +++ b/java/sca/itest/recursive/src/test/java/sample/YImpl.java @@ -18,7 +18,7 @@ */ package sample; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a Simple Service diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java index ab275ece52..49c3deb84d 100644 --- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java +++ b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.itest.references; import java.util.Collection; import java.util.List; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Reference; public class AComponentImpl implements AComponent { diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java index 6b1065ab0d..211e6160f6 100644 --- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java +++ b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.references; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class BComponentImpl implements BComponent { diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java index 1cd7cb7fe5..47a1f9bde8 100644 --- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java +++ b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.references; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class BComponentWrongTargetImpl implements BComponent { diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java index 79c802bc97..d181ac96ca 100644 --- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java +++ b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.references; -import org.osoa.sca.annotations.ComponentName; +import org.oasisopen.sca.annotation.ComponentName; public class DComponentImpl implements DComponent { @ComponentName diff --git a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java index f4ef805644..208ac3ba44 100644 --- a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java +++ b/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.scopes; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** * Test Composite scope diff --git a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java index 7e19a15cb1..ff116070b5 100644 --- a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java +++ b/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.scopes; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; /** * Test request scope diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java index fa0f1c88d6..3c643436e9 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.servicereference; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Conversational; /** * A very simple Conversational Service diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java index 85d5dd860c..4d75c68c2d 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.servicereference; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.annotation.Conversational; /** * This is the callback for the ConversationalService. diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java index 50c98d1afc..b129cbc4b7 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java @@ -20,14 +20,14 @@ package org.apache.tuscany.sca.itest.servicereference; import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils; import org.junit.Assert; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Simple conversational Service implementation diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java index cf0307eb8e..64c5e7e631 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java @@ -20,9 +20,9 @@ package org.apache.tuscany.sca.itest.servicereference; import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils; import org.junit.Assert; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This is a test client that is used to test Serializing and Deserializing diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java index deb8f75816..b233241514 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.servicereference; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.annotation.Conversational; /** diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java index 60ecb7717a..9e55eea7ee 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java @@ -20,10 +20,10 @@ package org.apache.tuscany.sca.itest.servicereference; import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils; import org.junit.Assert; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * This is a test client that is used to test Serializing and Deserializing diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java index 8a1fe48436..804debf30c 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.servicereference; -import org.osoa.sca.annotations.Callback; +import org.oasisopen.sca.annotation.Callback; /** diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java index 24d43f79e3..795f2d9c46 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java @@ -23,9 +23,9 @@ import java.util.Date; import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils; import org.junit.Assert; -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; /** * Simple Stateless Service implementation diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java index 2749891bd4..bb8d40e788 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java @@ -24,8 +24,8 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ServiceReference; /** * Utility methods that are used by the ServiceReference Serialization tests diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java index ced30864ff..26e58dc530 100644 --- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java +++ b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.services; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface AComponent { diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java index 14b70dff04..01df89a8fa 100644 --- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java +++ b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.services; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(BComponent.class) public class BComponentImpl implements BComponent { diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java index 39806a8101..07397e4502 100644 --- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java +++ b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.services; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CComponent { diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java index 36189f94bb..59ffce8205 100644 --- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java +++ b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.services; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(interfaces = {DComponent.class, D1Component.class}) public class DComponentImpl implements DComponent, D1Component { diff --git a/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java index 977daf9f6a..da779b2c54 100644 --- a/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java +++ b/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java @@ -29,7 +29,7 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; public class ServicesTestCase { private static Node node; diff --git a/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java index 81c47a78d1..833cc50f71 100644 --- a/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java +++ b/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java @@ -18,7 +18,7 @@ */
package bigbank.stockquote;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the StockQuote service.
diff --git a/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java index d4b3fe9035..d6db2bd182 100644 --- a/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java +++ b/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java @@ -18,7 +18,7 @@ */
package bigbank.stockquote;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* This is the business interface of the StockQuote service.
diff --git a/java/sca/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/java/sca/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java index 0206849a53..000b135f01 100644 --- a/java/sca/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java +++ b/java/sca/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java @@ -18,12 +18,12 @@ */
package spring.annotations;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.ComponentName;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.ComponentName;
import calculator.AddService;
import calculator.CalculatorService;
diff --git a/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java index 3957e49bf3..5869d344f6 100644 --- a/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java +++ b/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.spring; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * Interface for the "hello world" service - predictably simple with a single operation diff --git a/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java index d75d19295d..90d26dd89f 100644 --- a/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java +++ b/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.spring; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * A simple proxy Java class which implements the HelloWorld interface but which uses diff --git a/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java b/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java index 3e1cb29f33..776d23407a 100644 --- a/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java +++ b/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java @@ -35,11 +35,11 @@ import javax.jms.Session; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQSession; import org.apache.activemq.broker.BrokerService; -import org.osoa.sca.ServiceRuntimeException; -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.ServiceRuntimeException; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java b/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java index 156b34227d..6010d9abad 100644 --- a/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java +++ b/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java @@ -28,11 +28,11 @@ import java.util.logging.Logger; import javax.sql.XAConnection; import org.apache.derby.jdbc.EmbeddedXADataSource; -import org.osoa.sca.ServiceRuntimeException; -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.ServiceRuntimeException; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java b/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java index 341a7e53e3..45a9a26c3d 100644 --- a/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java +++ b/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.itest.transaction; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/validation/src/main/java/binding/ejb/account/Customer.java b/java/sca/itest/validation/src/main/java/binding/ejb/account/Customer.java index acb74c38ae..ece64ae4b0 100644 --- a/java/sca/itest/validation/src/main/java/binding/ejb/account/Customer.java +++ b/java/sca/itest/validation/src/main/java/binding/ejb/account/Customer.java @@ -18,7 +18,7 @@ */ package binding.ejb.account; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Customer { diff --git a/java/sca/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java b/java/sca/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java index 52ddfa9aba..1a859b04d2 100644 --- a/java/sca/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java +++ b/java/sca/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java @@ -18,9 +18,9 @@ */ package binding.ejb.account; -import org.osoa.sca.ServiceRuntimeException; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ServiceRuntimeException; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; import binding.ejb.calculator.AddService; diff --git a/java/sca/itest/validation/src/main/java/binding/jms/HelloWorldService.java b/java/sca/itest/validation/src/main/java/binding/jms/HelloWorldService.java index 33bfe1d0ea..81d7d2e585 100644 --- a/java/sca/itest/validation/src/main/java/binding/jms/HelloWorldService.java +++ b/java/sca/itest/validation/src/main/java/binding/jms/HelloWorldService.java @@ -18,7 +18,7 @@ */ package binding.jms; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface HelloWorldService { diff --git a/java/sca/itest/validation/src/main/java/calculator/warning/AddService.java b/java/sca/itest/validation/src/main/java/calculator/warning/AddService.java index 35ba2cbfac..4df26ffd7b 100644 --- a/java/sca/itest/validation/src/main/java/calculator/warning/AddService.java +++ b/java/sca/itest/validation/src/main/java/calculator/warning/AddService.java @@ -18,7 +18,7 @@ */ package calculator.warning; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The Add service interface diff --git a/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java b/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java index ef305370cc..32080df91b 100644 --- a/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java +++ b/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java @@ -21,7 +21,7 @@ package calculator.warning; import java.util.logging.Level; import java.util.logging.Logger; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * An implementation of the Add service diff --git a/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java b/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java index aacde27842..201726c451 100644 --- a/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java +++ b/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java @@ -21,8 +21,8 @@ package calculator.warning; import java.util.logging.Level; import java.util.logging.Logger; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; /** * An implementation of the Add service diff --git a/java/sca/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java b/java/sca/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java index 77aafe83de..3f93b8e8a5 100644 --- a/java/sca/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java +++ b/java/sca/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator.warning; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java b/java/sca/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java index 429daf5f2d..599c3f7bb4 100644 --- a/java/sca/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java +++ b/java/sca/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator.warning; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * An implementation of the Property service diff --git a/java/sca/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java b/java/sca/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java index d5e9fcf020..823408908f 100644 --- a/java/sca/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java +++ b/java/sca/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java @@ -21,7 +21,7 @@ package calculator.warning; import java.util.logging.Level; import java.util.logging.Logger; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of the subtract service. diff --git a/java/sca/itest/validation/src/main/java/impl/java/AddServiceImpl.java b/java/sca/itest/validation/src/main/java/impl/java/AddServiceImpl.java index 83f2685d54..bdde8a4721 100644 --- a/java/sca/itest/validation/src/main/java/impl/java/AddServiceImpl.java +++ b/java/sca/itest/validation/src/main/java/impl/java/AddServiceImpl.java @@ -21,7 +21,7 @@ package impl.java; import java.util.logging.Level; import java.util.logging.Logger; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * An implementation of the Add service diff --git a/java/sca/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java b/java/sca/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java index 0183e2a259..138f1a4565 100644 --- a/java/sca/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java +++ b/java/sca/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package impl.java; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/itest/validation/src/main/java/impl/spring/HelloWorld.java b/java/sca/itest/validation/src/main/java/impl/spring/HelloWorld.java index ef0b491617..0cdd72942e 100644 --- a/java/sca/itest/validation/src/main/java/impl/spring/HelloWorld.java +++ b/java/sca/itest/validation/src/main/java/impl/spring/HelloWorld.java @@ -19,8 +19,8 @@ package impl.spring; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * Interface for the "hello world" service - predictably simple with a single operation diff --git a/java/sca/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java b/java/sca/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java index 2e3458f0d3..97d13c8190 100644 --- a/java/sca/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java +++ b/java/sca/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java @@ -19,7 +19,7 @@ package impl.spring; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * A simple proxy Java class which implements the HelloWorld interface but which uses diff --git a/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java b/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java index fa1a621f12..038e2c720f 100644 --- a/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java +++ b/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java @@ -18,7 +18,7 @@ */ package interfacejava.xml; -import org.osoa.sca.annotations.OneWay; +import org.oasisopen.sca.annotation.OneWay; /** * The Calculator service interface. */ diff --git a/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java b/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java index ebf7a79589..4b67ebae97 100644 --- a/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java +++ b/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package interfacejava.xml; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import calculator.warning.AddService; import calculator.warning.DivideService; diff --git a/java/sca/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/java/sca/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java index bcd6637a03..a13ea84260 100644 --- a/java/sca/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java +++ b/java/sca/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java @@ -60,7 +60,7 @@ public class XSDValidationTestCase extends TestCase { public void testCalculator() throws Exception { - assertEquals("org.osoa.sca.ServiceRuntimeException: Unexpected <binding> element found. It should appear inside a <service> or <reference> element.", startUpException.getMessage()); + assertEquals("org.oasisopen.sca.ServiceRuntimeException: Unexpected <binding> element found. It should appear inside a <service> or <reference> element.", startUpException.getMessage()); } diff --git a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java index 09d5b0278e..f5a4337254 100644 --- a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java +++ b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the client interface for the wires tests diff --git a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java index 9cb845d4b2..82f0e26d58 100644 --- a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java +++ b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.itest; import org.junit.Assert; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This is the client implementation for the wires tests diff --git a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java index c19a0b4f74..67df1e3a52 100644 --- a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java +++ b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * Sample Wire Service diff --git a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java index b7ccdbf8d1..f0308252ba 100644 --- a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java +++ b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * Sample WireService Implementation diff --git a/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java b/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java index dc949b5191..dfb7f0a474 100644 --- a/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java +++ b/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java @@ -18,7 +18,7 @@ */
package voidtest;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the HelloWorld service.
diff --git a/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java b/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java index 4777f793e0..9bb945b71a 100644 --- a/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java +++ b/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java @@ -18,8 +18,8 @@ */
package voidtest;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
/**
* This is the business interface of the HelloWorld greetings service.
diff --git a/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java b/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java index 1cdd094c50..9ea0a98f95 100644 --- a/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java +++ b/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java @@ -21,9 +21,9 @@ package voidtest; import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNull;
-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;
@Service(TestClient.class)
@Scope("COMPOSITE")
diff --git a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java index 842ae0a692..c5b297cf61 100644 --- a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java +++ b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java index d2d898e9c4..1d03f42830 100644 --- a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java +++ b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java @@ -18,8 +18,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; /** * This client program shows how to create an SCA runtime, start it, diff --git a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java index d4fbd434fe..fc0e2d6122 100644 --- a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java @@ -18,8 +18,8 @@ */ package helloworld; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java index a46f763960..7f8285fa09 100644 --- a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java +++ b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java @@ -18,8 +18,8 @@ */ package helloworld; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java index 265b11f7dd..f3a5873d53 100644 --- a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java +++ b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java @@ -18,8 +18,8 @@ */ package bigbank.account.services.accountdata; -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.AllowsPassByReference; +import org.oasisopen.sca.annotation.Remotable; @Remotable @AllowsPassByReference diff --git a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java index f8c9c28f26..f74817a0ff 100644 --- a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java +++ b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java @@ -20,7 +20,7 @@ package bigbank.account.services.accountdata; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; import com.bigbank.account.AccountFactory; import com.bigbank.account.AccountLog; diff --git a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java index f16d20689d..47204b66ed 100644 --- a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java +++ b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java @@ -21,7 +21,7 @@ package bigbank.account.services.accountdata; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java index cba6f2ee6c..7e18f52518 100644 --- a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java +++ b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java @@ -21,7 +21,7 @@ package bigbank.account.services.accountdata; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java index 9f15be0236..231aa0f9f3 100644 --- a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java +++ b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java @@ -21,7 +21,7 @@ package bigbank.account.services.accountdata; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java index f174e1af07..254fa34af3 100644 --- a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java +++ b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java @@ -21,7 +21,7 @@ package bigbank.account.services.accountdata; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java index 4a5b7bceef..c0e39baa82 100644 --- a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java +++ b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java @@ -21,7 +21,7 @@ package bigbank.account.services.accountdata; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java index c9076ebba6..5723aed35d 100644 --- a/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java +++ b/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldService.java index 268d90e910..18f74b083f 100644 --- a/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java index d706517b76..6f26a02c3e 100644 --- a/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java +++ b/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** * This client program shows how to create an SCA runtime, start it, diff --git a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java index 9d147dc013..77ba127636 100644 --- a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java +++ b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component2aImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java index 7556e02b36..c2a2420181 100644 --- a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java +++ b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component2bImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java index e7031ff41c..4eb1ba333d 100644 --- a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java +++ b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component3aImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java index 7a049ed7b0..dbaf1ac0a5 100644 --- a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java +++ b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component3bImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java index 5886ebc6ff..e2c884ec74 100644 --- a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java +++ b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java @@ -20,8 +20,8 @@ package bigbank.account.services.accountdata; import javax.jws.WebService; import javax.xml.ws.ResponseWrapper; -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.AllowsPassByReference; +import org.oasisopen.sca.annotation.Remotable; @Remotable @AllowsPassByReference diff --git a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java index df658428fd..c23a281b6f 100644 --- a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java @@ -18,7 +18,7 @@ */ package bigbank.account.services.accountdata; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; import com.bigbank.account.AccountFactory; import com.bigbank.account.AccountLog; diff --git a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java index d39df8c00e..591e9d04d3 100644 --- a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java @@ -19,7 +19,7 @@ package bigbank.account.services.accountdata; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java index d4a06780c3..196dd2a5ba 100644 --- a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java @@ -19,7 +19,7 @@ package bigbank.account.services.accountdata; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java index 6dc46c60b5..00b70807a9 100644 --- a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java @@ -19,7 +19,7 @@ package bigbank.account.services.accountdata; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java index 8471000152..f74be92d8a 100644 --- a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java @@ -19,7 +19,7 @@ package bigbank.account.services.accountdata; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java index 859c61a724..1acfea21a3 100644 --- a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java @@ -19,7 +19,7 @@ package bigbank.account.services.accountdata; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java index ca7c25f3fa..78882aa1d0 100644 --- a/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java index 8b234599aa..6892c99e13 100644 --- a/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java index 03984f7252..062275833e 100644 --- a/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java +++ b/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** * This client program shows how to create an SCA runtime, start it, diff --git a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java index 45bb697437..74e2ae5d0d 100644 --- a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component2aImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java index 9342c8e6ee..84bacd658d 100644 --- a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component2bImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java index 6c5ac96b67..eed10cde7c 100644 --- a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component3aImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java index ebaf33f568..3a79f52575 100644 --- a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component3bImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdlless/src/main/java/service/SomeService.java b/java/sca/itest/wsdlless/src/main/java/service/SomeService.java index f6aaacb23a..2283f8095f 100644 --- a/java/sca/itest/wsdlless/src/main/java/service/SomeService.java +++ b/java/sca/itest/wsdlless/src/main/java/service/SomeService.java @@ -19,7 +19,7 @@ package service; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface SomeService { diff --git a/java/sca/itest/wsdlless/src/main/java/service/SomeServiceImpl.java b/java/sca/itest/wsdlless/src/main/java/service/SomeServiceImpl.java index 39a2131024..728799c131 100644 --- a/java/sca/itest/wsdlless/src/main/java/service/SomeServiceImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/service/SomeServiceImpl.java @@ -18,7 +18,7 @@ */ package service; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(SomeService.class) public class SomeServiceImpl implements SomeService { |