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/modules | |
| 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 'java/sca/modules')
324 files changed, 567 insertions, 567 deletions
diff --git a/java/sca/modules/binding-atom-abdera/META-INF/MANIFEST.MF b/java/sca/modules/binding-atom-abdera/META-INF/MANIFEST.MF index a82a675347..85b23310e3 100644 --- a/java/sca/modules/binding-atom-abdera/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-atom-abdera/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0
Export-Package: org.apache.tuscany.sca.binding.atom.collection;uses:="
- org.osoa.sca.annotations,org.apache.abdera.model";version="2.0.0"
+ org.oasisopen.sca.annotation,org.apache.abdera.model";version="2.0.0"
Private-Package: org.apache.tuscany.sca.binding.atom.provider;version=
"1.4"
Tool: Bnd-0.0.255
@@ -48,8 +48,8 @@ Import-Package: javax.activation;version="1.1";resolution:=optional, org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0"
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.binding.atom.abdera
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java b/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java index 7356cd0d2a..81ec1ddad3 100644 --- a/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java +++ b/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.binding.atom.collection; import org.apache.abdera.model.Entry; import org.apache.abdera.model.Feed; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * Provides access to a collection of resources using Atom. diff --git a/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java b/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java index cc351442e7..455eef81cd 100644 --- a/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java +++ b/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.binding.atom.collection; import java.io.InputStream; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; import org.apache.abdera.model.Entry; diff --git a/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java b/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java index 7219a3395b..84232aa3af 100644 --- a/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java +++ b/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java @@ -42,7 +42,7 @@ import org.apache.tuscany.sca.data.collection.Entry; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Invoker for the Atom binding. diff --git a/java/sca/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java b/java/sca/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java index 3e5705b14c..0aefce608b 100644 --- a/java/sca/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java +++ b/java/sca/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java @@ -24,7 +24,7 @@ import org.apache.abdera.model.Content; import org.apache.abdera.model.Entry; import org.apache.abdera.model.Feed; import org.apache.tuscany.sca.binding.atom.collection.Collection; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class CustomerClientImpl implements CustomerClient { diff --git a/java/sca/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java b/java/sca/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java index db66b00a50..222dc3e394 100644 --- a/java/sca/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java +++ b/java/sca/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java @@ -30,7 +30,7 @@ import org.apache.abdera.model.Entry; import org.apache.abdera.model.Feed; import org.apache.tuscany.sca.binding.atom.collection.Collection; import org.apache.tuscany.sca.binding.atom.collection.NotFoundException; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; @Scope("COMPOSITE") public class CustomerCollectionImpl implements Collection { diff --git a/java/sca/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java b/java/sca/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java index 5d5953aaaa..41257d9a7f 100644 --- a/java/sca/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java +++ b/java/sca/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java @@ -35,7 +35,7 @@ import org.apache.abdera.model.Feed; import org.apache.tuscany.sca.binding.atom.collection.Collection; import org.apache.tuscany.sca.binding.atom.collection.MediaCollection; import org.apache.tuscany.sca.binding.atom.collection.NotFoundException; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; @Scope("COMPOSITE") public class MediaCollectionImpl implements MediaCollection { diff --git a/java/sca/modules/binding-corba-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-corba-runtime/META-INF/MANIFEST.MF index 7a690d8360..45b1f17ec6 100644 --- a/java/sca/modules/binding-corba-runtime/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-corba-runtime/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Export-Package: org.apache.tuscany.sca.binding.corba.provider.service; g.corba,org.apache.tuscany.sca.interfacedef,org.apache.tuscany.sca.bi
nding.corba.provider.reference,org.apache.tuscany.sca.invocation,org.
apache.tuscany.sca.binding.corba.provider.service,org.apache.tuscany.
- sca.host.corba,org.osoa.sca";version="2.0.0",org.apache.tuscany.sca.bin
+ sca.host.corba,org.oasisopen.sca";version="2.0.0",org.apache.tuscany.sca.bin
ding.corba.provider.exceptions;version="2.0.0",org.apache.tuscany.sca.b
inding.corba.provider.types;uses:="org.apache.tuscany.sca.binding.cor
ba.provider.exceptions";version="2.0.0",org.apache.tuscany.sca.binding.
@@ -58,7 +58,7 @@ Import-Package: javax.xml.namespace;resolution:=optional, org.omg.CORBA,
org.omg.CORBA.portable,
org.omg.CosNaming;resolution:=optional,
- org.osoa.sca;version="2.0.0"
+ org.oasisopen.sca;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.binding.corba.runtime
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java index 2e3d72f2dc..0ad3b2240e 100644 --- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java +++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java @@ -33,7 +33,7 @@ import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.omg.CORBA.Object; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java index fd4d38a6f5..a574c52703 100644 --- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java +++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java @@ -29,7 +29,7 @@ import org.apache.tuscany.sca.interfacedef.InterfaceContract; import org.apache.tuscany.sca.interfacedef.java.JavaInterface; import org.apache.tuscany.sca.provider.ServiceBindingProvider; import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/binding-ejb-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-ejb-runtime/META-INF/MANIFEST.MF index b75c6dd265..6adfd6cb93 100644 --- a/java/sca/modules/binding-ejb-runtime/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-ejb-runtime/META-INF/MANIFEST.MF @@ -35,8 +35,8 @@ Import-Package: javax.ejb, org.omg.IOP,
org.omg.PortableInterceptor,
org.omg.stub.java.rmi,
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.binding.ejb.runtime
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java b/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java index d41dbd0a0f..c7c0f90710 100644 --- a/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java +++ b/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java @@ -36,7 +36,7 @@ import org.omg.CORBA.portable.RemarshalException; import org.omg.CORBA.portable.ServantObject; import org.omg.CORBA_2_3.portable.InputStream; import org.omg.CORBA_2_3.portable.OutputStream; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * EJBMessageHandler diff --git a/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java b/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java index d34cfe1b16..119282adb9 100644 --- a/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java +++ b/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java @@ -33,7 +33,7 @@ import org.omg.CORBA.portable.ApplicationException; import org.omg.CORBA.portable.ObjectImpl; import org.omg.CORBA.portable.RemarshalException; import org.omg.stub.java.rmi._Remote_Stub; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Factor class that is used to create EJB Proxies. diff --git a/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java b/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java index b699a02d1d..72f7dc9e43 100644 --- a/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java +++ b/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java @@ -23,8 +23,8 @@ import java.rmi.RemoteException; import javax.ejb.CreateException; import javax.naming.NamingException; -import org.osoa.sca.ServiceRuntimeException; -import org.osoa.sca.ServiceUnavailableException; +import org.oasisopen.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceUnavailableException; final class EJBStubHelper { diff --git a/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java b/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java index 5e7d6761d9..651c967aad 100644 --- a/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java +++ b/java/sca/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java @@ -28,7 +28,7 @@ import java.util.HashMap; import java.util.Map; import java.util.WeakHashMap; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * An adapter for java classes, indexes the methods by name and provides an diff --git a/java/sca/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java b/java/sca/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java index 28dafedaeb..337bb004b5 100644 --- a/java/sca/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java +++ b/java/sca/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java @@ -18,7 +18,7 @@ */ package account; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * diff --git a/java/sca/modules/binding-ejb-runtime/src/test/java/account/Customer.java b/java/sca/modules/binding-ejb-runtime/src/test/java/account/Customer.java index 49ece71f7a..8585301868 100644 --- a/java/sca/modules/binding-ejb-runtime/src/test/java/account/Customer.java +++ b/java/sca/modules/binding-ejb-runtime/src/test/java/account/Customer.java @@ -18,7 +18,7 @@ */ package account; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Customer { diff --git a/java/sca/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java b/java/sca/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java index 3d3f785a50..7406b9bd37 100644 --- a/java/sca/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java +++ b/java/sca/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java @@ -18,9 +18,9 @@ */ package 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 calculator.AddService; diff --git a/java/sca/modules/binding-gdata-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-gdata-runtime/META-INF/MANIFEST.MF index 8a5bfe6773..41d0fbf451 100644 --- a/java/sca/modules/binding-gdata-runtime/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-gdata-runtime/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0
Export-Package: org.apache.tuscany.sca.binding.gdata.collection;uses:=
- "org.osoa.sca.annotations,com.google.gdata.client,com.google.gdata.da
+ "org.oasisopen.sca.annotation,com.google.gdata.client,com.google.gdata.da
ta";version="2.0.0"
Private-Package: org.apache.tuscany.sca.binding.gdata.provider;version
="1.4"
@@ -41,8 +41,8 @@ Import-Package: com.google.gdata.client, org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0"
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.binding.gdata.runtime
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java b/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java index 5400e0b90f..b3d672b9d4 100644 --- a/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java +++ b/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.binding.gdata.collection; import com.google.gdata.client.Query; import com.google.gdata.data.Entry; import com.google.gdata.data.Feed; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * Provides access to a collection of resources using Gdata. diff --git a/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java b/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java index 774dc59269..174efef1bc 100644 --- a/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java +++ b/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.binding.gdata.collection; import java.io.InputStream; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; import com.google.gdata.data.Entry; diff --git a/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java b/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java index 460aa81378..312c1fe641 100644 --- a/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java +++ b/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java @@ -36,7 +36,7 @@ import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.DataExchangeSemantics; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; import com.google.gdata.client.GoogleService; import com.google.gdata.client.Query; diff --git a/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java b/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java index a2b1da894d..488bfa0f71 100644 --- a/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java +++ b/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java @@ -26,7 +26,7 @@ import com.google.gdata.data.PlainTextConstruct; import org.apache.tuscany.sca.binding.gdata.collection.Collection; import org.apache.tuscany.sca.binding.gdata.collection.NotFoundException; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class CustomerClientImpl implements CustomerClient { diff --git a/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java b/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java index 3c11fb70b9..e283b6e023 100644 --- a/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java +++ b/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java @@ -32,7 +32,7 @@ import com.google.gdata.data.Link; import com.google.gdata.data.PlainTextConstruct; import org.apache.tuscany.sca.binding.gdata.collection.Collection; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; @Scope("COMPOSITE") public class CustomerCollectionImpl implements Collection { diff --git a/java/sca/modules/binding-http-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-http-runtime/META-INF/MANIFEST.MF index f132e9191e..38d5bca016 100644 --- a/java/sca/modules/binding-http-runtime/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-http-runtime/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Import-Package: javax.servlet, org.apache.tuscany.sca.policy.authentication.basic;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.binding.http.runtime
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java b/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java index ed846c1127..9dbd6724b0 100644 --- a/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java +++ b/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java @@ -28,7 +28,7 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * Test service implementation. diff --git a/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java b/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java index 11945c8cd1..90cca27655 100644 --- a/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java +++ b/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java @@ -28,7 +28,7 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * Test service implementation. diff --git a/java/sca/modules/binding-jms-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-jms-runtime/META-INF/MANIFEST.MF index 7e1dea585c..183f1446a6 100644 --- a/java/sca/modules/binding-jms-runtime/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-jms-runtime/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Export-Package: org.apache.tuscany.sca.binding.jms.provider;uses:="org .apache.tuscany.sca.runtime,javax.jms,org.apache.tuscany.sca.provider
,org.apache.tuscany.sca.core,org.apache.axiom.om,javax.xml.stream,org
.apache.tuscany.sca.binding.jms,org.apache.tuscany.sca.core.assembly,
- org.osoa.sca,org.apache.tuscany.sca.core.invocation,javax.naming,org.
+ org.oasisopen.sca,org.apache.tuscany.sca.core.invocation,javax.naming,org.
apache.tuscany.sca.assembly,org.apache.tuscany.sca.binding.ws.wsdlgen
,org.apache.axiom.om.impl.builder,org.apache.tuscany.sca.interfacedef
.java,org.apache.tuscany.sca.monitor,org.apache.tuscany.sca.interface
@@ -40,8 +40,8 @@ Import-Package: javax.jms, org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
org.apache.tuscany.sca.work;version="2.0.0",
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.binding.jms.runtime
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java index 398b364c13..d73b51e9ae 100644 --- a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java +++ b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java @@ -26,7 +26,7 @@ import javax.jms.Session; import org.apache.tuscany.sca.binding.jms.JMSBinding; import org.apache.tuscany.sca.binding.jms.JMSBindingException; import org.apache.tuscany.sca.binding.jms.xml.JMSBindingConstants; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Base MessageProcessor for the JMSBinding. diff --git a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java index 4e1bcf266c..998ac904a8 100644 --- a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java +++ b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java @@ -48,7 +48,7 @@ import org.apache.tuscany.sca.policy.authentication.token.TokenPrincipal; import org.apache.tuscany.sca.runtime.ReferenceParameters; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Invoker for the JMS binding. diff --git a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java index b78f1f2044..33d4366fe6 100644 --- a/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java +++ b/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java @@ -50,7 +50,7 @@ import org.apache.tuscany.sca.runtime.ReferenceParameters; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeComponentService; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Invoker for the JMS binding. diff --git a/java/sca/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/java/sca/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java index fb80362457..a3a2f0bf1e 100644 --- a/java/sca/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java +++ b/java/sca/modules/binding-jms-runtime/src/test/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/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/java/sca/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java index 515da3144a..d68270f7df 100644 --- a/java/sca/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java +++ b/java/sca/modules/binding-jms-runtime/src/test/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; /** * Interface for the HelloWorld Service. diff --git a/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF index 06783da91f..6bfa1e2eea 100644 --- a/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Export-Package: org.apache.tuscany.sca.binding.jsonrpc.provider;uses:= pache.tuscany.sca.interfacedef.java,org.apache.tuscany.sca.interfaced
ef,javax.servlet,org.apache.tuscany.sca.invocation,com.metaparadigm.j
sonrpc,org.apache.tuscany.sca.binding.jsonrpc,org.apache.tuscany.sca.
- host.http,org.osoa.sca,javax.servlet.http";version="2.0.0"
+ host.http,org.oasisopen.sca,javax.servlet.http";version="2.0.0"
Tool: Bnd-0.0.255
Bundle-Name: Apache Tuscany SCA JSON-RPC Binding Runtime
Created-By: 1.6.0_07 (Sun Microsystems Inc.)
@@ -34,8 +34,8 @@ Import-Package: com.metaparadigm.jsonrpc, org.apache.tuscany.sca.runtime;version="2.0.0",
org.json,
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.binding.jsonrpc.runtime
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java b/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java index c0d0415f91..37a598e1ac 100644 --- a/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java +++ b/java/sca/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java @@ -39,7 +39,7 @@ import org.apache.tuscany.sca.runtime.RuntimeComponentService; import org.apache.tuscany.sca.runtime.RuntimeWire; import org.json.JSONArray; import org.json.JSONObject; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; import com.metaparadigm.jsonrpc.JSONRPCBridge; import com.metaparadigm.jsonrpc.JSONRPCResult; diff --git a/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java b/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java index ba87f22cf6..c46e5698d1 100644 --- a/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java +++ b/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; import bean.TestBean; diff --git a/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF b/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF index be0b859d11..0acafa256d 100644 --- a/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF @@ -24,8 +24,8 @@ Import-Package: net.sf.cglib.asm, org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.binding.rmi.runtime
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java b/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java index 698f3faf1f..f10cf353b7 100644 --- a/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java +++ b/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java @@ -46,7 +46,7 @@ import org.apache.tuscany.sca.provider.ServiceBindingProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentService; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Implementation of a Service for the RMIBinding. diff --git a/java/sca/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java b/java/sca/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java index 0a1f4283db..cd7a0fd625 100644 --- a/java/sca/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java +++ b/java/sca/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** diff --git a/java/sca/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java b/java/sca/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java index 5b20d17c83..89ea795529 100644 --- a/java/sca/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java +++ b/java/sca/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.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/modules/binding-rss-rome/META-INF/MANIFEST.MF b/java/sca/modules/binding-rss-rome/META-INF/MANIFEST.MF index 1818de2fd5..95f62ad91d 100644 --- a/java/sca/modules/binding-rss-rome/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-rss-rome/META-INF/MANIFEST.MF @@ -33,7 +33,7 @@ Import-Package: com.sun.syndication.feed.atom, org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
org.jdom;version="1.0.0",
- org.osoa.sca.annotations;version="2.0.0"
+ org.oasisopen.sca.annotation;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.binding.rss.rome
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java b/java/sca/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java index bb8dab391b..1124348158 100644 --- a/java/sca/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java +++ b/java/sca/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.rss.collection; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; import com.sun.syndication.feed.synd.SyndFeed; diff --git a/java/sca/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java b/java/sca/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java index 2213b50b53..a2b83465da 100644 --- a/java/sca/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java +++ b/java/sca/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.binding.rss.collection; import java.io.InputStream; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; import com.sun.syndication.feed.atom.Entry; diff --git a/java/sca/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java b/java/sca/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java index e71156c379..a80f721136 100644 --- a/java/sca/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java +++ b/java/sca/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.binding.rss; import org.apache.tuscany.sca.binding.rss.collection.Collection; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.sun.syndication.feed.synd.SyndEntry; import com.sun.syndication.feed.synd.SyndFeed; diff --git a/java/sca/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java b/java/sca/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java index d45be65e20..505a9cdee3 100644 --- a/java/sca/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java +++ b/java/sca/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.UUID; import org.apache.tuscany.sca.binding.rss.collection.Collection; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; import com.sun.syndication.feed.atom.Content; import com.sun.syndication.feed.synd.SyndContent; diff --git a/java/sca/modules/binding-sca-axis2/META-INF/MANIFEST.MF b/java/sca/modules/binding-sca-axis2/META-INF/MANIFEST.MF index 680a88f61a..b9357df32d 100644 --- a/java/sca/modules/binding-sca-axis2/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-sca-axis2/META-INF/MANIFEST.MF @@ -28,8 +28,8 @@ Import-Package: org.apache.axiom.om, org.apache.tuscany.sca.policy.util;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.axis2
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java index e4bb708a01..88a4b63637 100644 --- a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java +++ b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java @@ -24,7 +24,7 @@ import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.Message;
import org.apache.tuscany.sca.runtime.EndpointReference;
-import org.osoa.sca.ServiceUnavailableException;
+import org.oasisopen.sca.ServiceUnavailableException;
/**
diff --git a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java index d6724d2a61..7196118775 100644 --- a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java +++ b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.node.NodeFactory; import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.osoa.sca.ServiceUnavailableException;
+import org.oasisopen.sca.ServiceUnavailableException;
public class SimpleTestCase {
diff --git a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java index 1a2788ac74..0de092052f 100644 --- a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java +++ b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.binding.sca.axis2.helloworld;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface HelloWorldCallbackRemote {
diff --git a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java index a83fcb3069..5b2f73f9e2 100644 --- a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java +++ b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java @@ -19,9 +19,9 @@ package org.apache.tuscany.sca.binding.sca.axis2.helloworld;
-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;
@Remotable
@Callback(HelloWorldCallbackRemote.class)
diff --git a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java index c41548ec51..f4c4354a39 100644 --- a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java +++ b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.binding.sca.axis2.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;
@Remotable
@Callback(HelloWorldCallbackRemote.class)
diff --git a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java index 62d61e4fff..2cec5893a9 100644 --- a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java +++ b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.binding.sca.axis2.helloworld;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface HelloWorldServiceRemote {
diff --git a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java index 2dcc8cc64b..f4029e0ad5 100644 --- a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java +++ b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.binding.sca.axis2.helloworld;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface HelloWorldServiceRemote2 {
diff --git a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java index 8e7d2f8023..00fe836512 100644 --- a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java +++ b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl; import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackOnewayRemote;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class HelloWorldClientCallbackOnewayRemoteImpl implements HelloWorldClient {
diff --git a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java index 7d07c4ff43..df9a09c5fb 100644 --- a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java +++ b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl; import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackRemote;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class HelloWorldClientCallbackRemoteImpl implements HelloWorldClient {
diff --git a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java index 7098f10622..dcefef52e7 100644 --- a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java +++ b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl; import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class HelloWorldClientLocalImpl implements HelloWorldClient {
diff --git a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java index 07ae00bd31..628434108e 100644 --- a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java +++ b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl; import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote2;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class HelloWorldClientRemote2Impl implements HelloWorldClient {
diff --git a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java index 36854cb7b8..0dbb58272c 100644 --- a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java +++ b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl; import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class HelloWorldClientRemoteImpl implements HelloWorldClient {
diff --git a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java index fd3e3a1158..2d2fe0146d 100644 --- a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java +++ b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl; import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldCallbackRemote;
import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackOnewayRemote;
-import org.osoa.sca.annotations.Callback;
+import org.oasisopen.sca.annotation.Callback;
public class HelloWorldServiceCallbackOnewayRemoteImpl implements HelloWorldServiceCallbackOnewayRemote {
diff --git a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java index 3400e97447..219525e62d 100644 --- a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java +++ b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl; import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldCallbackRemote;
import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackRemote;
-import org.osoa.sca.annotations.Callback;
+import org.oasisopen.sca.annotation.Callback;
public class HelloWorldServiceCallbackRemoteImpl implements HelloWorldServiceCallbackRemote {
diff --git a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java index 5f8ccf9466..b34d809958 100644 --- a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java +++ b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java @@ -22,7 +22,7 @@ package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl; import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal;
import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote;
import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote2;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
@Service(interfaces={HelloWorldServiceRemote.class, HelloWorldServiceRemote2.class, HelloWorldServiceLocal.class} )
public class HelloWorldServiceMultipleServicesImpl implements HelloWorldServiceLocal, HelloWorldServiceRemote, HelloWorldServiceRemote2 {
diff --git a/java/sca/modules/binding-sca-corba/META-INF/MANIFEST.MF b/java/sca/modules/binding-sca-corba/META-INF/MANIFEST.MF index c9df9049dd..ede93bb946 100644 --- a/java/sca/modules/binding-sca-corba/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-sca-corba/META-INF/MANIFEST.MF @@ -33,7 +33,7 @@ Import-Package: javax.xml.namespace;version="1.0", org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
org.omg.CORBA,
- org.osoa.sca;version="2.0.0"
+ org.oasisopen.sca;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.corba
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java index 9132c5d3c8..1cb532a46b 100644 --- a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java +++ b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java @@ -34,7 +34,7 @@ import org.apache.tuscany.sca.interfacedef.util.FaultException; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.omg.CORBA.Object; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; public class CorbaSCAInvoker implements Invoker { diff --git a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java index 8e15060266..e8a76050e2 100644 --- a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java +++ b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java @@ -33,7 +33,7 @@ import org.apache.tuscany.sca.invocation.MessageFactory; import org.apache.tuscany.sca.provider.ServiceBindingProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Service binding provider for SCA default binding over CORBA binding diff --git a/java/sca/modules/binding-sca/META-INF/MANIFEST.MF b/java/sca/modules/binding-sca/META-INF/MANIFEST.MF index eef8cb3f83..9d5ca9e53f 100644 --- a/java/sca/modules/binding-sca/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-sca/META-INF/MANIFEST.MF @@ -25,7 +25,7 @@ Import-Package: javax.xml.stream;resolution:=optional, org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
- org.osoa.sca;version="2.0.0"
+ org.oasisopen.sca;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java b/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java index a6c70dcf1b..3c0ef4a17a 100644 --- a/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java +++ b/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java @@ -39,7 +39,7 @@ import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeComponentService; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.ServiceUnavailableException; +import org.oasisopen.sca.ServiceUnavailableException; /** * The sca reference binding provider mediates between the twin requirements of diff --git a/java/sca/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF b/java/sca/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF index cfdbc44721..746a6211d8 100644 --- a/java/sca/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-ws-axis2-policy/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Export-Package: org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.to org.apache.tuscany.sca.contribution.resolver,
org.apache.tuscany.sca.policy.util,
org.apache.tuscany.sca.contribution.processor,
- org.osoa.sca",
+ org.oasisopen.sca",
org.apache.tuscany.sca.binding.ws.axis2.policy.header;version="2.0.0"
Tool: Bnd-0.0.255
Bundle-Name: Apache Tuscany Policy Model for Axis2 WS binding
@@ -52,7 +52,7 @@ Import-Package: javax.xml.namespace, org.apache.tuscany.sca.policy.util;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
- org.osoa.sca;version="2.0.0"
+ org.oasisopen.sca;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.axis2.policy
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java index 21261359cb..ed4335baa7 100644 --- a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java +++ b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java @@ -31,7 +31,7 @@ import org.apache.tuscany.sca.provider.PolicyProviderFactory; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF b/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF index e5539f811c..fb74e4e245 100644 --- a/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Export-Package: org.apache.tuscany.sca.binding.ws.axis2;version="2.0.0"; javax.xml.stream,
org.apache.tuscany.sca.core.assembly,
org.apache.axis2.transport.http.server,
- org.osoa.sca,
+ org.oasisopen.sca,
org.apache.axis2.i18n,
org.apache.axis2.transport,
org.apache.axis2.transport.jms,
@@ -143,8 +143,8 @@ Import-Package: javax.security.auth.callback;resolution:=optional, org.apache.ws.commons.schema.resolver,
org.apache.ws.security,
org.apache.ws.security.handler,
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional,
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,
org.w3c.dom,
org.xml.sax
Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.axis2
diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java index f49e1c35dd..a532f899bc 100644 --- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java +++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java @@ -34,7 +34,7 @@ import org.apache.tuscany.sca.provider.ServiceBindingProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Axis2BindingProviderFactory diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java index 4b38b2b821..fe79ed073e 100644 --- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java +++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java @@ -33,7 +33,7 @@ import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple; import org.apache.tuscany.sca.provider.ReferenceBindingProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; public class Axis2ReferenceBindingProvider implements ReferenceBindingProvider { diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java index 1729a9210a..d7f8096ff2 100644 --- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java +++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java @@ -31,7 +31,7 @@ import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple; import org.apache.tuscany.sca.provider.ServiceBindingProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; public class Axis2ServiceBindingProvider implements ServiceBindingProvider { diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java index c8a012a952..c4bb3e9342 100644 --- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java +++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java @@ -81,7 +81,7 @@ import org.apache.tuscany.sca.policy.util.PolicyHandlerUtils; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.xsd.xml.XMLDocumentHelper; import org.apache.ws.commons.schema.resolver.URIResolver; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; public class Axis2ServiceClient { diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java index d467e0b3c8..64e49e0b0d 100644 --- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java +++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java @@ -32,7 +32,7 @@ import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.interfacedef.util.FaultException; import org.apache.tuscany.sca.policy.util.PolicyHandler; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; public class Axis2ServiceInOutSyncMessageReceiver extends AbstractInOutSyncMessageReceiver { private static final Logger logger = Logger.getLogger(Axis2ServiceInOutSyncMessageReceiver.class.getName()); diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java index 09cb6b13b7..e5b64b99cc 100644 --- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java +++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java @@ -107,7 +107,7 @@ import org.apache.ws.commons.schema.XmlSchemaExternal; import org.apache.ws.security.WSSecurityEngineResult; import org.apache.ws.security.handler.WSHandlerConstants; import org.apache.ws.security.handler.WSHandlerResult; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java index c09e453065..eba7a01798 100644 --- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java +++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java @@ -35,7 +35,7 @@ import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.policy.security.SecurityUtil; import org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPolicy; import org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPrincipal; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Policy handler to handle PolicySet that contain Axis2ConfigParamPolicy instances diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java index 4e7c1b0539..40d769d83a 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.binding.ws.axis2.itests;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* Test ?wsdl works and that the returned WSDL has the correct endpoint
diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java index 6fccbcfd00..4e1e7dbdad 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.binding.ws.axis2.itests; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Echo { diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java index 5e1a4cf259..3e96480c20 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.binding.ws.axis2.itests; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class EchoComponent implements Echo { diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java index f474c12af3..3ac30780b3 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.binding.ws.axis2.itests; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface HelloWorld { diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java index 88705c1a95..0dd6e90c72 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.binding.ws.axis2.itests; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldComponent implements HelloWorld { diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java index 274f6c8d28..13a16c8e8a 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.binding.ws.axis2.itests; import org.apache.axiom.om.OMElement; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface HelloWorldOM { diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java index bf371430a1..0e50781061 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.binding.ws.axis2.itests; import org.apache.axiom.om.OMElement; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface HelloWorldOM2 { diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java index d1cbfb88fd..82f61bd7c2 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.binding.ws.axis2.itests; import org.apache.axiom.om.OMElement; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldOMComponent implements HelloWorldOM { diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java index 7a6752126d..01abbd5382 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java @@ -30,7 +30,7 @@ import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.ContributionLocationHelper; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * This test verifies that the Endpoint URI specified in the wsdl takes precedence over the URI specified diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java index 82f6ff4c5d..5aefaac9ee 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.binding.ws.axis2.itests.mtom;
import javax.activation.DataHandler;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
/**
* This client program shows how to create an SCA runtime, start it,
diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java index ce79b47b86..457e80ebdb 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java @@ -18,7 +18,7 @@ */
package org.apache.tuscany.sca.binding.ws.axis2.itests.mtom;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
import javax.activation.DataHandler;
/**
diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java index 8d4a020560..8cc8daa9f7 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java @@ -18,7 +18,7 @@ */
package org.apache.tuscany.sca.binding.ws.axis2.itests.mtom;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
import javax.activation.DataHandler;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/java/sca/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF b/java/sca/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF index 2f31553634..6ccbaf735e 100644 --- a/java/sca/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF +++ b/java/sca/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Export-Package: org.apache.tuscany.sca.binding.ws.wsdlgen;uses:="org.a pache.tuscany.sca.databinding,org.apache.tuscany.sca.interfacedef.uti
l,org.apache.tuscany.sca.core,org.apache.tuscany.sca.policy,javax.wsd
l.extensions.schema,javax.xml.namespace,javax.wsdl.xml,javax.wsdl.ext
- ensions,org.apache.tuscany.sca.contribution.resolver,org.osoa.sca,org
+ ensions,org.apache.tuscany.sca.contribution.resolver,org.oasisopen.sca,org
.apache.ws.commons.schema,javax.wsdl.factory,org.apache.tuscany.sca.a
ssembly,javax.wsdl.extensions.soap,javax.xml.parsers,org.apache.tusca
ny.sca.monitor,org.apache.tuscany.sca.interfacedef.java,org.apache.tu
@@ -52,8 +52,8 @@ Import-Package: javax.jws;resolution:=optional, org.apache.tuscany.sca.xsd.xml;version="2.0.0";resolution:=optional,
org.apache.ws.commons.schema,
org.apache.ws.commons.schema.utils,
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional,
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,
org.w3c.dom
Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.wsdlgen
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java b/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java index bf9e22f645..1a9b26d618 100644 --- a/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java +++ b/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.binding.ws.wsdlgen; import org.apache.tuscany.sca.monitor.Problem; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; public class WSDLGenerationException extends ServiceRuntimeException { private static final long serialVersionUID = 1L; diff --git a/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java b/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java index 14c319f44a..c9bfce5865 100644 --- a/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java +++ b/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java @@ -36,7 +36,7 @@ import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract; import org.apache.tuscany.sca.xsd.XSDFactory; import org.apache.tuscany.sca.xsd.xml.XSDModelResolver; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * diff --git a/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java b/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java index 9635d65f99..5278a55d8a 100644 --- a/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java +++ b/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java @@ -22,8 +22,8 @@ package org.apache.tuscany.sca.binding.ws.wsdlgen; import javax.jws.WebMethod; import javax.jws.WebService; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * diff --git a/java/sca/modules/core-databinding/META-INF/MANIFEST.MF b/java/sca/modules/core-databinding/META-INF/MANIFEST.MF index 5f3b75409b..44bf03006e 100644 --- a/java/sca/modules/core-databinding/META-INF/MANIFEST.MF +++ b/java/sca/modules/core-databinding/META-INF/MANIFEST.MF @@ -38,8 +38,8 @@ Import-Package: javax.xml.bind.annotation.adapters, org.apache.tuscany.sca.runtime;version="2.0.0",
org.apache.tuscany.sca.xsd;version="2.0.0",
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0",
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0",
org.w3c.dom;resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.core.databinding
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java index 06d742e014..885a9390d8 100644 --- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java +++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java @@ -39,7 +39,7 @@ import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSFaultExceptionMapper; import org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSJavaInterfaceProcessor; import org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint; -import org.osoa.sca.CallableReference; +import org.oasisopen.sca.CallableReference; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java index 38ca2cd10c..427e0b254a 100644 --- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java +++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.databinding.TransformationContext; import org.apache.tuscany.sca.databinding.TransformationException; import org.apache.tuscany.sca.databinding.impl.BaseTransformer; import org.apache.tuscany.sca.interfacedef.DataType; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * This is a special transformer to transform the output from one IDL to the diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java index 76272f53dc..4267b1e347 100644 --- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java +++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.databinding.TransformationContext; import org.apache.tuscany.sca.databinding.TransformationException;
import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
import org.apache.tuscany.sca.databinding.xml.StAXHelper;
-import org.osoa.sca.CallableReference;
+import org.oasisopen.sca.CallableReference;
public class CallableReference2XMLStreamReader extends BaseTransformer<CallableReference, XMLStreamReader> implements
PullTransformer<CallableReference, XMLStreamReader> {
diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java index 8733b91cd4..97e16da273 100644 --- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java +++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.core.databinding.transformers; import org.apache.tuscany.sca.databinding.XMLTypeHelper;
import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
-import org.osoa.sca.CallableReference;
+import org.oasisopen.sca.CallableReference;
public class CallableReferenceDataBinding extends BaseDataBinding {
diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java index 09b2b53306..82853599b5 100644 --- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java +++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java @@ -24,7 +24,7 @@ import javax.xml.stream.XMLStreamReader; import org.apache.tuscany.sca.databinding.xml.Node2XMLStreamReader; import org.apache.tuscany.sca.databinding.xml.XMLStreamReader2Node; -import org.osoa.sca.CallableReference; +import org.oasisopen.sca.CallableReference; import org.w3c.dom.Element; /** diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java index fb5f939edb..b05f0cc238 100644 --- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java +++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java @@ -34,7 +34,7 @@ import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.interfacedef.util.ElementInfo; import org.apache.tuscany.sca.interfacedef.util.WrapperInfo; import org.apache.tuscany.sca.interfacedef.util.XMLType; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * This is a special transformer to transform the input from one IDL to the diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java index 8d586905c4..d5ba528475 100644 --- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java +++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java @@ -32,7 +32,7 @@ import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.interfacedef.util.ElementInfo; import org.apache.tuscany.sca.interfacedef.util.WrapperInfo; import org.apache.tuscany.sca.interfacedef.util.XMLType; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * This is a special transformer to transform the output from one IDL to the diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java index 3e8ada594c..cf68b55fe6 100644 --- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java +++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java @@ -32,7 +32,7 @@ import org.apache.tuscany.sca.databinding.PullTransformer; import org.apache.tuscany.sca.databinding.TransformationContext;
import org.apache.tuscany.sca.databinding.TransformationException;
import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.osoa.sca.CallableReference;
+import org.oasisopen.sca.CallableReference;
@SuppressWarnings("unchecked")
public class XMLStreamReader2CallableReference extends BaseTransformer<XMLStreamReader, CallableReference>
diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java index 5814f3d215..20dcb1b94a 100644 --- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java +++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java @@ -38,7 +38,7 @@ import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * An interceptor to transform data across databindings on the wire diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java index 3586f54d71..1ff8d86f45 100644 --- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java +++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java @@ -44,7 +44,7 @@ import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.InvocationChain; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Implementation of an interceptor that enforces pass-by-value semantics diff --git a/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java b/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java index 00a8b0b79b..1905cfb217 100644 --- a/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java +++ b/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java @@ -30,7 +30,7 @@ import org.apache.tuscany.sca.interfacedef.java.JavaInterface; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; import org.junit.Test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; import org.w3c.dom.Node; /** diff --git a/java/sca/modules/core-spi/META-INF/MANIFEST.MF b/java/sca/modules/core-spi/META-INF/MANIFEST.MF index 0e44882504..286ee65ecc 100644 --- a/java/sca/modules/core-spi/META-INF/MANIFEST.MF +++ b/java/sca/modules/core-spi/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Export-Package: org.apache.tuscany.sca.invocation;uses:="org.apache.tu scany.sca.runtime,org.apache.tuscany.sca.interfacedef";version="2.0.0",
org.apache.tuscany.sca.runtime;uses:="org.apache.tuscany.sca.invocati
on,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.endpointres
- olver,org.apache.tuscany.sca.provider,org.osoa.sca,org.apache.tuscany
+ olver,org.apache.tuscany.sca.provider,org.oasisopen.sca,org.apache.tuscany
.sca.interfacedef";version="2.0.0",org.apache.tuscany.sca.context;uses:
="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.assembly,org.
- apache.tuscany.sca.core,org.osoa.sca,org.apache.tuscany.sca.extensibi
+ apache.tuscany.sca.core,org.oasisopen.sca,org.apache.tuscany.sca.extensibi
lity";version="2.0.0",org.apache.tuscany.sca.provider;uses:="org.apache
.tuscany.sca.invocation,org.apache.tuscany.sca.runtime,org.apache.tus
cany.sca.assembly,org.apache.tuscany.sca.definitions,org.apache.tusca
@@ -39,7 +39,7 @@ Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0", org.apache.tuscany.sca.runtime;version="2.0.0",
org.apache.tuscany.sca.work;version="2.0.0",
- org.osoa.sca;version="2.0.0"
+ org.oasisopen.sca;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.core.spi
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java index b71fe4dd59..134f49e7b0 100644 --- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java +++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.context; import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.osoa.sca.ComponentContext; +import org.oasisopen.sca.ComponentContext; /** * Interface implemented by the provider of the ComponentContext. diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java index d4952adde9..d8f15b411c 100644 --- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java +++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.context; import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.osoa.sca.RequestContext; +import org.oasisopen.sca.RequestContext; /** * Interface implemented by the provider of the RequestContext. diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java index 8d13bbe569..e63bdf89c7 100644 --- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java +++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java @@ -26,9 +26,9 @@ import java.io.Writer; import org.apache.tuscany.sca.assembly.Binding; import org.apache.tuscany.sca.assembly.ComponentService; import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/core/META-INF/MANIFEST.MF b/java/sca/modules/core/META-INF/MANIFEST.MF index 1fb2ff9eac..c191526ffe 100644 --- a/java/sca/modules/core/META-INF/MANIFEST.MF +++ b/java/sca/modules/core/META-INF/MANIFEST.MF @@ -16,9 +16,9 @@ Export-Package: org.apache.tuscany.sca.core.assembly;version="2.0.0"; org.apache.tuscany.sca.interfacedef,
javax.xml.stream,
org.apache.tuscany.sca.core.assembly,
- org.osoa.sca,
+ org.oasisopen.sca,
org.apache.tuscany.sca.core.invocation",
- org.apache.tuscany.sca.core.conversation;version="2.0.0";uses:="org.apache.tuscany.sca.runtime,org.osoa.sca",
+ org.apache.tuscany.sca.core.conversation;version="2.0.0";uses:="org.apache.tuscany.sca.runtime,org.oasisopen.sca",
org.apache.tuscany.sca.core.factory;version="2.0.0",
org.apache.tuscany.sca.core.invocation;version="2.0.0";
uses:="org.apache.tuscany.sca.runtime,
@@ -30,7 +30,7 @@ Export-Package: org.apache.tuscany.sca.core.assembly;version="2.0.0"; org.apache.tuscany.sca.core.invocation.impl,
org.apache.tuscany.sca.work,
org.apache.tuscany.sca.core.factory,
- org.osoa.sca",
+ org.oasisopen.sca",
org.apache.tuscany.sca.core.scope;version="2.0.0";
uses:="org.apache.tuscany.sca.runtime,
org.apache.tuscany.sca.provider,
@@ -76,8 +76,8 @@ Import-Package: javax.naming, org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
org.apache.tuscany.sca.work;version="2.0.0",
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0"
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.core
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointWireImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointWireImpl.java index a87515c5cb..b089abba4f 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointWireImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointWireImpl.java @@ -36,7 +36,7 @@ import org.apache.tuscany.sca.runtime.EndpointReference; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.ServiceUnavailableException; +import org.oasisopen.sca.ServiceUnavailableException; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java index 4a25f7d4c4..2cbd72f218 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java @@ -33,7 +33,7 @@ import org.apache.tuscany.sca.provider.PolicyProvider; import org.apache.tuscany.sca.provider.ServiceBindingProvider; import org.apache.tuscany.sca.runtime.RuntimeComponentService; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Implementation of a Component Service. diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java index c2c4a0a9e4..62c2791060 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java @@ -55,7 +55,7 @@ import org.apache.tuscany.sca.runtime.RuntimeComponentService; import org.apache.tuscany.sca.runtime.RuntimeWire; import org.apache.tuscany.sca.runtime.RuntimeWireProcessor; import org.apache.tuscany.sca.work.WorkScheduler; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java index 6d7ce63d50..c0217e7336 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java @@ -27,7 +27,7 @@ import javax.xml.stream.XMLStreamReader; import org.apache.tuscany.sca.core.conversation.ConversationExt; import org.apache.tuscany.sca.runtime.EndpointReference; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.CallableReference; +import org.oasisopen.sca.CallableReference; /** * Extended version of CallableReference diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java index c68b05e8fb..29c4dfd362 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java @@ -42,7 +42,7 @@ import org.apache.tuscany.sca.runtime.EndpointReference; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java index f1f808d285..4e43518738 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java @@ -23,7 +23,7 @@ import org.apache.tuscany.sca.context.ComponentContextFactory; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.context.impl.ComponentContextImpl; import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.osoa.sca.ComponentContext; +import org.oasisopen.sca.ComponentContext; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java index 52dccb9fff..ace4dc48e1 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java @@ -23,7 +23,7 @@ import org.apache.tuscany.sca.context.RequestContextFactory; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.context.impl.RequestContextImpl; import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.osoa.sca.RequestContext; +import org.oasisopen.sca.RequestContext; /** * Default implementation of RequestContextFactory diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java index a36ae0f1fc..aa1e1de0f6 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.core.context; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.ServiceReference; /** * Extended ServiceReference diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java index 71410b7e35..c2264302b4 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java @@ -57,8 +57,8 @@ import org.apache.tuscany.sca.runtime.ReferenceParameters; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.Conversation; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.Conversation; +import org.oasisopen.sca.ServiceRuntimeException; /** * Base class for implementations of service and callback references. diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java index d35d02aa1b..d935f6b93a 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java @@ -54,10 +54,10 @@ import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.osoa.sca.CallableReference; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.ServiceRuntimeException; /** * Implementation of ComponentContext that delegates to a ComponentContextProvider. diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java index 71f4e2c9a1..06a667f951 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java @@ -65,7 +65,7 @@ import org.apache.tuscany.sca.runtime.EndpointReference; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java index 5f57d26456..015c80c6fa 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java @@ -37,8 +37,8 @@ import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeComponentService; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.CallableReference; -import org.osoa.sca.RequestContext; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.RequestContext; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java index fb782c9070..8aec07ceda 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java @@ -31,8 +31,8 @@ import org.apache.tuscany.sca.runtime.ReferenceParameters; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ServiceReference; /** * Default implementation of a ServiceReference. diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationExt.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationExt.java index 12416b723e..9182b080fe 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationExt.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationExt.java @@ -20,10 +20,10 @@ package org.apache.tuscany.sca.core.conversation; import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.osoa.sca.Conversation; +import org.oasisopen.sca.Conversation; /** - * An extended interface over org.osoa.Conversation + * An extended interface over org.oasisopen.Conversation * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java index 588c43b8b1..8a54b7568f 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java @@ -23,7 +23,7 @@ import org.apache.tuscany.sca.core.factory.ObjectCreationException; import org.apache.tuscany.sca.core.factory.ObjectFactory; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.osoa.sca.CallableReference; +import org.oasisopen.sca.CallableReference; /** * Uses a wire to return a CallableReference diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java index d19aa237cd..1ee922144f 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java @@ -22,7 +22,7 @@ import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.runtime.ReferenceParameters; -import org.osoa.sca.NoRegisteredCallbackException; +import org.oasisopen.sca.NoRegisteredCallbackException; /** * An interceptor applied to the forward direction of a wire that ensures the callback target implements the required diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java index 20cc6bfd03..b949500ab9 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java @@ -24,7 +24,7 @@ import org.apache.tuscany.sca.core.factory.ObjectCreationException; import org.apache.tuscany.sca.core.factory.ObjectFactory;
import org.apache.tuscany.sca.core.invocation.impl.CallbackReferenceImpl;
import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
+import org.oasisopen.sca.CallableReference;
/**
* Uses a wire to return a CallableReference
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java index a7f9b00153..4c3bee0dc9 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java @@ -36,8 +36,8 @@ import org.apache.tuscany.sca.core.invocation.impl.JDKInvocationHandler; import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; import org.apache.tuscany.sca.invocation.MessageFactory; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ServiceReference; /** * The implementation of a wire service that uses cglib dynamic proxies diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java index 3a2ebf0781..0be6e31b43 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java @@ -23,7 +23,7 @@ import java.util.List; import org.apache.tuscany.sca.core.invocation.impl.CallbackReferenceImpl; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.CallableReference; +import org.oasisopen.sca.CallableReference; /** * An extensible proxy factory. diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java index 6597df0e08..494cb93d97 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java @@ -31,7 +31,7 @@ import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.runtime.EndpointReference; import org.apache.tuscany.sca.runtime.RuntimeWire; import org.apache.tuscany.sca.work.WorkScheduler; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Adds non-blocking behavior to an invocation chain diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java index 179d20dc71..a5fabdf0f6 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.tuscany.sca.core.invocation.impl.CallbackReferenceImpl; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.CallableReference; +import org.oasisopen.sca.CallableReference; /** * Creates proxies that implement Java interfaces and invocation handlers for fronting wires diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java index 6736b5c0e4..0b73373e80 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java @@ -41,8 +41,8 @@ import org.apache.tuscany.sca.runtime.EndpointReference; import org.apache.tuscany.sca.runtime.ReferenceParameters; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.ConversationEndedException; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ConversationEndedException; +import org.oasisopen.sca.ServiceRuntimeException; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java index b8365c8994..2d88ed36d9 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java @@ -27,8 +27,8 @@ import org.apache.tuscany.sca.core.conversation.ConversationState; import org.apache.tuscany.sca.invocation.InvocationChain; import org.apache.tuscany.sca.invocation.MessageFactory; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.NoRegisteredCallbackException; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.NoRegisteredCallbackException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Responsible for dispatching to a callback through a wire. <p/> TODO cache diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java index 51e469d1c1..ff58a116b7 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java @@ -55,10 +55,10 @@ import org.apache.tuscany.sca.runtime.EndpointReference; import org.apache.tuscany.sca.runtime.ReferenceParameters; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ConversationEndedException; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ConversationEndedException; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.ServiceRuntimeException; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java index a4ec97f4a3..b0c2edd2b6 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java @@ -31,8 +31,8 @@ import org.apache.tuscany.sca.core.invocation.CachedProxy; import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; import org.apache.tuscany.sca.invocation.MessageFactory; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ServiceReference; /** * the default implementation of a wire service that uses JDK dynamic proxies diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java index e24d7e3f35..602958ab5e 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java @@ -51,7 +51,7 @@ import java.util.logging.Logger; import org.apache.tuscany.sca.extensibility.ServiceDeclaration; import org.apache.tuscany.sca.extensibility.ServiceDiscovery; import org.apache.tuscany.sca.invocation.Phase; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java index 0da04d4646..12fa4a485d 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java @@ -28,7 +28,7 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ThreadFactory; import org.apache.tuscany.sca.work.WorkSchedulerException; -import org.osoa.sca.annotations.Destroy; +import org.oasisopen.sca.annotation.Destroy; /** * A thread-pool based implementation for the JSR-237 work manager. diff --git a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/CallbackInterfaceInterceptorTestCase.java.fixme b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/CallbackInterfaceInterceptorTestCase.java.fixme index 27985425bc..b11eaa9621 100644 --- a/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/CallbackInterfaceInterceptorTestCase.java.fixme +++ b/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/CallbackInterfaceInterceptorTestCase.java.fixme @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.core.invocation.impl.MessageFactoryImpl; import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Message; import org.easymock.EasyMock; -import org.osoa.sca.NoRegisteredCallbackException; +import org.oasisopen.sca.NoRegisteredCallbackException; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/data-api/META-INF/MANIFEST.MF b/java/sca/modules/data-api/META-INF/MANIFEST.MF index c6f6575118..d2afef210a 100644 --- a/java/sca/modules/data-api/META-INF/MANIFEST.MF +++ b/java/sca/modules/data-api/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.data.collection;uses:="org.osoa
+Export-Package: org.apache.tuscany.sca.data.collection;uses:="org.oasisopen
.sca.annotations";version="2.0.0"
Tool: Bnd-0.0.255
Bundle-Name: Apache Tuscany SCA Data API
diff --git a/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java b/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java index f559d5d914..f1841c975e 100644 --- a/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java +++ b/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.data.collection; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * Provides access to a collection of data items. diff --git a/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java b/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java index c30bbc771a..229b29f5cd 100644 --- a/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java +++ b/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.data.collection; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * Provides access to a collection of data items. diff --git a/java/sca/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/java/sca/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer index a1f18f9638..9c2357d4f4 100644 --- a/java/sca/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer +++ b/java/sca/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer @@ -16,8 +16,8 @@ # under the License.
# Implementation classes for the transformers
-# org.apache.tuscany.sca.databinding.axiom.CallableReference2OMElement;source=org.osoa.sca.CallableReference,target=org.apache.axiom.om.OMElement,weight=10
-# org.apache.tuscany.sca.databinding.axiom.OMElement2CallableReference;source=org.apache.axiom.om.OMElement,target=org.osoa.sca.CallableReference,weight=10
+# org.apache.tuscany.sca.databinding.axiom.CallableReference2OMElement;source=org.oasisopen.sca.CallableReference,target=org.apache.axiom.om.OMElement,weight=10
+# org.apache.tuscany.sca.databinding.axiom.OMElement2CallableReference;source=org.apache.axiom.om.OMElement,target=org.oasisopen.sca.CallableReference,weight=10
org.apache.tuscany.sca.databinding.axiom.Externalizable2OMElement;source=java.io.Externalizable,target=org.apache.axiom.om.OMElement,weight=10
org.apache.tuscany.sca.databinding.axiom.OMElement2Externalizable;source=org.apache.axiom.om.OMElement,target=java.io.Externalizable,weight=10
org.apache.tuscany.sca.databinding.axiom.Exception2OMElement;source=java:exception,target=org.apache.axiom.om.OMElement,weight=10
diff --git a/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF b/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF index ad3fbef921..7093404615 100644 --- a/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF +++ b/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Export-Package: org.apache.tuscany.sca.databinding.jaxb;uses:="org.apa che.tuscany.sca.databinding,org.apache.tuscany.sca.interfacedef.util,
javax.xml.transform.dom,org.xml.sax,javax.xml.namespace,javax.imageio
,javax.xml.stream,org.apache.tuscany.sca.contribution.resolver,org.ap
- ache.tuscany.sca.databinding.util,org.osoa.sca,org.apache.tuscany.sca
+ ache.tuscany.sca.databinding.util,org.oasisopen.sca,org.apache.tuscany.sca
.databinding.xml,org.apache.tuscany.sca.databinding.impl,org.apache.w
s.commons.schema.resolver,org.apache.tuscany.sca.interfacedef,org.w3c
.dom,javax.xml.datatype,javax.activation,javax.xml.bind.attachment,ja
@@ -43,7 +43,7 @@ Import-Package: javax.activation, org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.xsd;version="2.0.0",
- org.osoa.sca;version="2.0.0",
+ org.oasisopen.sca;version="2.0.0",
org.w3c.dom,
org.xml.sax
Bundle-SymbolicName: org.apache.tuscany.sca.databinding.jaxb
diff --git a/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java b/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java index 003b4fb992..35adffe23b 100644 --- a/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java +++ b/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java @@ -44,7 +44,7 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Provides utilities to convert an object into a different kind of Object. For example, convert a diff --git a/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java b/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java index 456a217e2f..217345caba 100644 --- a/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java +++ b/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java @@ -28,7 +28,7 @@ import java.util.Collection; import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * A PropertyDescriptor provides access to a bean property. Values can be queried/changed using the diff --git a/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java b/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java index d8224686f9..e29b634857 100644 --- a/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java +++ b/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java @@ -44,7 +44,7 @@ import org.apache.tuscany.sca.interfacedef.util.TypeInfo; import org.apache.tuscany.sca.interfacedef.util.XMLType; import org.apache.tuscany.sca.xsd.XSDFactory; import org.apache.tuscany.sca.xsd.XSDefinition; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; import org.w3c.dom.Document; public class JAXBTypeHelper implements XMLTypeHelper { diff --git a/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java b/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java index f83c7f09d9..7473a8e56e 100644 --- a/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java +++ b/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.databinding.jaxb; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; public class JAXBWrapperException extends ServiceRuntimeException { private static final long serialVersionUID = 1L; diff --git a/java/sca/modules/databinding-json/META-INF/MANIFEST.MF b/java/sca/modules/databinding-json/META-INF/MANIFEST.MF index 536409b50c..8826f3b1b0 100644 --- a/java/sca/modules/databinding-json/META-INF/MANIFEST.MF +++ b/java/sca/modules/databinding-json/META-INF/MANIFEST.MF @@ -27,7 +27,7 @@ Import-Package: com.metaparadigm.jsonrpc, org.codehaus.jettison.mapped,
org.json,
- org.osoa.sca.annotations;version="2.0.0"
+ org.oasisopen.sca.annotation;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.databinding.json
Bundle-DocURL: http://www.apache.org/
Export-Package: org.apache.tuscany.sca.databinding.json;version="2.0.0"
diff --git a/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java b/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java index 1072b70029..fb02d27b05 100644 --- a/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java +++ b/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java @@ -34,7 +34,7 @@ import org.apache.tuscany.sca.databinding.json.JSONHelper; import org.apache.tuscany.sca.interfacedef.DataType; import org.apache.tuscany.sca.interfacedef.util.XMLType; import org.codehaus.jettison.json.JSONObject; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/databinding-sdo/META-INF/MANIFEST.MF b/java/sca/modules/databinding-sdo/META-INF/MANIFEST.MF index 43c1bd2211..798df260ff 100644 --- a/java/sca/modules/databinding-sdo/META-INF/MANIFEST.MF +++ b/java/sca/modules/databinding-sdo/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Export-Package: org.apache.tuscany.sca.databinding.sdo;uses:="org.apac terfacedef.util,org.apache.tuscany.sca.assembly.impl,javax.xml.transf
orm.dom,org.apache.tuscany.sca.core,commonj.sdo.helper,javax.xml.name
space,javax.xml.stream,org.w3c.dom.ls,org.apache.tuscany.sca.contribu
- tion.resolver,org.apache.tuscany.sca.databinding.util,org.osoa.sca,or
+ tion.resolver,org.apache.tuscany.sca.databinding.util,org.oasisopen.sca,or
g.apache.ws.commons.schema,org.apache.tuscany.sca.databinding.impl,or
g.apache.tuscany.sca.contribution,org.apache.tuscany.sca.monitor,org.
apache.tuscany.sdo.api,org.w3c.dom,org.apache.tuscany.sca.interfacede
@@ -57,7 +57,7 @@ Import-Package: commonj.sdo;version="2.1", org.eclipse.emf.ecore,
org.eclipse.emf.ecore.util,
- org.osoa.sca;version="2.0.0",
+ org.oasisopen.sca;version="2.0.0",
org.w3c.dom,
org.w3c.dom.bootstrap,
org.w3c.dom.ls
diff --git a/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java b/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java index c1978883df..0927f87f3b 100644 --- a/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java +++ b/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java @@ -39,7 +39,7 @@ import org.apache.tuscany.sca.interfacedef.util.WrapperInfo; import org.apache.tuscany.sca.interfacedef.util.XMLType; import org.apache.tuscany.sca.xsd.XSDFactory; import org.apache.tuscany.sca.xsd.XSDefinition; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.bootstrap.DOMImplementationRegistry; diff --git a/java/sca/modules/databinding-xmlbeans/META-INF/MANIFEST.MF b/java/sca/modules/databinding-xmlbeans/META-INF/MANIFEST.MF index fb5d2b8be5..dfddbeb6c8 100644 --- a/java/sca/modules/databinding-xmlbeans/META-INF/MANIFEST.MF +++ b/java/sca/modules/databinding-xmlbeans/META-INF/MANIFEST.MF @@ -19,8 +19,8 @@ Import-Package: javax.xml.namespace, org.apache.xmlbeans,
org.apache.xmlbeans.impl.values;resolution:=optional,
org.apache.xmlbeans.xml.stream;resolution:=optional,
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0",
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0",
org.w3c.dom
Bundle-SymbolicName: org.apache.tuscany.sca.databinding.xmlbeans
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java b/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java index 15616979c2..4e557522fe 100644 --- a/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java +++ b/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java @@ -30,7 +30,7 @@ import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.interfacedef.util.XMLType; import org.apache.xmlbeans.SchemaType; import org.apache.xmlbeans.XmlObject; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * XMLBeans DataBinding diff --git a/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java b/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java index c820d9d250..9620d38eaf 100644 --- a/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java +++ b/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java @@ -23,7 +23,7 @@ import org.apache.tuscany.sca.databinding.TransformationContext; import org.apache.tuscany.sca.databinding.Transformer; import org.apache.tuscany.sca.databinding.impl.BaseTransformer; import org.apache.xmlbeans.XmlObject; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; import org.w3c.dom.Node; /** diff --git a/java/sca/modules/domain-manager/META-INF/MANIFEST.MF b/java/sca/modules/domain-manager/META-INF/MANIFEST.MF index 42e7c62489..482c048938 100644 --- a/java/sca/modules/domain-manager/META-INF/MANIFEST.MF +++ b/java/sca/modules/domain-manager/META-INF/MANIFEST.MF @@ -6,8 +6,8 @@ Export-Package: org.apache.tuscany.sca.domain.manager.impl;uses:="org. ,org.apache.tuscany.sca.core,javax.xml.namespace,javax.servlet,javax.
xml.stream,org.apache.tuscany.sca.core.assembly,org.apache.tuscany.sc
a.contribution.resolver,org.apache.tuscany.sca.workspace,org.apache.t
- uscany.sca.core.invocation,org.osoa.sca,org.apache.tuscany.sca.assemb
- ly.builder,org.apache.tuscany.sca.implementation.node,org.osoa.sca.an
+ uscany.sca.core.invocation,org.oasisopen.sca,org.apache.tuscany.sca.assemb
+ ly.builder,org.apache.tuscany.sca.implementation.node,org.oasisopen.sca.an
notations,org.apache.tuscany.sca.assembly,org.apache.commons.fileuplo
ad,org.apache.commons.fileupload.servlet,org.apache.tuscany.sca.works
pace.builder,javax.xml.parsers,org.apache.tuscany.sca.contribution,or
@@ -16,7 +16,7 @@ Export-Package: org.apache.tuscany.sca.domain.manager.impl;uses:="org. lize,org.apache.tuscany.sca.contribution.processor,javax.servlet.http
";version="2.0.0",org.apache.tuscany.sca.domain.manager.launcher;uses:=
"org.apache.tuscany.sca.domain.manager.impl,org.apache.tuscany.sca.no
- de,org.osoa.sca";version="2.0.0"
+ de,org.oasisopen.sca";version="2.0.0"
Private-Package: icons;version="2.0.0"
Tool: Bnd-0.0.255
Bundle-Name: Apache Tuscany SCA Domain Manager Application
@@ -61,8 +61,8 @@ Import-Package: javax.servlet, org.apache.tuscany.sca.workspace;version="2.0.0",
org.apache.tuscany.sca.workspace.builder;version="2.0.0",
org.apache.xml.serialize,
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0",
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0",
org.w3c.dom
Bundle-SymbolicName: org.apache.tuscany.sca.domain.manager
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java index 0e25068f5f..65959645ae 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java @@ -34,10 +34,10 @@ import org.apache.tuscany.sca.data.collection.Item; import org.apache.tuscany.sca.data.collection.ItemCollection; import org.apache.tuscany.sca.data.collection.LocalItemCollection; import org.apache.tuscany.sca.data.collection.NotFoundException; -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.annotation.Init; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a component that returns composite configuration collections. diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java index 8dd2320294..b4b9f5dc0f 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java @@ -79,10 +79,10 @@ import org.apache.tuscany.sca.workspace.WorkspaceFactory; import org.apache.tuscany.sca.workspace.builder.ContributionBuilder; import org.apache.tuscany.sca.workspace.builder.ContributionBuilderException; import org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint; -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.annotation.Init; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a service that returns a fully configured composite. diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java index 320fd97e3b..a4f8f1722b 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java @@ -67,10 +67,10 @@ import org.apache.tuscany.sca.data.collection.NotFoundException; import org.apache.tuscany.sca.domain.manager.impl.CompositeGeneratorServiceImpl.Cache.ContributionCache; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; -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.annotation.Init; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a service that generates a composite from a composite model. diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java index 5321cc2dc1..3cf10fc587 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java @@ -85,12 +85,12 @@ import org.apache.tuscany.sca.workspace.builder.ContributionBuilderException; import org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint; import org.apache.xml.serialize.OutputFormat; import org.apache.xml.serialize.XMLSerializer; -import org.osoa.sca.ServiceRuntimeException; -import org.osoa.sca.annotations.Init; -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.ServiceRuntimeException; +import org.oasisopen.sca.annotation.Init; +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 org.w3c.dom.Document; /** diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java index a4d7680cb0..46652984b9 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java @@ -32,9 +32,9 @@ import javax.servlet.http.HttpServletResponse; import org.apache.tuscany.sca.data.collection.Item; import org.apache.tuscany.sca.data.collection.LocalItemCollection; import org.apache.tuscany.sca.data.collection.NotFoundException; -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; /** * Implementation of a contribution collection service component. diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java index 9f1d0c3fa4..58aab75855 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java @@ -71,10 +71,10 @@ import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.workspace.builder.ContributionBuilder; import org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint; -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.annotation.Init; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a deployable composite collection service. diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java index 14ab9579f4..d36bf77c96 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java @@ -39,10 +39,10 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.data.collection.Item; import org.apache.tuscany.sca.data.collection.LocalItemCollection; import org.apache.tuscany.sca.data.collection.NotFoundException; -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.annotation.Init; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a service that returns the source of a deployable composite. diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java index d2d1e04a79..d4f882185c 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java @@ -61,12 +61,12 @@ import org.apache.tuscany.sca.data.collection.LocalItemCollection; import org.apache.tuscany.sca.data.collection.NotFoundException; import org.apache.xml.serialize.OutputFormat; import org.apache.xml.serialize.XMLSerializer; -import org.osoa.sca.ServiceRuntimeException; -import org.osoa.sca.annotations.Init; -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.ServiceRuntimeException; +import org.oasisopen.sca.annotation.Init; +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 org.w3c.dom.Document; /** diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java index a5ce6e12d6..21c7cd4383 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java @@ -23,10 +23,10 @@ import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.ModuleActivator; import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint; -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.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a domain manager configuration component. diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java index fee1efc37a..644ebd86d0 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java @@ -39,8 +39,8 @@ import org.apache.tuscany.sca.interfacedef.InterfaceContract; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.ServiceRuntimeException; /** * Common functions and constants used by the admin components. diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java index a53250515a..22eff61840 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java @@ -29,11 +29,11 @@ import org.apache.tuscany.sca.data.collection.Entry; import org.apache.tuscany.sca.data.collection.Item; import org.apache.tuscany.sca.data.collection.ItemCollection; import org.apache.tuscany.sca.data.collection.NotFoundException; -import org.osoa.sca.annotations.Init; -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.Init; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a file collection service component. diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java index 2adb623876..7881217436 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java @@ -39,11 +39,11 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.osoa.sca.annotations.Init; -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.Init; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a servlet component supporting file upload/download. diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java index 06d28b0502..695f25f480 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java @@ -35,9 +35,9 @@ import javax.xml.namespace.QName; import org.apache.tuscany.sca.data.collection.Entry; import org.apache.tuscany.sca.data.collection.Item; import org.apache.tuscany.sca.data.collection.LocalItemCollection; -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; /** * Implementation of a service that returns a node configuration. diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java index 53616f3b46..9ab86ec2fc 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java @@ -39,11 +39,11 @@ import org.apache.tuscany.sca.data.collection.Item; import org.apache.tuscany.sca.data.collection.ItemCollection; import org.apache.tuscany.sca.data.collection.LocalItemCollection; import org.apache.tuscany.sca.data.collection.NotFoundException; -import org.osoa.sca.ServiceRuntimeException; -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.ServiceRuntimeException; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a node process collection service. diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java index 23c506446f..f7ae597c52 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java @@ -44,10 +44,10 @@ import org.apache.tuscany.sca.data.collection.Entry; import org.apache.tuscany.sca.data.collection.Item; import org.apache.tuscany.sca.data.collection.LocalItemCollection; import org.apache.tuscany.sca.data.collection.NotFoundException; -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.annotation.Init; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a component that provides a quick start path for a diff --git a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java index 87fd41a74f..c0afcc6efd 100644 --- a/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java +++ b/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java @@ -24,8 +24,8 @@ import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.ContributionLocationHelper; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ServiceReference; /** * Bootstrap class for the SCA domain manager. diff --git a/java/sca/modules/endpoint/META-INF/MANIFEST.MF b/java/sca/modules/endpoint/META-INF/MANIFEST.MF index 07bc37a3f4..8b8122ecc1 100644 --- a/java/sca/modules/endpoint/META-INF/MANIFEST.MF +++ b/java/sca/modules/endpoint/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Import-Package: javax.xml.stream;resolution:=optional, org.apache.tuscany.sca.interfacedef;version="2.0.0";resolution:=optional,
org.apache.tuscany.sca.monitor;version="2.0.0";resolution:=optional,
org.apache.tuscany.sca.policy;version="2.0.0";resolution:=optional,
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.endpoint
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java b/java/sca/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java index 3d861f2018..17fad7de6b 100644 --- a/java/sca/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/modules/endpoint/src/test/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/modules/host-webapp/META-INF/MANIFEST.MF b/java/sca/modules/host-webapp/META-INF/MANIFEST.MF index 56657b9460..f5164a6db9 100644 --- a/java/sca/modules/host-webapp/META-INF/MANIFEST.MF +++ b/java/sca/modules/host-webapp/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Export-Package: org.apache.tuscany.sca.host.webapp;version="2.0.0"; org.apache.tuscany.sca.host.embedded,
javax.servlet.jsp.tagext,
org.apache.tuscany.sca.host.webapp,
- org.osoa.sca,
+ org.oasisopen.sca,
javax.servlet.jsp"
Tool: Bnd-0.0.255
Bundle-Name: Apache Tuscany SCA Webapp Host
@@ -33,7 +33,7 @@ Import-Package: javax.naming, org.apache.tuscany.sca.host.webapp;version="2.0.0",
org.apache.tuscany.sca.host.webapp.jsp;version="2.0.0",
org.apache.tuscany.sca.node;version="2.0.0",
- org.osoa.sca;version="2.0.0"
+ org.oasisopen.sca;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.host.webapp
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java b/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java index 704f45b706..555ad16cd8 100644 --- a/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java +++ b/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java @@ -27,7 +27,7 @@ import javax.servlet.jsp.tagext.TagSupport; import org.apache.tuscany.sca.host.webapp.WebAppServletHost; import org.apache.tuscany.sca.node.Node; -import org.osoa.sca.ComponentContext; +import org.oasisopen.sca.ComponentContext; /** * Tag to handle SCA references @@ -57,7 +57,7 @@ public class ReferenceTag extends TagSupport { } ServletContext servletContext = pageContext.getServletContext(); - ComponentContext componentContext = (ComponentContext)servletContext.getAttribute("org.osoa.sca.ComponentContext"); + ComponentContext componentContext = (ComponentContext)servletContext.getAttribute("org.oasisopen.sca.ComponentContext"); Node scaDomain = null; if (componentContext == null) { scaDomain = (Node)servletContext.getAttribute(WebAppServletHost.SCA_NODE_ATTRIBUTE); diff --git a/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF b/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF index 9ed92ac28b..552581efb6 100644 --- a/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF +++ b/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF @@ -40,7 +40,7 @@ Import-Package: javax.resource.spi, org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0",
org.w3c.dom
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.bpel.ode
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java index c5d6555a24..ed327e237b 100644 --- a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java +++ b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.implementation.bpel.ode.GeronimoTxFactory; import org.apache.tuscany.sca.provider.ImplementationProvider; import org.apache.tuscany.sca.provider.ImplementationProviderFactory; import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.osoa.sca.annotations.Destroy; +import org.oasisopen.sca.annotation.Destroy; /** * BPEL Implementation provider factory diff --git a/java/sca/modules/implementation-java-runtime/META-INF/MANIFEST.MF b/java/sca/modules/implementation-java-runtime/META-INF/MANIFEST.MF index cb4ffec5ce..eb643084fb 100644 --- a/java/sca/modules/implementation-java-runtime/META-INF/MANIFEST.MF +++ b/java/sca/modules/implementation-java-runtime/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Export-Package: org.apache.tuscany.sca.implementation.java.context;use rg.apache.tuscany.sca.implementation.java,org.apache.tuscany.sca.inte
rfacedef,org.w3c.dom,javax.xml.namespace,org.apache.tuscany.sca.invoc
ation,org.apache.tuscany.sca.core.factory,org.apache.tuscany.sca.inte
- rfacedef.impl,org.osoa.sca,org.apache.tuscany.sca.core.invocation";ve
+ rfacedef.impl,org.oasisopen.sca,org.apache.tuscany.sca.core.invocation";ve
rsion="2.0.0"
Private-Package: org.apache.tuscany.sca.implementation.java.invocation
;version="2.0.0",org.apache.tuscany.sca.implementation.java.module;vers
@@ -52,8 +52,8 @@ Import-Package: javax.xml.namespace, org.apache.tuscany.sca.policy.util;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0",
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0",
org.w3c.dom
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java.runtim
e
diff --git a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java index 4519c6128e..43fb5d6170 100644 --- a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java +++ b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java @@ -22,7 +22,7 @@ import org.apache.tuscany.sca.context.RequestContextFactory; import org.apache.tuscany.sca.core.factory.ObjectCreationException; import org.apache.tuscany.sca.core.factory.ObjectFactory; import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.osoa.sca.RequestContext; +import org.oasisopen.sca.RequestContext; /** * Creates instances of RequestContext for injection on component implementation instances diff --git a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java index 2903cc6fc8..f2a0d576db 100644 --- a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java +++ b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.implementation.java.invocation; import org.apache.tuscany.sca.core.factory.ObjectCreationException; import org.apache.tuscany.sca.core.factory.ObjectFactory; -import org.osoa.sca.ComponentContext; +import org.oasisopen.sca.ComponentContext; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java index 809b7c18b8..0044c0f196 100644 --- a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java +++ b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java @@ -62,8 +62,8 @@ import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.ConversationID; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.ConversationID; /** * The runtime instantiation of Java component implementations @@ -116,7 +116,7 @@ public class JavaComponentContextProvider { /* if(Modifier.isPublic(field.getModifiers())) { instanceFactoryProvider.getInjectionSites().add(element); - } else if(field.getAnnotation(org.osoa.sca.annotations.Property.class) != null) { + } else if(field.getAnnotation(org.oasisopen.sca.annotation.Property.class) != null) { instanceFactoryProvider.getInjectionSites().add(element); } */ @@ -189,7 +189,7 @@ public class JavaComponentContextProvider { Field field = (Field)element.getAnchor(); if(Modifier.isPublic(field.getModifiers())) { instanceFactoryProvider.getInjectionSites().add(element); - } else if(field.getAnnotation(org.osoa.sca.annotations.Reference.class) != null) { + } else if(field.getAnnotation(org.oasisopen.sca.annotation.Reference.class) != null) { instanceFactoryProvider.getInjectionSites().add(element); } } else { diff --git a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java index 0db3d3d190..60e093d0dc 100644 --- a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java +++ b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java @@ -36,7 +36,7 @@ import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.runtime.EndpointReference; import org.apache.tuscany.sca.runtime.ReferenceParameters; import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Responsible for synchronously dispatching an invocation to a Java component diff --git a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java index 09e3591152..e5deab4b9e 100644 --- a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java +++ b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java @@ -45,8 +45,8 @@ import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java-xml/META-INF/MANIFEST.MF b/java/sca/modules/implementation-java-xml/META-INF/MANIFEST.MF index 66e9cc8e3c..480b457ec8 100644 --- a/java/sca/modules/implementation-java-xml/META-INF/MANIFEST.MF +++ b/java/sca/modules/implementation-java-xml/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Import-Package: javax.xml.namespace, org.apache.tuscany.sca.interfacedef.java;version="2.0.0",
org.apache.tuscany.sca.monitor;version="2.0.0",
org.apache.tuscany.sca.policy;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java.xml
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java b/java/sca/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java index 3f28d740a7..64298b6275 100644 --- a/java/sca/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java +++ b/java/sca/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.EagerInit; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.EagerInit; +import org.oasisopen.sca.annotation.Scope; /** * An implementation of the Add service. diff --git a/java/sca/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java b/java/sca/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java index c1fceb575d..9f64dc8bca 100644 --- a/java/sca/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; /** * An implementation of the Calculator service. diff --git a/java/sca/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java b/java/sca/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java index e1f35f99b5..f5b8ff5be0 100644 --- a/java/sca/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java +++ b/java/sca/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** * An implementation of the Divide service. diff --git a/java/sca/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java b/java/sca/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java index d621407908..d146d23153 100644 --- a/java/sca/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java +++ b/java/sca/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** * An implementation of the Multiply service. diff --git a/java/sca/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java b/java/sca/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java index 4fed0a8c6a..ffe09c3dde 100644 --- a/java/sca/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java +++ b/java/sca/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** * An implementation of the subtract service. diff --git a/java/sca/modules/implementation-java/META-INF/MANIFEST.MF b/java/sca/modules/implementation-java/META-INF/MANIFEST.MF index b7abf65f22..ab3b8e9864 100644 --- a/java/sca/modules/implementation-java/META-INF/MANIFEST.MF +++ b/java/sca/modules/implementation-java/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0
Export-Package: org.apache.tuscany.sca.implementation.java.introspect;
uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.impleme
- ntation.java,org.osoa.sca";version="2.0.0",org.apache.tuscany.sca.imple
+ ntation.java,org.oasisopen.sca";version="2.0.0",org.apache.tuscany.sca.imple
mentation.java;uses:="org.apache.tuscany.sca.assembly,org.apache.tusc
any.sca.implementation.java.introspect,org.apache.tuscany.sca.core,or
g.apache.tuscany.sca.policy,org.apache.tuscany.sca.interfacedef.java"
@@ -31,8 +31,8 @@ Import-Package: javax.jws, org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.policy.util;version="2.0.0",
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0"
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java index 5e83ea656f..31a92f35bc 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java @@ -41,7 +41,7 @@ import java.util.Map; import java.util.Set; import java.util.logging.Logger; -import org.osoa.sca.CallableReference; +import org.oasisopen.sca.CallableReference; /** * Implements various reflection-related operations @@ -68,7 +68,7 @@ public final class JavaIntrospectionHelper { private static void checkInvalidAnnotations(AnnotatedElement element) { for (Annotation a : element.getAnnotations()) { - if (a.annotationType().getName().startsWith("org.osoa.sca.annotations.")) { + if (a.annotationType().getName().startsWith("org.oasisopen.sca.annotation.")) { logger.warning("Invalid annotation " + a + " is found on " + element); } } diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java index 16de6d951a..b08a1f6182 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java @@ -24,7 +24,7 @@ import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.implementation.java.IntrospectionException; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor; -import org.osoa.sca.annotations.AllowsPassByReference; +import org.oasisopen.sca.annotation.AllowsPassByReference; /** * Processes {@link AllowsPassByReference} on an implementation diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java index 69798be864..fd6dbcc1ed 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java @@ -28,7 +28,7 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaResourceImpl; import org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor; import org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper; -import org.osoa.sca.annotations.ComponentName; +import org.oasisopen.sca.annotation.ComponentName; /** * Processes {@link @ComponentName} annotations on a component implementation and adds diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java index 1421adc3d6..b49dbb5fe7 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java @@ -29,7 +29,7 @@ import org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisito /** * Handles processing of a constructor decorated with - * {@link org.osoa.sca.annotations.Constructor} + * {@link org.oasisopen.sca.annotation.Constructor} * * @version $Rev$ $Date$ */ @@ -47,7 +47,7 @@ public class ConstructorProcessor extends BaseJavaClassVisitor { for (Constructor constructor : ctors) { JavaConstructorImpl<?> definition = new JavaConstructorImpl(constructor); type.getConstructors().put(constructor, definition); - if (constructor.getAnnotation(org.osoa.sca.annotations.Constructor.class) != null) { + if (constructor.getAnnotation(org.oasisopen.sca.annotation.Constructor.class) != null) { if (found) { throw new DuplicateConstructorException("Multiple constructors marked with @Constructor", constructor); } @@ -60,8 +60,8 @@ public class ConstructorProcessor extends BaseJavaClassVisitor { @Override public <T> void visitConstructor(Constructor<T> constructor, JavaImplementation type) throws IntrospectionException { - org.osoa.sca.annotations.Constructor annotation = constructor - .getAnnotation(org.osoa.sca.annotations.Constructor.class); + org.oasisopen.sca.annotation.Constructor annotation = constructor + .getAnnotation(org.oasisopen.sca.annotation.Constructor.class); if (annotation == null) { return; } diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java index f43b1fa22b..0694def99a 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java @@ -28,9 +28,9 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaResourceImpl; import org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor; import org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Context; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.Context; /** * Processes {@link @Context} annotations on a component implementation and adds diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java index d4f7ee0bce..ef94104cbd 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java @@ -28,7 +28,7 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaResourceImpl; import org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor; import org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper; -import org.osoa.sca.annotations.ConversationID; +import org.oasisopen.sca.annotation.ConversationID; /** * Processes {@link @ConversationID} annotations on a component implementation and adds diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java index 814ca8ca6c..2fb657159b 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java @@ -25,9 +25,9 @@ import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.implementation.java.IntrospectionException; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java index 7f26846969..68cfc4c189 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java @@ -25,7 +25,7 @@ import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.implementation.java.IntrospectionException; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor; -import org.osoa.sca.annotations.Destroy; +import org.oasisopen.sca.annotation.Destroy; /** * Processes the {@link @Destroy} annotation on a component implementation and diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java index 88a245cbf3..d6494e3845 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java @@ -24,7 +24,7 @@ import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** * Thrown when more than one component implementation constructor is annotated with {@link - * org.osoa.sca.annotations.Constructor} + * org.oasisopen.sca.annotation.Constructor} * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java index 9b834e7e87..8bfae89162 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Thrown when an implementation is annotated multiple times with {@link org.osoa.sca.annotations.Destroy} + * Thrown when an implementation is annotated multiple times with {@link org.oasisopen.sca.annotation.Destroy} * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java index 4325faef26..38f6478531 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Thrown when an implementation is annotated multiple times with {@link @org.osoa.sca.annotations.Init} + * Thrown when an implementation is annotated multiple times with {@link @org.oasisopen.sca.annotation.Init} * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java index 650d6dd251..ca02c96834 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java @@ -22,10 +22,10 @@ import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.implementation.java.IntrospectionException; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor; -import org.osoa.sca.annotations.EagerInit; +import org.oasisopen.sca.annotation.EagerInit; /** - * Handles processing of {@link org.osoa.sca.annotations.EagerInit} + * Handles processing of {@link org.oasisopen.sca.annotation.EagerInit} * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java index ab07870086..551909e9bc 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java @@ -55,11 +55,11 @@ import org.apache.tuscany.sca.interfacedef.java.JavaInterface; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Remotable; /** * Heuristically evaluates an un-annotated Java implementation type to determine @@ -241,7 +241,7 @@ public class HeuristicPojoProcessor extends BaseJavaClassVisitor { Constructor constructor; boolean explict = false; if (definition != null && definition.getConstructor() - .isAnnotationPresent(org.osoa.sca.annotations.Constructor.class)) { + .isAnnotationPresent(org.oasisopen.sca.annotation.Constructor.class)) { // the constructor was already defined explicitly return; } else if (definition != null) { diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java index 9fe2fcd468..badd41fbb9 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java @@ -23,7 +23,7 @@ import java.lang.reflect.Member; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Denotes an illegal use of {@link org.osoa.sca.annotations.Callback} on a reference + * Denotes an illegal use of {@link org.oasisopen.sca.annotation.Callback} on a reference * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java index f5696122df..fa1e67a336 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java @@ -23,7 +23,7 @@ import java.lang.reflect.Member; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Denotes an illegal signature for a method decorated with {@link org.osoa.sca.annotations.Context} + * Denotes an illegal signature for a method decorated with {@link org.oasisopen.sca.annotation.Context} * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java index 6a0d60c92f..0c4c3d5646 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java @@ -23,7 +23,7 @@ import java.lang.reflect.Member; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Denotes an illegal signature for a method decorated with {@link org.osoa.sca.annotations.Destroy} + * Denotes an illegal signature for a method decorated with {@link org.oasisopen.sca.annotation.Destroy} * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java index 8f50852c2d..2956b60b65 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java @@ -23,7 +23,7 @@ import java.lang.reflect.Member; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Denotes an illegal signature for a method decorated with {@link @org.osoa.sca.annotations.Init} + * Denotes an illegal signature for a method decorated with {@link @org.oasisopen.sca.annotation.Init} * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java index e130f4221d..e0f90779a1 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Denotes an illegal use of the {@link @org.osoa.sca.annotations.Service} annotation + * Denotes an illegal use of the {@link @org.oasisopen.sca.annotation.Service} annotation * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java index 927c7f1565..8d12f14729 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java @@ -25,7 +25,7 @@ import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.implementation.java.IntrospectionException; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor; -import org.osoa.sca.annotations.Init; +import org.oasisopen.sca.annotation.Init; /** * Processes the {@link @Init} annotation on a component implementation and diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java index 91b97b2caf..c75dfdaf46 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java @@ -22,7 +22,7 @@ import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** * Denotes an invalid constructor definition, e.g. when the number of injection names specified in {@link - * org.osoa.sca.annotations.Constructor} do not match the number of actual constructor parameters + * org.oasisopen.sca.annotation.Constructor} do not match the number of actual constructor parameters * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java index 976b4da120..429b88aa1f 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Denotes an invalid usage of {@link org.osoa.sca.annotations.Property} + * Denotes an invalid usage of {@link org.oasisopen.sca.annotation.Property} * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java index e77a6beb0d..fbf3fc9ed3 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Denotes an invalid usage of {@link org.osoa.sca.annotations.Reference} + * Denotes an invalid usage of {@link org.oasisopen.sca.annotation.Reference} * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java index c65e7179f5..230c8c6fdd 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Thrown when a service type specified by an {@link org.osoa.sca.annotations.Service} annotation is invalid, e.g. it is + * Thrown when a service type specified by an {@link org.oasisopen.sca.annotation.Service} annotation is invalid, e.g. it is * not an interface * * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java index 2344ce49fc..a85a66e8c7 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java @@ -41,11 +41,11 @@ import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.PolicyFactory; import org.apache.tuscany.sca.policy.PolicySet; import org.apache.tuscany.sca.policy.PolicySetAttachPoint; -import org.osoa.sca.annotations.PolicySets; -import org.osoa.sca.annotations.Requires; +import org.oasisopen.sca.annotation.PolicySets; +import org.oasisopen.sca.annotation.Requires; /** - * Processes an {@link org.osoa.sca.annotations.Requires} annotation + * Processes an {@link org.oasisopen.sca.annotation.Requires} annotation * * @version $Rev$ $Date$ */ @@ -61,8 +61,8 @@ public class PolicyProcessor extends BaseJavaClassVisitor { @Override public void visitField(Field field, JavaImplementation type) throws IntrospectionException { - org.osoa.sca.annotations.Reference annotation = - field.getAnnotation( org.osoa.sca.annotations.Reference.class); + org.oasisopen.sca.annotation.Reference annotation = + field.getAnnotation( org.oasisopen.sca.annotation.Reference.class); if (annotation == null) { return; } @@ -313,8 +313,8 @@ public class PolicyProcessor extends BaseJavaClassVisitor { private static Reference getReference(Method method, JavaImplementation type) { //since the ReferenceProcessor is called ahead of the PolicyProcessor the type should have //picked up the reference setter method - org.osoa.sca.annotations.Reference annotation = - method.getAnnotation(org.osoa.sca.annotations.Reference.class); + org.oasisopen.sca.annotation.Reference annotation = + method.getAnnotation(org.oasisopen.sca.annotation.Reference.class); if (annotation != null) { if (JavaIntrospectionHelper.isSetter(method)) { String name = annotation.name(); diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java index cf1b4a9830..a755146997 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * Processes an {@link @Property} annotation, updating the component type with diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java index 29a872e27a..49c589c5a1 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java @@ -39,8 +39,8 @@ import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; import org.apache.tuscany.sca.interfacedef.java.JavaInterface; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Reference; /** * Processes an {@link @Reference} annotation, updating the component type with diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java index 7d7e0df7fc..4bfdb9af9e 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java @@ -39,7 +39,7 @@ public class ScopeProcessor extends BaseJavaClassVisitor { public <T> void visitClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException { - org.osoa.sca.annotations.Scope annotation = clazz.getAnnotation(org.osoa.sca.annotations.Scope.class); + org.oasisopen.sca.annotation.Scope annotation = clazz.getAnnotation(org.oasisopen.sca.annotation.Scope.class); if (annotation == null) { type.setJavaScope(JavaScopeImpl.STATELESS); return; diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java index 52c68c1976..68f90a5be5 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java @@ -41,14 +41,14 @@ import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; import org.apache.tuscany.sca.interfacedef.java.JavaInterface; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; /** - * Processes an {@link org.osoa.sca.annotations.Service} annotation and updates + * Processes an {@link org.oasisopen.sca.annotation.Service} annotation and updates * the component type with corresponding {@link Service}s. Also processes - * related {@link org.osoa.sca.annotations.Callback} annotations. + * related {@link org.oasisopen.sca.annotation.Callback} annotations. * * @version $Rev$ $Date$ */ @@ -63,7 +63,7 @@ public class ServiceProcessor extends BaseJavaClassVisitor { @Override public <T> void visitClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException { - org.osoa.sca.annotations.Service annotation = clazz.getAnnotation(org.osoa.sca.annotations.Service.class); + org.oasisopen.sca.annotation.Service annotation = clazz.getAnnotation(org.oasisopen.sca.annotation.Service.class); if (annotation == null) { // scan interfaces for remotable Set<Class<?>> interfaces = getAllInterfaces(clazz); diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java index 57d224b2bf..bfaa759cd2 100644 --- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java +++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; /** - * Thrown when a method or field marked with {@link org.osoa.sca.annotations.Context} takes an unknown type + * Thrown when a method or field marked with {@link org.oasisopen.sca.annotation.Context} takes an unknown type * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java index 689201dd99..ce79ae2045 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java @@ -29,7 +29,7 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.annotations.AllowsPassByReference; +import org.oasisopen.sca.annotation.AllowsPassByReference; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java index e4b89ebf65..625aec4858 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java @@ -41,8 +41,8 @@ import org.apache.tuscany.sca.implementation.java.JavaParameterImpl; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; import org.junit.Test; -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$ @@ -114,19 +114,19 @@ public class ConstructorProcessorTestCase { private static class BadFoo { - @org.osoa.sca.annotations.Constructor("foo") + @org.oasisopen.sca.annotation.Constructor("foo") public BadFoo(String foo) { } - @org.osoa.sca.annotations.Constructor( {"foo", "bar"}) + @org.oasisopen.sca.annotation.Constructor( {"foo", "bar"}) public BadFoo(String foo, String bar) { } } private static class Foo { - @org.osoa.sca.annotations.Constructor("foo") + @org.oasisopen.sca.annotation.Constructor("foo") public Foo(String foo) { } @@ -138,13 +138,13 @@ public class ConstructorProcessorTestCase { } private static class BadAnnotation { - @org.osoa.sca.annotations.Constructor("foo") + @org.oasisopen.sca.annotation.Constructor("foo") public BadAnnotation(String foo, Foo ref) { } } public static final class Mixed { - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public Mixed(@Reference String param1, @Property(name = "foo") String param2, @Reference(name = "bar") @@ -153,7 +153,7 @@ public class ConstructorProcessorTestCase { } public static final class Multiple { - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public Multiple(@Reference Collection<String> param1, @Property(name = "foo") String[] param2, @Reference(name = "bar", required = true) diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java index c736a96a01..3f531e48d6 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java @@ -31,7 +31,7 @@ import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFacto import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.junit.Test; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * @version $Rev$ $Date$ @@ -121,22 +121,22 @@ public class ConstructorPropertyTestCase extends AbstractProcessorTest { private static class Foo { - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public Foo(@Property(name = "myProp", required = true)String prop) { } - @org.osoa.sca.annotations.Constructor("myProp") + @org.oasisopen.sca.annotation.Constructor("myProp") public Foo(@Property Integer prop) { } - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public Foo(@Property(name = "myProp1")String prop1, @Property(name = "myProp2")String prop2) { } - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public Foo(@Property List prop) { } @@ -144,22 +144,22 @@ public class ConstructorPropertyTestCase extends AbstractProcessorTest { private static class BadFoo { - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public BadFoo(@Property(name = "myProp")String prop1, @Property(name = "myProp")String prop2) { } - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public BadFoo(@Property String prop) { } - @org.osoa.sca.annotations.Constructor("myProp") + @org.oasisopen.sca.annotation.Constructor("myProp") public BadFoo(@Property Integer prop, @Property Integer prop2) { } - @org.osoa.sca.annotations.Constructor({"myRef", "myRef2"}) + @org.oasisopen.sca.annotation.Constructor({"myRef", "myRef2"}) public BadFoo(@Property List ref, @Property(name = "myOtherRef")List ref2) { } diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java index 5676d3e6a2..decdc34386 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java @@ -31,7 +31,7 @@ import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFacto import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.junit.Test; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ @@ -117,22 +117,22 @@ public class ConstructorReferenceTestCase extends AbstractProcessorTest { private static class Foo { - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public Foo(@Reference(name = "myRef", required = true)String prop) { } - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public Foo(@Reference(name = "myRef1")String prop1, @Reference(name = "myRef2")String prop2) { } - @org.osoa.sca.annotations.Constructor("myRef") + @org.oasisopen.sca.annotation.Constructor("myRef") public Foo(@Reference Integer prop) { } - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public Foo(@Reference List prop) { } @@ -140,7 +140,7 @@ public class ConstructorReferenceTestCase extends AbstractProcessorTest { private static class NoNameFoo { - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public NoNameFoo(@Reference String prop) { } @@ -148,22 +148,22 @@ public class ConstructorReferenceTestCase extends AbstractProcessorTest { private static class BadFoo { - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public BadFoo(@Reference(name = "myRef")String prop1, @Reference(name = "myRef")String prop2) { } - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public BadFoo(@Reference String prop) { } - @org.osoa.sca.annotations.Constructor("myRef") + @org.oasisopen.sca.annotation.Constructor("myRef") public BadFoo(@Reference Integer ref, @Reference Integer ref2) { } - @org.osoa.sca.annotations.Constructor({"myRef", "myRef2"}) + @org.oasisopen.sca.annotation.Constructor({"myRef", "myRef2"}) public BadFoo(@Reference List ref, @Reference(name = "myOtherRef")List ref2) { } diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java index e1a0edc0f8..e8d26f6103 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java @@ -116,22 +116,22 @@ public class ConstructorResourceTestCase extends AbstractProcessorTest { private static class Foo { - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public Foo(@Resource(name = "myResource") String resource) { } - @org.osoa.sca.annotations.Constructor("myResource") + @org.oasisopen.sca.annotation.Constructor("myResource") public Foo(@Resource Integer resource) { } - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public Foo(@Resource(name = "myResource1") String res1, @Resource(name = "myResource2") String res2) { } - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public Foo(@Resource List res) { } @@ -139,22 +139,22 @@ public class ConstructorResourceTestCase extends AbstractProcessorTest { private static class BadFoo { - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public BadFoo(@Resource(name = "myResource") String res1, @Resource(name = "myResource") String res2) { } - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public BadFoo(@Resource String res) { } - @org.osoa.sca.annotations.Constructor("myProp") + @org.oasisopen.sca.annotation.Constructor("myProp") public BadFoo(@Resource Integer res, @Resource Integer res2) { } - @org.osoa.sca.annotations.Constructor({"myRes", "myRes2"}) + @org.oasisopen.sca.annotation.Constructor({"myRes", "myRes2"}) public BadFoo(@Resource List res, @Resource(name = "myOtherRes") List res2) { } diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java index 1b8e9b6e93..124c83e9e2 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java @@ -31,10 +31,10 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.ComponentName; -import org.osoa.sca.annotations.Context; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.ComponentName; +import org.oasisopen.sca.annotation.Context; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java index 6516da3c20..9bff2aa556 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java @@ -29,7 +29,7 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.annotations.ConversationID; +import org.oasisopen.sca.annotation.ConversationID; /** * Test the ConversationIDProcessor diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java index eceb3fc6ae..9978cd456d 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java @@ -29,9 +29,9 @@ import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFacto import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.junit.Test; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java index c46af80cec..b82205863c 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java @@ -29,7 +29,7 @@ import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFacto import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.junit.Test; -import org.osoa.sca.annotations.Destroy; +import org.oasisopen.sca.annotation.Destroy; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java index 6a27d1c957..04d87f60fe 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java @@ -25,7 +25,7 @@ import org.apache.tuscany.sca.implementation.java.IntrospectionException; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.junit.Test; -import org.osoa.sca.annotations.EagerInit; +import org.oasisopen.sca.annotation.EagerInit; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java index 90f70d6590..53dd94c1a3 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java @@ -31,7 +31,7 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java index 277fad699f..19197e81e4 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java @@ -36,9 +36,9 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; import org.junit.Test; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java index f7cee88a3e..a163652ead 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java @@ -39,10 +39,10 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper; import org.junit.Test; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.annotation.Service; /** * Verifies component type information is properly introspected from an unadorned diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java index e678c87349..17b5381641 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java @@ -80,7 +80,7 @@ public class HeutisticExtensibleConstructorTestCase extends AbstractProcessorTes * annotation processors is called. <p/> For example, given: * * <pre> - * Foo(@Bar String prop, @org.osoa.sca.annotations.Property(name = "foo") String prop2) + * Foo(@Bar String prop, @org.oasisopen.sca.annotation.Property(name = "foo") String prop2) * </pre> * * <p/> Heuristic evaluation of @@ -138,15 +138,15 @@ public class HeutisticExtensibleConstructorTestCase extends AbstractProcessorTes public static class Foo { public Foo(@Bar - String prop, @org.osoa.sca.annotations.Property(name = "foo") + String prop, @org.oasisopen.sca.annotation.Property(name = "foo") String prop2) { } } public static class Foo2 { - public Foo2(@org.osoa.sca.annotations.Reference(name = "baz") + public Foo2(@org.oasisopen.sca.annotation.Reference(name = "baz") String prop1, @Bar - String prop2, @org.osoa.sca.annotations.Property(name = "foo") + String prop2, @org.oasisopen.sca.annotation.Property(name = "foo") String prop3) { } } diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java index 45ea7444b5..5df7078aa6 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java @@ -28,7 +28,7 @@ import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFacto import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.junit.Test; -import org.osoa.sca.annotations.Init; +import org.oasisopen.sca.annotation.Init; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java index 7c37e4452a..e6a29b0e13 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java @@ -40,8 +40,8 @@ import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.PolicySetAttachPoint; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.annotations.Requires; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Requires; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java index 8afeb710c5..99e28365da 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java @@ -35,7 +35,7 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java index 9f4e626ecd..1c061bfd43 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java @@ -36,7 +36,7 @@ import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.JavaInterface; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java index 5097a1d6be..fe5eee55de 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java @@ -90,23 +90,23 @@ public class ScopeProcessorTestCase { javaImplementationFactory = new DefaultJavaImplementationFactory(); } - @org.osoa.sca.annotations.Scope("COMPOSITE") + @org.oasisopen.sca.annotation.Scope("COMPOSITE") private class Composite { } - @org.osoa.sca.annotations.Scope("SESSION") + @org.oasisopen.sca.annotation.Scope("SESSION") private class Session { } - @org.osoa.sca.annotations.Scope("CONVERSATION") + @org.oasisopen.sca.annotation.Scope("CONVERSATION") private class Conversation { } - @org.osoa.sca.annotations.Scope("REQUEST") + @org.oasisopen.sca.annotation.Scope("REQUEST") private class Request { } - @org.osoa.sca.annotations.Scope("STATELESS") + @org.oasisopen.sca.annotation.Scope("STATELESS") private class Stateless { } diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java index f612232fd7..32988b2768 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java @@ -36,9 +36,9 @@ import org.apache.tuscany.sca.interfacedef.InvalidCallbackException; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java index 9d93d75e4c..528639a008 100644 --- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java +++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java @@ -32,9 +32,9 @@ import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.JavaInterface; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/implementation-node-runtime/META-INF/MANIFEST.MF b/java/sca/modules/implementation-node-runtime/META-INF/MANIFEST.MF index 48b294f27b..066332344b 100644 --- a/java/sca/modules/implementation-node-runtime/META-INF/MANIFEST.MF +++ b/java/sca/modules/implementation-node-runtime/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0
Export-Package: org.apache.tuscany.sca.implementation.node.launcher;us
- es:="org.apache.tuscany.sca.node,org.osoa.sca";version="2.0.0",org.apac
+ es:="org.apache.tuscany.sca.node,org.oasisopen.sca";version="2.0.0",org.apac
he.tuscany.sca.implementation.node.webapp;uses:="org.apache.tuscany.s
ca.implementation.node.launcher,org.apache.tuscany.sca.node,org.apach
e.tuscany.sca.core,javax.servlet,org.apache.tuscany.sca.host.http,jav
@@ -29,7 +29,7 @@ Import-Package: javax.servlet, org.apache.tuscany.sca.node;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
- org.osoa.sca;version="2.0.0"
+ org.oasisopen.sca;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.node.runtim
e
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java b/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java index 48abc21520..202514d89e 100644 --- a/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java +++ b/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java @@ -23,8 +23,8 @@ import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.ContributionLocationHelper; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ServiceReference; /** * Bootstrap class for the SCA node daemon. diff --git a/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java b/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java index 8552c3434d..2daab36796 100644 --- a/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java +++ b/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java @@ -23,8 +23,8 @@ import org.apache.tuscany.sca.node.Client; import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ServiceReference; /** * Bootstrap class for standalone SCA nodes. diff --git a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java index 33c790585c..e5a726c8c0 100644 --- a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java +++ b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java @@ -299,7 +299,7 @@ public class OSGiAnnotations { public <T> void visitClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException { - org.osoa.sca.annotations.Scope annotation = clazz.getAnnotation(org.osoa.sca.annotations.Scope.class); + org.oasisopen.sca.annotation.Scope annotation = clazz.getAnnotation(org.oasisopen.sca.annotation.Scope.class); if (annotation == null) { type.setJavaScope(JavaScopeImpl.COMPOSITE); return; diff --git a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java index 0264f0b102..8eee337638 100644 --- a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java +++ b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java @@ -56,9 +56,9 @@ import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospect import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.ConversationID; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.ConversationID; /** diff --git a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java index e775041592..a4fb1ec2ca 100644 --- a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java +++ b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java @@ -41,8 +41,8 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; import org.osgi.framework.ServiceReference; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; /** diff --git a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java index 630c1502d1..e59032e3ea 100644 --- a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java +++ b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java @@ -23,7 +23,7 @@ import java.util.Hashtable; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * diff --git a/java/sca/modules/implementation-pojo/META-INF/MANIFEST.MF b/java/sca/modules/implementation-pojo/META-INF/MANIFEST.MF index b8777f45fe..298921a55f 100644 --- a/java/sca/modules/implementation-pojo/META-INF/MANIFEST.MF +++ b/java/sca/modules/implementation-pojo/META-INF/MANIFEST.MF @@ -23,8 +23,8 @@ Import-Package: javax.jws, org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.policy.util;version="2.0.0",
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0"
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/implementation-script-runtime/META-INF/MANIFEST.MF b/java/sca/modules/implementation-script-runtime/META-INF/MANIFEST.MF index 95371915ab..aed41dbb4f 100644 --- a/java/sca/modules/implementation-script-runtime/META-INF/MANIFEST.MF +++ b/java/sca/modules/implementation-script-runtime/META-INF/MANIFEST.MF @@ -49,8 +49,8 @@ Import-Package: com.sun.script.jruby, org.jruby.runtime.load,
org.jruby.util,
org.jruby.util.io,
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional,
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,
org.w3c.dom
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.script.runt
ime
diff --git a/java/sca/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java b/java/sca/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java index 980864869f..cffe65c27a 100644 --- a/java/sca/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java +++ b/java/sca/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.implementation.script.itests.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * diff --git a/java/sca/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java b/java/sca/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java index 47cdc03e0e..719212e831 100644 --- a/java/sca/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java +++ b/java/sca/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.implementation.script.itests.properties; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * diff --git a/java/sca/modules/implementation-spring-runtime/META-INF/MANIFEST.MF b/java/sca/modules/implementation-spring-runtime/META-INF/MANIFEST.MF index 9c1166ca3c..ea29fcdb24 100644 --- a/java/sca/modules/implementation-spring-runtime/META-INF/MANIFEST.MF +++ b/java/sca/modules/implementation-spring-runtime/META-INF/MANIFEST.MF @@ -39,8 +39,8 @@ Import-Package: javax.xml.namespace, org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional,
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,
org.springframework.beans,
org.springframework.beans.factory,
org.springframework.beans.factory.config,
diff --git a/java/sca/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java b/java/sca/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java index fd295daaf6..935ff19992 100644 --- a/java/sca/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java +++ b/java/sca/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.implementation.spring.itests.helloworld; -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/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java b/java/sca/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java index bd35e9f3b9..0c912fddfa 100644 --- a/java/sca/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java +++ b/java/sca/modules/implementation-spring-runtime/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.implementation.spring.itests.helloworld; -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/modules/implementation-spring/META-INF/MANIFEST.MF b/java/sca/modules/implementation-spring/META-INF/MANIFEST.MF index 63678aafe3..8c8d152708 100644 --- a/java/sca/modules/implementation-spring/META-INF/MANIFEST.MF +++ b/java/sca/modules/implementation-spring/META-INF/MANIFEST.MF @@ -68,8 +68,8 @@ Import-Package: javax.xml.namespace, org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional,
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,
org.springframework.beans,
org.springframework.beans.factory,
org.springframework.beans.factory.config,
diff --git a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java index cd0567f461..6e0987791b 100644 --- a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java +++ b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java @@ -31,7 +31,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.osoa.sca.annotations.ComponentName;
+import org.oasisopen.sca.annotation.ComponentName;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
public class ComponentNameAnnotationProcessor implements BeanPostProcessor {
diff --git a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java index 4dadf37189..689ac27f0f 100644 --- a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java +++ b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java @@ -33,7 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; public class ConstructorAnnotationProcessor extends InstantiationAwareBeanPostProcessorAdapter {
private Class<? extends Annotation> constructorAnnotationType
- = org.osoa.sca.annotations.Constructor.class;
+ = org.oasisopen.sca.annotation.Constructor.class;
private Class<? extends Annotation> autowiredAnnotationType = Autowired.class;
diff --git a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java index 44737bf9d1..129a15e72e 100644 --- a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java +++ b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.implementation.spring.processor;
import java.lang.annotation.Annotation;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Destroy;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Destroy;
import org.springframework.beans.factory.annotation.InitDestroyAnnotationBeanPostProcessor;
import org.springframework.util.Assert;
diff --git a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java index d8755c58f4..fbc0e2b36f 100644 --- a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java +++ b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java @@ -32,7 +32,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.osoa.sca.annotations.Property;
+import org.oasisopen.sca.annotation.Property;
import org.apache.tuscany.sca.assembly.ComponentProperty;
import org.apache.tuscany.sca.core.factory.ObjectFactory;
import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
diff --git a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java index 52f8ac3684..48c727baab 100644 --- a/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java +++ b/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java @@ -31,7 +31,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
public class ReferenceAnnotationProcessor implements BeanPostProcessor {
diff --git a/java/sca/modules/implementation-widget-runtime/META-INF/MANIFEST.MF b/java/sca/modules/implementation-widget-runtime/META-INF/MANIFEST.MF index 6fc4a501a3..bd616d5740 100644 --- a/java/sca/modules/implementation-widget-runtime/META-INF/MANIFEST.MF +++ b/java/sca/modules/implementation-widget-runtime/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Import-Package: org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional,
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,
org.w3c.dom
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.widget.runt
ime
diff --git a/java/sca/modules/implementation-widget-runtime/src/test/java/store/Catalog.java b/java/sca/modules/implementation-widget-runtime/src/test/java/store/Catalog.java index 370474f29f..5dd7d70e6c 100644 --- a/java/sca/modules/implementation-widget-runtime/src/test/java/store/Catalog.java +++ b/java/sca/modules/implementation-widget-runtime/src/test/java/store/Catalog.java @@ -19,7 +19,7 @@ package store; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * Interface for the Catalog Service. diff --git a/java/sca/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java b/java/sca/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java index bed053eeee..1a34094cc5 100644 --- a/java/sca/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java +++ b/java/sca/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java @@ -22,7 +22,7 @@ package store; import java.util.ArrayList; import java.util.List; -import org.osoa.sca.annotations.Init; +import org.oasisopen.sca.annotation.Init; /** * Implementation of the Catalog Service. diff --git a/java/sca/modules/implementation-xquery/META-INF/MANIFEST.MF b/java/sca/modules/implementation-xquery/META-INF/MANIFEST.MF index 0cd11b6395..380c00293e 100644 --- a/java/sca/modules/implementation-xquery/META-INF/MANIFEST.MF +++ b/java/sca/modules/implementation-xquery/META-INF/MANIFEST.MF @@ -57,7 +57,7 @@ Import-Package: javax.xml.namespace, org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
- org.osoa.sca;version="2.0.0",
+ org.oasisopen.sca;version="2.0.0",
org.w3c.dom
Bundle-SymbolicName: org.apache.tuscany.sca.implementation.xquery
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF b/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF index 0c8ba06f2e..057e562cfe 100644 --- a/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF +++ b/java/sca/modules/interface-java-jaxws/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Export-Package: org.apache.tuscany.sca.interfacedef.java.jaxws;uses:=" org.apache.tuscany.sca.databinding,org.apache.tuscany.sca.interfacede
f.util,org.objectweb.asm,javax.jws,javax.xml.namespace,javax.jws.soap
,org.apache.tuscany.sca.interfacedef.java.impl,org.apache.tuscany.sca
- .databinding.annotation,org.osoa.sca,javax.xml.bind.annotation.adapte
+ .databinding.annotation,org.oasisopen.sca,javax.xml.bind.annotation.adapte
rs,org.apache.tuscany.sca.interfacedef.java,org.apache.tuscany.sca.in
terfacedef,org.apache.tuscany.sca.interfacedef.java.introspect,javax.
xml.bind.annotation,org.apache.tuscany.sca.databinding.jaxb,org.apach
@@ -42,8 +42,8 @@ Import-Package: javax.jws, org.apache.tuscany.sca.policy;version="2.0.0",
org.objectweb.asm;version="3.1",
org.objectweb.asm.util;version="3.1";resolution:=optional,
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.interface.java.jaxws
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java b/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java index 75a0aa8131..242da0ebd4 100644 --- a/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java +++ b/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java @@ -39,7 +39,7 @@ import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl; import org.apache.tuscany.sca.interfacedef.java.JavaInterface; import org.apache.tuscany.sca.interfacedef.util.FaultException; import org.apache.tuscany.sca.interfacedef.util.XMLType; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * JAX-WS ExceptionHandler diff --git a/java/sca/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java b/java/sca/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java index a6a3375eff..997713a780 100644 --- a/java/sca/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java +++ b/java/sca/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java @@ -29,7 +29,7 @@ import javax.jws.WebParam; import javax.jws.WebResult; import javax.xml.ws.Holder; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/interface-java/META-INF/MANIFEST.MF b/java/sca/modules/interface-java/META-INF/MANIFEST.MF index 4768a5426c..47ca825cd6 100644 --- a/java/sca/modules/interface-java/META-INF/MANIFEST.MF +++ b/java/sca/modules/interface-java/META-INF/MANIFEST.MF @@ -32,7 +32,7 @@ Import-Package: javax.xml.namespace, org.apache.tuscany.sca.interfacedef.java.introspect;version="2.0.0",
org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
org.apache.tuscany.sca.policy;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0"
+ org.oasisopen.sca.annotation;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.interface.java
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java index c858d4f71a..c05b21c5ed 100644 --- a/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java +++ b/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java @@ -48,10 +48,10 @@ import org.apache.tuscany.sca.interfacedef.java.JavaOperation; import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor; import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper; import org.apache.tuscany.sca.interfacedef.util.XMLType; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * Default implementation of a Java interface introspector. @@ -100,7 +100,7 @@ public class JavaInterfaceIntrospectorImpl { javaInterface.setConversational(conversational); Class<?> callbackClass = null; - org.osoa.sca.annotations.Callback callback = clazz.getAnnotation(org.osoa.sca.annotations.Callback.class); + org.oasisopen.sca.annotation.Callback callback = clazz.getAnnotation(org.oasisopen.sca.annotation.Callback.class); if (callback != null && !Void.class.equals(callback.value())) { callbackClass = callback.value(); if (remotable && !callbackClass.isAnnotationPresent(Remotable.class)) { diff --git a/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java b/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java index ed00510a67..bf80bef175 100644 --- a/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java +++ b/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java @@ -31,11 +31,11 @@ import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor; import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.PolicyFactory; import org.apache.tuscany.sca.policy.PolicySet; -import org.osoa.sca.annotations.PolicySets; -import org.osoa.sca.annotations.Requires; +import org.oasisopen.sca.annotation.PolicySets; +import org.oasisopen.sca.annotation.Requires; /** - * Processes an {@link org.osoa.sca.annotations.Requires} annotation + * Processes an {@link org.oasisopen.sca.annotation.Requires} annotation * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java b/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java index f5ebbcac4c..c0b1443207 100644 --- a/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java +++ b/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java @@ -36,7 +36,7 @@ import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; import org.junit.Assert; import org.junit.Test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This test case will test that a Component that has multiple Remotable interfaces diff --git a/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java b/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java index 2a2b7800db..638603a02e 100644 --- a/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java +++ b/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java @@ -32,8 +32,8 @@ import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java b/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java index 1a0351fafa..3833699421 100644 --- a/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java +++ b/java/sca/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java @@ -27,8 +27,8 @@ import org.apache.tuscany.sca.interfacedef.java.impl.PolicyJavaInterfaceVisitor; import org.apache.tuscany.sca.policy.DefaultPolicyFactory; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.annotations.PolicySets; -import org.osoa.sca.annotations.Requires; +import org.oasisopen.sca.annotation.PolicySets; +import org.oasisopen.sca.annotation.Requires; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/node-api/META-INF/MANIFEST.MF b/java/sca/modules/node-api/META-INF/MANIFEST.MF index a46baa9c4a..386fbf4d9d 100644 --- a/java/sca/modules/node-api/META-INF/MANIFEST.MF +++ b/java/sca/modules/node-api/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.node;uses:="org.osoa.sca";versi
+Export-Package: org.apache.tuscany.sca.node;uses:="org.oasisopen.sca";versi
on="2.0.0"
Tool: Bnd-0.0.255
Bundle-Name: Apache Tuscany SCA Node API
@@ -12,7 +12,7 @@ Bnd-LastModified: 1225397189093 Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA Node API
-Import-Package: org.apache.tuscany.sca.node;version="2.0.0",org.osoa.sca
+Import-Package: org.apache.tuscany.sca.node;version="2.0.0",org.oasisopen.sca
;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.node.api
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java index d71939713a..84c1e09126 100644 --- a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java +++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.node; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ServiceReference; /** diff --git a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java index 05ef39f461..426c32bd49 100644 --- a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java +++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java @@ -21,9 +21,9 @@ package org.apache.tuscany.sca.node; import java.lang.reflect.InvocationTargetException; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.ServiceRuntimeException; /** * A factory for SCA processing nodes. An SCA processing node can be loaded diff --git a/java/sca/modules/node-impl/META-INF/MANIFEST.MF b/java/sca/modules/node-impl/META-INF/MANIFEST.MF index f851844270..8247f6f433 100644 --- a/java/sca/modules/node-impl/META-INF/MANIFEST.MF +++ b/java/sca/modules/node-impl/META-INF/MANIFEST.MF @@ -39,8 +39,8 @@ Import-Package: javax.xml.namespace, org.apache.tuscany.sca.work;version="2.0.0",
org.apache.tuscany.sca.workspace;version="2.0.0",
org.apache.tuscany.sca.workspace.builder;version="2.0.0",
- org.osoa.sca;version="2.0.0",
- org.osoa.sca.annotations;version="2.0.0";resolution:=optional
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional
Bundle-SymbolicName: org.apache.tuscany.sca.node.impl
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java index fb261bb2dd..56a9ee4bbe 100644 --- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java +++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java @@ -85,9 +85,9 @@ import org.apache.tuscany.sca.workspace.Workspace; import org.apache.tuscany.sca.workspace.WorkspaceFactory; import org.apache.tuscany.sca.workspace.builder.ContributionBuilder; import org.apache.tuscany.sca.workspace.builder.ContributionBuilderExtensionPoint; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.ServiceRuntimeException; /** * Represents an SCA runtime node. diff --git a/java/sca/modules/node-impl/src/test/java/hello/HelloWorld.java b/java/sca/modules/node-impl/src/test/java/hello/HelloWorld.java index 2f519cb81d..e3fcdfd25f 100644 --- a/java/sca/modules/node-impl/src/test/java/hello/HelloWorld.java +++ b/java/sca/modules/node-impl/src/test/java/hello/HelloWorld.java @@ -19,7 +19,7 @@ package hello; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * HelloWorld interface diff --git a/java/sca/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java b/java/sca/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java index 2f519cb81d..e3fcdfd25f 100644 --- a/java/sca/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java +++ b/java/sca/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java @@ -19,7 +19,7 @@ package hello; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * HelloWorld interface diff --git a/java/sca/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java b/java/sca/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java index 11e008619c..8232acb658 100644 --- a/java/sca/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java +++ b/java/sca/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java @@ -19,10 +19,10 @@ package hello; -import org.osoa.sca.annotations.EagerInit; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.EagerInit; +import org.oasisopen.sca.annotation.Init; +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/modules/node-manager/META-INF/MANIFEST.MF b/java/sca/modules/node-manager/META-INF/MANIFEST.MF index 872623184f..55a65fb055 100644 --- a/java/sca/modules/node-manager/META-INF/MANIFEST.MF +++ b/java/sca/modules/node-manager/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0
Export-Package: org.apache.tuscany.sca.implementation.node.manager;use
- s:="javax.servlet,org.osoa.sca.annotations,org.apache.tuscany.sca.dat
+ s:="javax.servlet,org.oasisopen.sca.annotation,org.apache.tuscany.sca.dat
a.collection,org.apache.tuscany.sca.node.launcher,javax.xml.parsers,o
rg.osoa.sca,javax.servlet.http";version="2.0.0"
Tool: Bnd-0.0.255
@@ -15,7 +15,7 @@ Bundle-Description: Apache Tuscany SCA Node Manager Application Import-Package: javax.servlet,javax.servlet.http,javax.xml.parsers,org
.apache.tuscany.sca.data.collection;version="2.0.0",org.apache.tuscany.
sca.implementation.node.manager;version="2.0.0",org.apache.tuscany.sca.
- node.launcher;version="2.0.0",org.osoa.sca;version="2.0.0",org.osoa.sca.a
+ node.launcher;version="2.0.0",org.oasisopen.sca;version="2.0.0",org.oasisopen.sca.a
nnotations;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.node.manager
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java b/java/sca/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java index 019c2562ec..340c6236fa 100644 --- a/java/sca/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java +++ b/java/sca/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java @@ -33,10 +33,10 @@ import org.apache.tuscany.sca.data.collection.ItemCollection; import org.apache.tuscany.sca.data.collection.LocalItemCollection; import org.apache.tuscany.sca.data.collection.NotFoundException; import org.apache.tuscany.sca.node.launcher.NodeLauncher; -import org.osoa.sca.ServiceRuntimeException; -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.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a node process collection service. diff --git a/java/sca/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java b/java/sca/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java index d0475e1dd3..d23674ed4a 100644 --- a/java/sca/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java +++ b/java/sca/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java @@ -29,9 +29,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.xml.parsers.ParserConfigurationException; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a ping service component. diff --git a/java/sca/modules/policy-security-jsr250/META-INF/MANIFEST.MF b/java/sca/modules/policy-security-jsr250/META-INF/MANIFEST.MF index 162c6b33bf..a8d8f4fe9a 100644 --- a/java/sca/modules/policy-security-jsr250/META-INF/MANIFEST.MF +++ b/java/sca/modules/policy-security-jsr250/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Import-Package: javax.annotation.security,javax.xml.namespace,org.apac g.apache.tuscany.sca.policy;version="2.0.0",org.apache.tuscany.sca.poli
cy.authorization;version="2.0.0",org.apache.tuscany.sca.policy.identity
;version="2.0.0",org.apache.tuscany.sca.implementation.java.introspect.
- impl;resolution:=optional,org.osoa.sca.annotations;version="2.0.0";reso
+ impl;resolution:=optional,org.oasisopen.sca.annotation;version="2.0.0";reso
lution:=optional,org.apache.tuscany.sca.interfacedef.java;version="1.
4";resolution:=optional,org.apache.tuscany.sca.interfacedef;version="
1.4";resolution:=optional,org.ap
diff --git a/java/sca/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java b/java/sca/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java index e59f06bdf5..14454a1466 100644 --- a/java/sca/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java +++ b/java/sca/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java @@ -34,8 +34,8 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.apache.tuscany.sca.policy.DefaultPolicyFactory; import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.PolicySetAttachPoint; -import org.osoa.sca.annotations.Requires; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Requires; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/policy-security/META-INF/MANIFEST.MF b/java/sca/modules/policy-security/META-INF/MANIFEST.MF index 4ec003206b..593060a130 100644 --- a/java/sca/modules/policy-security/META-INF/MANIFEST.MF +++ b/java/sca/modules/policy-security/META-INF/MANIFEST.MF @@ -10,8 +10,8 @@ Export-Package: org.apache.tuscany.sca.policy.authorization;uses:="jav nitor,org.apache.tuscany.sca.policy,org.apache.tuscany.sca.interfaced
ef,javax.xml.namespace,org.apache.tuscany.sca.invocation,javax.xml.st
ream,org.apache.tuscany.sca.contribution.resolver,org.apache.tuscany.
- sca.policy.util,org.apache.tuscany.sca.contribution.processor,org.oso
- a.sca";version="2.0.0",org.apache.tuscany.sca.policy.authentication.bas
+ sca.policy.util,org.apache.tuscany.sca.contribution.processor,org.oasisopen
+ .sca";version="2.0.0",org.apache.tuscany.sca.policy.authentication.bas
ic;uses:="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.assem
bly,org.apache.tuscany.sca.provider,org.apache.tuscany.sca.core,org.a
pache.tuscany.sca.policy,org.apache.tuscany.sca.monitor,org.apache.tu
@@ -58,7 +58,7 @@ Import-Package: javax.security.auth.callback, org.apache.tuscany.sca.policy.util;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0",
- org.osoa.sca;version="2.0.0"
+ org.oasisopen.sca;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.policy.security
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java index 4a711fac45..1f48b3b30a 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.policy.security.SecurityUtil; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java index 328c290fad..41a7b62772 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java @@ -27,7 +27,7 @@ import javax.security.auth.login.LoginContext; import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/sca-api/META-INF/MANIFEST.MF b/java/sca/modules/sca-api/META-INF/MANIFEST.MF index b8b81f1930..ca64e30235 100644 --- a/java/sca/modules/sca-api/META-INF/MANIFEST.MF +++ b/java/sca/modules/sca-api/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0
-Export-Package: org.osoa.sca.annotations;version="2.0.0",org.osoa.sca;us
+Export-Package: org.oasisopen.sca.annotation;version="2.0.0",org.oasisopen.sca;us
es:="javax.security.auth";version="2.0.0"
Tool: Bnd-0.0.255
Bundle-Name: Apache Tuscany SCA API
@@ -10,8 +10,8 @@ Bnd-LastModified: 1225397105046 Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: API classes for the Service Component Architecture
-Import-Package: javax.security.auth,org.osoa.sca;version="2.0.0",org.oso
- a.sca.annotations;version="2.0.0"
+Import-Package: javax.security.auth,org.oasisopen.sca;version="2.0.0",org.oas
+ isopen.sca.annotation;version="2.0.0"
Bundle-SymbolicName: org.apache.tuscany.sca.api
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/CallableReference.java index 7f6756bcbd..cdfaded693 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/CallableReference.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca; +package org.oasisopen.sca; /** * Common superclass for references that can be passed between components. diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java index e25917e0f8..7e1a2e6b2e 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca; +package org.oasisopen.sca; import java.util.Collection; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/Constants.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java index b1b2af8048..5135c23dde 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/Constants.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.osoa.sca; +package org.oasisopen.sca; /** * @version $Rev$ $Date$ diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Conversation.java index 12733a7bd2..d4e4034eed 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Conversation.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca; +package org.oasisopen.sca; /** * Interface representing a Conversation providing access to the conversation id and and a mechanism diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ConversationEndedException.java index 2e3b71fd1c..72944d6dfc 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ConversationEndedException.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca; +package org.oasisopen.sca; /** * Exception thrown to indicate the conversation being used for a stateful interaction has been ended. diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/NoRegisteredCallbackException.java index 0a0c2afff9..fcf88f75c1 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/NoRegisteredCallbackException.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca; +package org.oasisopen.sca; /** * Exception thrown to indicate that no callback has been registered diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java index cdcfa9a791..5c8fe61073 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca; +package org.oasisopen.sca; import javax.security.auth.Subject; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java index 8da6bcd1f3..55d875a5f3 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca; +package org.oasisopen.sca; /** diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java index 70f5f904a4..d11c1904c5 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca; +package org.oasisopen.sca; /** diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java index dd6b1c3242..5d8e4af6ff 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca; +package org.oasisopen.sca; /** * Exception used to indicate that a runtime exception occurred during the invocation of and external service. diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java index 556dd4e68e..dbc08a7655 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java index f7fca41212..cfc0af0318 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java @@ -5,14 +5,14 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static org.osoa.sca.Constants.SCA_PREFIX; +import static org.oasisopen.sca.Constants.SCA_PREFIX; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java index 0ee613fdcb..b8d71dac05 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java index bc73d22c9d..8fc3cd4013 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java index 25ade6f091..5c594bc7d3 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java @@ -5,14 +5,14 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static org.osoa.sca.Constants.SCA_PREFIX; +import static org.oasisopen.sca.Constants.SCA_PREFIX; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java index bc09c8ccdd..a5728e51d4 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.CONSTRUCTOR; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java index baacb2f520..e7f7aef069 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationAttributes.java index e9fcfee2d3..498cc3eea3 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationAttributes.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationID.java index b2f6f17129..2cc62afdbf 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationID.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Conversational.java index f0350f8ff5..6a406f2acc 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Conversational.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java index d65558653b..2ad6fdc892 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java index 21bf986705..d53e9e4fc4 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EndsConversation.java index c65ff5838f..4f58c50802 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EndsConversation.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java index d610e21d64..3fe9bf585f 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java index a8cf28475b..0c196f1ce5 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java @@ -5,14 +5,14 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static org.osoa.sca.Constants.SCA_PREFIX; +import static org.oasisopen.sca.Constants.SCA_PREFIX; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java index fc925aa402..c3e9914f23 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java index eaf9e3207c..458d05cc92 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java index b22a6a840c..150d8dabc8 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java index 71af35634d..0ab54ef6e4 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java index 44388bea74..a5fd102859 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java index 4d71b3f357..9a7154fcf3 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java index 53d58b7dc1..77ff4e26f9 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java index 3af699de07..e44775398e 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; @@ -29,7 +29,7 @@ import java.lang.annotation.Target; * <li>{http://www.osoa.org/xmlns/sca/1.0}confidentiality.message</li> * </ul> * This annotation supports general purpose intents specified as strings. Users may also define - * specific intents using the {@link @org.osoa.sca.annotations.Intent} annotation. + * specific intents using the {@link @org.oasisopen.sca.annotation.Intent} annotation. * * @version $Rev$ $Date$ */ diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java index cd88df1128..d7cfaab3f5 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java index 62f4abdbee..36c5bff5e9 100644 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java @@ -5,7 +5,7 @@ * * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications */ -package org.osoa.sca.annotations; +package org.oasisopen.sca.annotation; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; |