From cd174bad484f3d6f2f755d9fe517b0b37d7f928b Mon Sep 17 00:00:00 2001 From: mcombellack Date: Wed, 28 Jan 2009 14:07:54 +0000 Subject: 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 --- .../sca/binding/atom/collection/Collection.java | 2 +- .../binding/atom/collection/MediaCollection.java | 2 +- .../binding/atom/provider/AtomBindingInvoker.java | 2 +- .../sca/binding/atom/CustomerClientImpl.java | 2 +- .../sca/binding/atom/CustomerCollectionImpl.java | 2 +- .../sca/binding/atom/MediaCollectionImpl.java | 2 +- .../sca/binding/corba/impl/CorbaInvoker.java | 2 +- .../corba/impl/CorbaServiceBindingProvider.java | 2 +- .../tuscany/sca/binding/ejb/util/EJBHandler.java | 2 +- .../sca/binding/ejb/util/EJBObjectFactory.java | 2 +- .../sca/binding/ejb/util/EJBStubHelper.java | 4 +- .../binding/ejb/util/JavaReflectionAdapter.java | 2 +- .../src/test/java/account/BankManagerFacade.java | 2 +- .../src/test/java/account/Customer.java | 2 +- .../src/test/java/account/CustomerImpl.java | 6 +- .../sca/binding/feed/collection/Collection.java | 2 +- .../binding/feed/collection/MediaCollection.java | 2 +- .../binding/feed/provider/AtomBindingInvoker.java | 2 +- .../sca/binding/feed/CustomerClientImpl.java | 2 +- .../sca/binding/feed/CustomerCollectionImpl.java | 2 +- .../sca/binding/gdata/collection/Collection.java | 2 +- .../binding/gdata/collection/MediaCollection.java | 2 +- .../gdata/provider/GdataBindingInvoker.java | 2 +- .../sca/binding/gdata/CustomerClientImpl.java | 2 +- .../sca/binding/gdata/CustomerCollectionImpl.java | 2 +- .../sca/binding/gdata/collection/Collection.java | 2 +- .../binding/gdata/collection/MediaCollection.java | 2 +- .../gdata/provider/GDataBindingInvoker.java | 2 +- .../calendarconsumer/CalendarConsumerImpl.java | 2 +- .../gdata/consumerprovider/CustomerClientImpl.java | 4 +- .../consumerprovider/CustomerCollectionImpl.java | 2 +- .../sca/binding/http/TestServiceCacheImpl.java | 2 +- .../tuscany/sca/binding/http/TestServiceImpl.java | 2 +- .../jms/provider/AbstractMessageProcessor.java | 2 +- .../binding/jms/provider/JMSBindingInvoker.java | 2 +- .../binding/jms/provider/RRBJMSBindingInvoker.java | 2 +- .../sca/binding/jms/HelloWorldClientImpl.java | 4 +- .../tuscany/sca/binding/jms/HelloWorldService.java | 2 +- .../jsonrpc/provider/JSONRPCServiceServlet.java | 2 +- .../src/test/java/echo/Echo.java | 2 +- .../rmi/provider/RMIReferenceBindingProvider.java | 2 +- .../rmi/provider/RMIServiceBindingProvider.java | 2 +- .../src/test/java/helloworld/HelloWorldImpl.java | 2 +- .../test/java/helloworld/HelloWorldRmiImpl.java | 4 +- .../sca/binding/rss/collection/Collection.java | 2 +- .../binding/rss/collection/MediaCollection.java | 2 +- .../sca/binding/rss/CustomerClientImpl.java | 2 +- .../sca/binding/rss/CustomerCollectionImpl.java | 2 +- .../sca/axis2/impl/Axis2SCABindingInvoker.java | 2 +- .../sca/binding/sca/axis2/SimpleTestCase.java | 2 +- .../tuscany/sca/binding/sca/axis2/TestNode.java | 4 +- .../axis2/helloworld/HelloWorldCallbackRemote.java | 2 +- .../HelloWorldServiceCallbackOnewayRemote.java | 6 +- .../HelloWorldServiceCallbackRemote.java | 4 +- .../axis2/helloworld/HelloWorldServiceRemote.java | 2 +- .../axis2/helloworld/HelloWorldServiceRemote2.java | 2 +- .../HelloWorldClientCallbackOnewayRemoteImpl.java | 2 +- .../impl/HelloWorldClientCallbackRemoteImpl.java | 2 +- .../helloworld/impl/HelloWorldClientLocalImpl.java | 2 +- .../impl/HelloWorldClientRemote2Impl.java | 2 +- .../impl/HelloWorldClientRemoteImpl.java | 2 +- .../HelloWorldServiceCallbackOnewayRemoteImpl.java | 2 +- .../impl/HelloWorldServiceCallbackRemoteImpl.java | 2 +- .../HelloWorldServiceMultipleServicesImpl.java | 2 +- .../binding/sca/corba/impl/CorbaSCAInvoker.java | 2 +- .../corba/impl/CorbaSCAServiceBindingProvider.java | 2 +- .../impl/RuntimeSCAReferenceBindingProvider.java | 2 +- .../Axis2ConfigParamPolicyProviderFactory.java | 2 +- .../ws/axis2/Axis2BindingProviderFactory.java | 2 +- .../ws/axis2/Axis2ReferenceBindingProvider.java | 2 +- .../ws/axis2/Axis2ServiceBindingProvider.java | 2 +- .../sca/binding/ws/axis2/Axis2ServiceClient.java | 2 +- .../Axis2ServiceInOutSyncMessageReceiver.java | 2 +- .../sca/binding/ws/axis2/Axis2ServiceProvider.java | 2 +- ...xis2BindingBasicAuthenticationConfigurator.java | 2 +- .../sca/binding/ws/axis2/itests/Account.java | 2 +- .../tuscany/sca/binding/ws/axis2/itests/Echo.java | 2 +- .../sca/binding/ws/axis2/itests/EchoComponent.java | 2 +- .../sca/binding/ws/axis2/itests/HelloWorld.java | 2 +- .../ws/axis2/itests/HelloWorldComponent.java | 2 +- .../sca/binding/ws/axis2/itests/HelloWorldOM.java | 2 +- .../sca/binding/ws/axis2/itests/HelloWorldOM2.java | 2 +- .../ws/axis2/itests/HelloWorldOMComponent.java | 2 +- .../ws/axis2/itests/UriPrecedenceTestCase.java | 2 +- .../ws/axis2/itests/mtom/FileTransferClient.java | 2 +- .../ws/axis2/itests/mtom/FileTransferService.java | 2 +- .../axis2/itests/mtom/FileTransferServiceImpl.java | 2 +- .../ws/wsdlgen/WSDLGenerationException.java | 2 +- .../ws/wsdlgen/BindingWSDLGeneratorTestCase.java | 2 +- .../sca/binding/ws/wsdlgen/TestJavaInterface.java | 4 +- .../contribution/updater/impl/GreetService.java | 2 +- .../contribution/updater/impl/HelloComponent.java | 2 +- .../modules/core-databinding/META-INF/MANIFEST.MF | 4 +- .../module/DataBindingModuleActivator.java | 2 +- .../transformers/Array2ArrayTransformer.java | 2 +- .../CallableReference2XMLStreamReader.java | 2 +- .../transformers/CallableReferenceDataBinding.java | 2 +- .../transformers/CallableReferenceXMLAdapter.java | 2 +- .../transformers/Input2InputTransformer.java | 2 +- .../transformers/Output2OutputTransformer.java | 2 +- .../XMLStreamReader2CallableReference.java | 2 +- .../wire/DataTransformationInterceptor.java | 2 +- .../databinding/wire/PassByValueInterceptor.java | 2 +- .../DataBindingJavaInterfaceProcessorTestCase.java | 2 +- .../contrib/modules/core-spi/META-INF/MANIFEST.MF | 6 +- .../sca/context/ComponentContextFactory.java | 2 +- .../tuscany/sca/context/RequestContextFactory.java | 2 +- .../sca/runtime/RuntimeComponentContext.java | 6 +- .../src/test/java/calculator/AddServiceImpl.java | 4 +- .../java/calculator/CalculatorServiceImpl.java | 4 +- .../test/java/calculator/DivideServiceImpl.java | 2 +- .../test/java/calculator/MultiplyServiceImpl.java | 2 +- .../test/java/calculator/SubtractServiceImpl.java | 2 +- java/sca/contrib/modules/core/META-INF/MANIFEST.MF | 14 +-- .../sca/core/assembly/EndpointWireImpl.java | 2 +- .../core/assembly/RuntimeComponentServiceImpl.java | 2 +- .../tuscany/sca/core/assembly/RuntimeWireImpl.java | 2 +- .../sca/core/context/CallableReferenceImpl.java | 6 +- .../sca/core/context/ComponentContextHelper.java | 2 +- .../sca/core/context/ComponentContextImpl.java | 8 +- .../context/DefaultComponentContextFactory.java | 2 +- .../sca/core/context/RequestContextImpl.java | 4 +- .../sca/core/context/ServiceReferenceImpl.java | 4 +- .../core/conversation/ExtendedConversation.java | 4 +- .../invocation/CallableReferenceObjectFactory.java | 2 +- .../invocation/CallbackInterfaceInterceptor.java | 2 +- .../invocation/CallbackReferenceObjectFactory.java | 2 +- .../sca/core/invocation/CglibProxyFactory.java | 4 +- .../core/invocation/ExtensibleProxyFactory.java | 4 +- .../invocation/JDKCallbackInvocationHandler.java | 4 +- .../sca/core/invocation/JDKInvocationHandler.java | 8 +- .../sca/core/invocation/JDKProxyFactory.java | 4 +- .../core/invocation/NonBlockingInterceptor.java | 2 +- .../tuscany/sca/core/invocation/PhaseManager.java | 2 +- .../tuscany/sca/core/invocation/ProxyFactory.java | 2 +- .../sca/core/invocation/RuntimeWireInvoker.java | 4 +- .../apache/tuscany/sca/core/store/MemoryStore.java | 10 +- .../sca/core/work/ThreadPoolWorkManager.java | 2 +- .../wire/CallbackInterfaceInterceptorTestCase.java | 2 +- .../tuscany/sca/data/collection/Collection.java | 2 +- .../sca/data/collection/ItemCollection.java | 2 +- .../implementation/data/collection/Collection.java | 2 +- .../data/collection/ItemCollection.java | 2 +- ....apache.tuscany.sca.databinding.PullTransformer | 4 +- .../modules/databinding-jaxb/META-INF/MANIFEST.MF | 4 +- .../sca/databinding/jaxb/DataConverter.java | 2 +- .../databinding/jaxb/JAXBPropertyDescriptor.java | 2 +- .../sca/databinding/jaxb/JAXBTypeHelper.java | 2 +- .../sca/databinding/jaxb/JAXBWrapperException.java | 2 +- .../sca/databinding/json/axiom/JSON2OMElement.java | 2 +- .../tuscany/sca/databinding/sdo/SDOTypeHelper.java | 2 +- .../databinding/xmlbeans/XMLBeansDataBinding.java | 2 +- .../sca/databinding/xmlbeans/XmlObject2Node.java | 2 +- .../impl/CompositeConfigurationCollectionImpl.java | 8 +- .../impl/CompositeConfigurationServiceImpl.java | 8 +- .../impl/CompositeGeneratorServiceImpl.java | 8 +- .../manager/impl/ContributionCollectionImpl.java | 12 +- .../manager/impl/ContributionServiceImpl.java | 6 +- .../impl/DeployableCompositeCollectionImpl.java | 8 +- .../impl/DeployableCompositeServiceImpl.java | 8 +- .../impl/DeployedCompositeCollectionImpl.java | 12 +- .../impl/DomainManagerConfigurationImpl.java | 8 +- .../sca/domain/manager/impl/DomainManagerUtil.java | 4 +- .../domain/manager/impl/FileCollectionImpl.java | 10 +- .../sca/domain/manager/impl/FileServiceImpl.java | 10 +- .../manager/impl/NodeConfigurationServiceImpl.java | 6 +- .../impl/NodeProcessCollectionFacadeImpl.java | 10 +- .../domain/manager/impl/QuickStartServiceImpl.java | 8 +- .../contrib/modules/endpoint/META-INF/MANIFEST.MF | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../sca/extension/helper/impl/SCDLProcessor.java | 2 +- .../tuscany/sca/host/embedded/SCADomain.java | 6 +- .../tuscany/sca/host/embedded/SCADomainBean.java | 4 +- .../sca/host/embedded/impl/DefaultSCADomain.java | 4 +- .../sca/host/embedded/impl/EmbeddedSCADomain.java | 6 +- .../host/embedded/impl/HotUpdatableSCADomain.java | 6 +- .../sca/host/embedded/SCADomainBeanTestCase.java | 2 +- .../sca/host/embedded/SCADomainTestCase.java | 2 +- .../src/test/java/sample/Helloworld.java | 2 +- .../tuscany/sca/host/webapp/jsp/ReferenceTag.java | 4 +- .../BPELImplementationProviderFactory.java | 2 +- .../implementation/data/provider/DATAInvoker.java | 2 +- .../data/companyFeed/CompanyFeed.java | 2 +- .../META-INF/MANIFEST.MF | 6 +- .../injection/RequestContextObjectFactory.java | 2 +- .../invocation/JavaComponentContextFactory.java | 2 +- .../invocation/JavaComponentContextProvider.java | 8 +- .../java/invocation/JavaImplementationInvoker.java | 2 +- .../invocation/JavaImplementationProvider.java | 4 +- .../implementation-java-xml/META-INF/MANIFEST.MF | 2 +- .../src/test/java/calculator/AddServiceImpl.java | 4 +- .../java/calculator/CalculatorServiceImpl.java | 4 +- .../test/java/calculator/DivideServiceImpl.java | 2 +- .../test/java/calculator/MultiplyServiceImpl.java | 2 +- .../test/java/calculator/SubtractServiceImpl.java | 2 +- .../implementation-java/META-INF/MANIFEST.MF | 6 +- .../impl/AllowsPassByReferenceProcessor.java | 2 +- .../introspect/impl/ComponentNameProcessor.java | 2 +- .../java/introspect/impl/ConstructorProcessor.java | 8 +- .../java/introspect/impl/ContextProcessor.java | 6 +- .../introspect/impl/ConversationIDProcessor.java | 2 +- .../introspect/impl/ConversationProcessor.java | 6 +- .../java/introspect/impl/DestroyProcessor.java | 2 +- .../impl/DuplicateConstructorException.java | 2 +- .../impl/DuplicateDestructorException.java | 2 +- .../introspect/impl/DuplicateInitException.java | 2 +- .../java/introspect/impl/EagerInitProcessor.java | 4 +- .../introspect/impl/HeuristicPojoProcessor.java | 12 +- .../impl/IllegalCallbackReferenceException.java | 2 +- .../introspect/impl/IllegalContextException.java | 2 +- .../impl/IllegalDestructorException.java | 2 +- .../java/introspect/impl/IllegalInitException.java | 2 +- .../impl/IllegalServiceDefinitionException.java | 2 +- .../java/introspect/impl/InitProcessor.java | 2 +- .../impl/InvalidConstructorException.java | 2 +- .../introspect/impl/InvalidPropertyException.java | 2 +- .../introspect/impl/InvalidReferenceException.java | 2 +- .../java/introspect/impl/InvalidServiceType.java | 2 +- .../introspect/impl/JavaIntrospectionHelper.java | 4 +- .../java/introspect/impl/PolicyProcessor.java | 14 +-- .../java/introspect/impl/PropertyProcessor.java | 2 +- .../java/introspect/impl/ReferenceProcessor.java | 4 +- .../java/introspect/impl/ScopeProcessor.java | 2 +- .../java/introspect/impl/ServiceProcessor.java | 12 +- .../impl/UnknownContextTypeException.java | 2 +- .../AllowsPassByReferenceProcessorTestCase.java | 2 +- .../impl/ConstructorProcessorTestCase.java | 16 +-- .../impl/ConstructorPropertyTestCase.java | 18 +-- .../impl/ConstructorReferenceTestCase.java | 20 ++-- .../impl/ConstructorResourceTestCase.java | 16 +-- .../introspect/impl/ContextProcessorTestCase.java | 8 +- .../impl/ConversationIDProcessorTestCase.java | 2 +- .../impl/ConversationProcessorTestCase.java | 6 +- .../introspect/impl/DestroyProcessorTestCase.java | 2 +- .../impl/EagerInitProcessorTestCase.java | 2 +- .../impl/HeuristicAndPropertyTestCase.java | 2 +- .../impl/HeuristicConstructorTestCase.java | 6 +- .../impl/HeuristicPojoProcessorTestCase.java | 8 +- .../HeutisticExtensibleConstructorTestCase.java | 8 +- .../introspect/impl/InitProcessorTestCase.java | 2 +- .../introspect/impl/PolicyProcessorTestCase.java | 4 +- .../introspect/impl/PropertyProcessorTestCase.java | 2 +- .../impl/ReferenceProcessorTestCase.java | 2 +- .../introspect/impl/ScopeProcessorTestCase.java | 10 +- .../introspect/impl/ServiceCallbackTestCase.java | 6 +- .../introspect/impl/ServiceProcessorTestCase.java | 6 +- .../NodeImplementationLauncherBootstrap.java | 4 +- .../osgi/context/OSGiAnnotations.java | 2 +- .../osgi/context/OSGiPropertyInjector.java | 6 +- .../osgi/runtime/OSGiInstanceWrapper.java | 4 +- .../osgi/test/OSGiTestWithPropertyImpl.java | 2 +- .../script/itests/helloworld/HelloWorldProxy.java | 2 +- .../script/itests/properties/HelloWorldProxy.java | 2 +- .../ComponentNameAnnotationProcessor.java | 2 +- .../processor/ConstructorAnnotationProcessor.java | 2 +- .../processor/InitDestroyAnnotationProcessor.java | 4 +- .../processor/PropertyAnnotationProcessor.java | 2 +- .../processor/ReferenceAnnotationProcessor.java | 2 +- .../spring/itests/helloworld/HelloWorld.java | 2 +- .../spring/itests/helloworld/HelloWorldProxy.java | 2 +- .../web/runtime/ComponentContextProxy.java | 8 +- .../runtime/WebImplementationProviderFactory.java | 4 +- .../src/test/java/store/Catalog.java | 2 +- .../src/test/java/store/CatalogImpl.java | 2 +- .../interface-java-jaxws/META-INF/MANIFEST.MF | 6 +- .../java/jaxws/JAXWSFaultExceptionMapper.java | 2 +- .../sca/interfacedef/java/jaxws/TestInterface.java | 2 +- .../modules/interface-java/META-INF/MANIFEST.MF | 2 +- .../java/impl/JavaInterfaceIntrospectorImpl.java | 10 +- .../java/impl/PolicyJavaInterfaceVisitor.java | 6 +- ...avaInterfaceUtilDuplicateRemotableTestCase.java | 2 +- .../impl/ConversationalIntrospectionTestCase.java | 4 +- .../impl/PolicyProcessorTestCase.java | 4 +- .../contrib/modules/node-api/META-INF/MANIFEST.MF | 4 +- .../org/apache/tuscany/sca/node/SCAClient.java | 4 +- .../apache/tuscany/sca/node/SCANode2Factory.java | 6 +- .../apache/tuscany/sca/node/SCANodeFactory.java | 6 +- .../contrib/modules/node-impl/META-INF/MANIFEST.MF | 4 +- .../org/apache/tuscany/sca/node/impl/NodeImpl.java | 6 +- .../node-impl/src/test/java/hello/HelloWorld.java | 2 +- .../src/test/java/hello/HelloWorld.java | 2 +- .../src/test/java/hello/HelloWorldClient.java | 8 +- .../src/test/java/hello/HelloWorld.java | 2 +- .../node/manager/NodeProcessCollectionImpl.java | 8 +- .../node/manager/PingServiceImpl.java | 6 +- .../tuscany/sca/osgi/runtime/FelixRuntime.java | 2 +- .../impl/PolicyProcessorTestCaseFIXME.java | 4 +- ...ityIdentityImplementationPolicyInterceptor.java | 2 +- .../jaas/JaasAuthenticationInterceptor.java | 2 +- .../runtime/tomcat/TuscanyAnnotationProcessor.java | 2 +- .../contrib/modules/sca-api/META-INF/MANIFEST.MF | 6 +- java/sca/contrib/modules/sca-api/pom.xml | 2 +- .../main/java/org/osoa/sca/CallableReference.java | 2 +- .../main/java/org/osoa/sca/ComponentContext.java | 2 +- .../src/main/java/org/osoa/sca/Constants.java | 2 +- .../src/main/java/org/osoa/sca/Conversation.java | 2 +- .../org/osoa/sca/ConversationEndedException.java | 2 +- .../osoa/sca/NoRegisteredCallbackException.java | 2 +- .../src/main/java/org/osoa/sca/RequestContext.java | 2 +- .../main/java/org/osoa/sca/ServiceReference.java | 2 +- .../java/org/osoa/sca/ServiceRuntimeException.java | 2 +- .../org/osoa/sca/ServiceUnavailableException.java | 2 +- .../sca/annotations/AllowsPassByReference.java | 2 +- .../org/osoa/sca/annotations/Authentication.java | 4 +- .../java/org/osoa/sca/annotations/Callback.java | 2 +- .../org/osoa/sca/annotations/ComponentName.java | 2 +- .../org/osoa/sca/annotations/Confidentiality.java | 4 +- .../java/org/osoa/sca/annotations/Constructor.java | 2 +- .../java/org/osoa/sca/annotations/Context.java | 2 +- .../sca/annotations/ConversationAttributes.java | 2 +- .../org/osoa/sca/annotations/ConversationID.java | 2 +- .../org/osoa/sca/annotations/Conversational.java | 2 +- .../java/org/osoa/sca/annotations/Destroy.java | 2 +- .../java/org/osoa/sca/annotations/EagerInit.java | 2 +- .../org/osoa/sca/annotations/EndsConversation.java | 2 +- .../main/java/org/osoa/sca/annotations/Init.java | 2 +- .../java/org/osoa/sca/annotations/Integrity.java | 4 +- .../main/java/org/osoa/sca/annotations/Intent.java | 2 +- .../main/java/org/osoa/sca/annotations/OneWay.java | 2 +- .../java/org/osoa/sca/annotations/PolicySets.java | 2 +- .../java/org/osoa/sca/annotations/Property.java | 2 +- .../java/org/osoa/sca/annotations/Qualifier.java | 2 +- .../java/org/osoa/sca/annotations/Reference.java | 2 +- .../java/org/osoa/sca/annotations/Remotable.java | 2 +- .../java/org/osoa/sca/annotations/Requires.java | 4 +- .../main/java/org/osoa/sca/annotations/Scope.java | 2 +- .../java/org/osoa/sca/annotations/Service.java | 2 +- .../demos/aggregator/AlertsFeedServiceImpl.java | 4 +- .../sca/demos/aggregator/AlertsService.java | 2 +- .../sca/demos/aggregator/AlertsServiceImpl.java | 4 +- .../sca/demos/aggregator/AlertsSourcesService.java | 2 +- .../demos/aggregator/AlertsSourcesServiceImpl.java | 4 +- .../account/checking/CheckingAccountService.java | 4 +- .../checking/CheckingAccountServiceImpl.java | 2 +- .../account/savings/SavingsAccountService.java | 2 +- .../account/savings/SavingsAccountServiceImpl.java | 2 +- .../bigbank/account/stock/StockAccountService.java | 2 +- .../account/stock/StockAccountServiceImpl.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 4 +- .../src/main/java/stockquote/StockQuoteImpl.java | 2 +- .../main/java/stockquote/StockQuoteService.java | 2 +- .../main/java/bigbank/account/AccountService.java | 2 +- .../java/bigbank/account/AccountServiceImpl.java | 6 +- .../java/bigbank/account/feed/AccountFeedImpl.java | 4 +- .../main/java/stockquote/StockQuoteService.java | 2 +- .../src/main/java/client/LaunchClient.java | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../src/main/java/credit/CreditCheck.java | 2 +- .../src/main/java/credit/CreditCheckImpl.java | 2 +- .../src/main/java/mortgage/CreditCheck.java | 2 +- .../src/main/java/mortgage/CreditCheckImpl.java | 2 +- .../main/java/mortgage/InterestRateQuoteImpl.java | 2 +- .../src/main/java/mortgage/LoanApprovalImpl.java | 6 +- .../src/main/java/mortgage/MortgageCalculator.java | 2 +- .../main/java/mortgage/MortgageCalculatorImpl.java | 2 +- .../src/main/java/mortgage/RiskAssessmentImpl.java | 2 +- .../src/main/java/workpool/MyWorker.java | 2 +- .../src/main/java/workpool/Trigger.java | 2 +- .../src/main/java/workpool/WorkerManager.java | 4 +- .../src/main/java/workpool/WorkerManagerImpl.java | 12 +- .../src/main/java/workpool/WorkerService.java | 8 +- .../main/java/workpool/WorkerServiceCallback.java | 2 +- .../src/main/java/workpool/WorkerServiceImpl.java | 16 +-- .../src/main/java/workpool/WorkpoolManager.java | 6 +- .../main/java/workpool/WorkpoolManagerImpl.java | 20 ++-- .../src/main/java/workpool/WorkpoolService.java | 6 +- .../main/java/workpool/WorkpoolServiceImpl.java | 8 +- .../src/main/java/bigbank/AccountDataImpl.java | 2 +- .../src/main/java/bigbank/AccountServiceImpl.java | 8 +- .../src/main/java/bigbank/CurrencyExchange.java | 2 +- .../src/main/java/bigbank/ExchangeRateImpl.java | 6 +- .../src/main/java/bigbank/StockQuote.java | 2 +- .../src/main/java/bigbank/StockValue.java | 2 +- .../tuscany/sca/itest/admin/MyListService.java | 2 +- .../sca/itest/admin/MyListServiceByYear.java | 2 +- .../tuscany/sca/itest/admin/MyListServiceImpl.java | 6 +- .../tuscany/sca/itest/admin/MyServiceByDate.java | 2 +- .../tuscany/sca/itest/admin/MyServiceImpl.java | 10 +- .../sca/itest/admin/MyTotalServiceImpl.java | 6 +- .../client/src/main/java/itest/MyClientImpl.java | 2 +- .../client/src/main/java/itest/MyService.java | 2 +- .../service/src/main/java/itest/MyService.java | 2 +- .../src/test/java/greetings/GreetingsService.java | 2 +- .../test/java/greetings/GreetingsServiceImpl.java | 2 +- .../test/java/helloworld/HelloWorldService.java | 2 +- .../java/helloworld/HelloWorldServiceImpl.java | 2 +- .../src/test/java/helloworld/HelloWorld.java | 2 +- .../src/test/java/helloworld/HelloWorld.java | 2 +- .../tuscany/sca/itest/builder/ComponentDImpl.java | 4 +- .../ComponentDReferenceMultiplicityImpl.java | 4 +- .../tuscany/sca/itest/builder/ComponentEImpl.java | 4 +- .../tuscany/sca/itest/builder/ComponentFImpl.java | 4 +- .../apache/tuscany/sca/itest/builder/Service3.java | 2 +- .../tuscany/sca/itest/builder/Service3a.java | 2 +- .../main/java/com/example/ExampleClientImpl.java | 14 +-- .../src/main/java/com/example/ExampleService.java | 6 +- .../main/java/com/example/ExampleServiceImpl.java | 4 +- .../sca/itest/callablerefwsreturn/Alpha.java | 2 +- .../sca/itest/callablerefwsreturn/AlphaImpl.java | 14 +-- .../sca/itest/callablerefwsreturn/Beta.java | 4 +- .../sca/itest/callablerefwsreturn/BetaImpl.java | 14 +-- .../sca/itest/callablerefwsreturn/Gamma.java | 6 +- .../sca/itest/callablerefwsreturn/GammaImpl.java | 6 +- .../tuscany/sca/itest/callableref/AComponent.java | 2 +- .../sca/itest/callableref/AComponentImpl.java | 12 +- .../tuscany/sca/itest/callableref/BComponent.java | 4 +- .../sca/itest/callableref/BComponentImpl.java | 4 +- .../tuscany/sca/itest/callableref/CComponent.java | 2 +- .../sca/itest/callableref/CComponentImpl.java | 2 +- .../tuscany/sca/itest/callableref/DComponent.java | 4 +- .../sca/itest/callableref/DComponentImpl.java | 8 +- .../ConversationalService.java | 4 +- .../ConversationalServiceImpl.java | 12 +- .../tuscany/sca/itest/callablerefreturn/Alpha.java | 2 +- .../sca/itest/callablerefreturn/AlphaImpl.java | 12 +- .../tuscany/sca/itest/callablerefreturn/Beta.java | 4 +- .../sca/itest/callablerefreturn/BetaImpl.java | 12 +- .../tuscany/sca/itest/callablerefreturn/Gamma.java | 6 +- .../sca/itest/callablerefreturn/GammaImpl.java | 4 +- .../CallableReferenceConversationalTestCase.java | 2 +- .../tuscany/sca/test/CallBackApiCallBack.java | 2 +- .../apache/tuscany/sca/test/CallBackApiClient.java | 2 +- .../tuscany/sca/test/CallBackApiClientImpl.java | 4 +- .../tuscany/sca/test/CallBackApiService.java | 4 +- .../tuscany/sca/test/CallBackApiServiceImpl.java | 12 +- .../tuscany/sca/test/CallBackBasicCallBack.java | 2 +- .../tuscany/sca/test/CallBackBasicClient.java | 2 +- .../tuscany/sca/test/CallBackBasicClientImpl.java | 4 +- .../tuscany/sca/test/CallBackBasicService.java | 4 +- .../tuscany/sca/test/CallBackBasicServiceImpl.java | 4 +- .../tuscany/sca/test/CallBackCTypeCallBack.java | 2 +- .../tuscany/sca/test/CallBackCTypeClient.java | 2 +- .../tuscany/sca/test/CallBackCTypeClientImpl.java | 4 +- .../tuscany/sca/test/CallBackCTypeService.java | 2 +- .../tuscany/sca/test/CallBackCTypeServiceImpl.java | 4 +- .../tuscany/sca/test/CallBackIdCallBack.java | 2 +- .../apache/tuscany/sca/test/CallBackIdClient.java | 2 +- .../tuscany/sca/test/CallBackIdClientImpl.java | 12 +- .../apache/tuscany/sca/test/CallBackIdService.java | 4 +- .../tuscany/sca/test/CallBackIdServiceImpl.java | 10 +- .../tuscany/sca/test/callback/MyClientImpl1.java | 6 +- .../tuscany/sca/test/callback/MyClientImpl2.java | 6 +- .../tuscany/sca/test/callback/MyService.java | 4 +- .../tuscany/sca/test/callback/MyServiceImpl.java | 8 +- .../sca/itest/CallBackSeparateThreadClient.java | 2 +- .../itest/CallBackSeparateThreadClientImpl.java | 4 +- .../tuscany/sca/itest/EventProcessorCallBack.java | 2 +- .../tuscany/sca/itest/EventProcessorService.java | 6 +- .../sca/itest/EventProcessorServiceImpl.java | 10 +- .../sca/test/CallBackSetCalbackService.java | 2 +- .../sca/test/CallBackSetCallbackCallbackImpl.java | 2 +- .../sca/test/CallBackSetCallbackClient.java | 2 +- .../sca/test/CallBackSetCallbackClientImpl.java | 8 +- .../sca/test/CallBackSetCallbackServiceImpl.java | 12 +- .../sca/test/CallBackSetCallbackConvCallback.java | 2 +- .../sca/test/CallBackSetCallbackConvClient.java | 2 +- .../test/CallBackSetCallbackConvClientImpl.java | 12 +- .../sca/test/CallBackSetCallbackConvService.java | 4 +- .../test/CallBackSetCallbackConvServiceImpl.java | 14 +-- .../main/java/supplychain/customer/Customer.java | 2 +- .../customer/JavaCustomerComponentImpl.java | 6 +- .../illegal/JavaCustomerComponentImpl.java | 6 +- .../retailer/JavaRetailerComponentImpl.java | 6 +- .../shipper/JavaShipperComponentImpl.java | 6 +- .../warehouse/JavaWarehouseComponentImpl.java | 2 +- .../TuscanyClassloadingTestCaseFIXME.java | 2 +- .../src/main/java/hello/Hello.java | 2 +- .../src/main/java/hello/HelloImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 4 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../src/test/java/hello/HelloImpl.java | 2 +- .../src/test/java/helloworld/HelloWorldImpl.java | 4 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../conversational/ConversationIdService.java | 2 +- .../conversational/ConversationalCallback.java | 6 +- .../itest/conversational/ConversationalClient.java | 2 +- .../ConversationalReferenceClient.java | 4 +- .../conversational/ConversationalService.java | 8 +- ...ersationalServiceNonConversationalCallback.java | 8 +- .../conversational/NonConversationalCallback.java | 2 +- .../impl/ConversationAgeComponentImpl.java | 6 +- .../impl/ConversationIdComponentImpl.java | 6 +- .../impl/ConversationMaxIdleComponentImpl.java | 6 +- .../impl/ConversationalClientStatefulImpl.java | 18 +-- ...lientStatefulNonConversationalCallbackImpl.java | 18 +-- .../impl/ConversationalClientStatelessImpl.java | 14 +-- .../impl/ConversationalReferenceClientImpl.java | 4 +- .../impl/ConversationalServiceRequestImpl.java | 12 +- .../impl/ConversationalServiceStatefulImpl.java | 14 +-- ...rviceStatefulNonConversationalCallbackImpl.java | 14 +-- .../impl/ConversationalServiceStatelessImpl.java | 10 +- .../ConversationalServiceStatelessScopeImpl.java | 4 +- .../tuscany/sca/itest/conversational/AService.java | 2 +- .../tuscany/sca/itest/conversational/Alpha.java | 4 +- .../tuscany/sca/itest/conversational/BService.java | 2 +- .../tuscany/sca/itest/conversational/Beta.java | 4 +- .../tuscany/sca/itest/conversational/CService.java | 2 +- .../conversational/ConversationIdService.java | 2 +- .../conversational/ConversationalCallback.java | 6 +- .../itest/conversational/ConversationalClient.java | 2 +- .../ConversationalReferenceClient.java | 4 +- .../conversational/ConversationalService.java | 8 +- ...ersationalServiceNonConversationalCallback.java | 8 +- .../tuscany/sca/itest/conversational/DService.java | 4 +- .../tuscany/sca/itest/conversational/Gamma.java | 6 +- .../conversational/NonConversationalCallback.java | 2 +- .../itest/conversational/impl/AServiceImpl.java | 8 +- .../sca/itest/conversational/impl/AlphaImpl.java | 12 +- .../itest/conversational/impl/BServiceImpl.java | 6 +- .../sca/itest/conversational/impl/BetaImpl.java | 14 +-- .../itest/conversational/impl/CServiceImpl.java | 8 +- .../impl/ConversationAgeComponentImpl.java | 6 +- .../impl/ConversationIdComponentImpl.java | 6 +- .../impl/ConversationMaxIdleComponentImpl.java | 6 +- .../impl/ConversationalClientStatefulImpl.java | 18 +-- ...lientStatefulNonConversationalCallbackImpl.java | 18 +-- .../impl/ConversationalClientStatelessImpl.java | 14 +-- .../impl/ConversationalReferenceClientImpl.java | 4 +- .../impl/ConversationalServiceRequestImpl.java | 12 +- .../impl/ConversationalServiceStatefulImpl.java | 14 +-- ...rviceStatefulNonConversationalCallbackImpl.java | 14 +-- .../impl/ConversationalServiceStatelessImpl.java | 12 +- .../ConversationalServiceStatelessScopeImpl.java | 4 +- .../itest/conversational/impl/DServiceImpl.java | 6 +- .../sca/itest/conversational/impl/GammaImpl.java | 6 +- .../conversational/ConversationalAgeTestCase.java | 2 +- .../tuscany/sca/test/corba/types/ScenarioFive.java | 2 +- .../test/corba/types/ScenarioFiveComponent.java | 2 +- .../tuscany/sca/test/corba/types/ScenarioFour.java | 2 +- .../test/corba/types/ScenarioFourComponent.java | 2 +- .../sca/test/corba/types/ScenarioOneComponent.java | 2 +- .../test/corba/types/TScenarioOneComponent.java | 2 +- .../test/corba/types/TScenarioSixComponent.java | 2 +- .../test/corba/types/TScenarioThreeComponent.java | 2 +- .../test/corba/types/TScenarioTwoComponent.java | 2 +- .../resources/generate/DatabindingTestCase.java.vm | 4 +- .../main/resources/generate/GreeterService.java.vm | 2 +- .../generate/GreeterServiceClient.java.vm | 2 +- .../generate/GreeterServiceClientImpl.java.vm | 4 +- .../resources/generate/GreeterServiceImpl.java.vm | 2 +- .../itest/databindings/jaxb/AClientService.java | 2 +- .../sca/itest/databindings/jaxb/AService.java | 2 +- .../itest/databindings/jaxb/GenericsService.java | 2 +- .../databindings/jaxb/HelloServiceSimple.java | 2 +- .../itest/databindings/jaxb/PrimitivesService.java | 2 +- .../databindings/jaxb/StandardTypesService.java | 2 +- .../databindings/jaxb/impl/AClientServiceImpl.java | 4 +- .../itest/databindings/jaxb/impl/AServiceImpl.java | 2 +- .../jaxb/impl/GenericsLocalServiceClientImpl.java | 4 +- .../jaxb/impl/GenericsServiceClientImpl.java | 4 +- .../jaxb/impl/GenericsServiceImpl.java | 2 +- .../impl/HelloLocalServiceSimpleClientImpl.java | 4 +- .../jaxb/impl/HelloServiceSimpleClientImpl.java | 4 +- .../jaxb/impl/HelloServiceSimpleImpl.java | 2 +- .../impl/PrimitivesLocalServiceClientImpl.java | 4 +- .../jaxb/impl/PrimitivesServiceClientImpl.java | 4 +- .../jaxb/impl/PrimitivesServiceImpl.java | 2 +- .../impl/StandardTypesLocalServiceClientImpl.java | 4 +- .../jaxb/impl/StandardTypesServiceClientImpl.java | 4 +- .../jaxb/impl/StandardTypesServiceImpl.java | 2 +- .../sca/itest/databindings/jaxb/HelloService.java | 2 +- .../itest/databindings/jaxb/PrimitivesService.java | 2 +- .../databindings/jaxb/StandardTypesService.java | 2 +- .../jaxb/impl/HelloServiceClientImpl.java | 4 +- .../databindings/jaxb/impl/HelloServiceImpl.java | 2 +- .../jaxb/impl/PrimitivesServiceClientImpl.java | 4 +- .../jaxb/impl/PrimitivesServiceImpl.java | 2 +- .../jaxb/impl/StandardTypesServiceClientImpl.java | 4 +- .../jaxb/impl/StandardTypesServiceImpl.java | 2 +- .../src/main/java/calculator/AddService.java | 4 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../src/main/java/calculator/DivideService.java | 4 +- .../src/main/java/calculator/AddService.java | 2 +- .../main/java/calculator/CalculatorService.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../src/main/java/calculator/SubtractService.java | 2 +- .../test/exceptions/impl/StockExchangeJaxB.java | 2 +- .../test/exceptions/impl/StockTraderSDOImpl.java | 4 +- .../exceptions/sdohandgen/StockExceptionTest.java | 2 +- .../test/exceptions/IntraCompositeTestCase.java | 2 +- .../exceptions/impl/StockExceptionTestJAXB.java | 2 +- .../test/exceptions/impl/StockExchangeJaxB.java | 2 +- .../test/exceptions/impl/StockTraderSDOImpl.java | 4 +- .../exceptions/sdohandgen/StockExceptionTest.java | 2 +- .../test/exceptions/IntraCompositeTestCase.java | 2 +- .../main/java/com/example/ExampleClientImpl.java | 6 +- .../java/com/example/ExampleClientMinimalImpl.java | 6 +- .../src/main/java/com/example/ExampleService.java | 2 +- .../java/com/example/ExampleServiceMinimal.java | 2 +- .../test/exceptions/ExceptionRemoteThrower.java | 2 +- .../test/exceptions/impl/ExceptionHandlerImpl.java | 4 +- .../impl/ExceptionRemoteThrowerImpl.java | 2 +- .../test/exceptions/impl/ExceptionThrowerImpl.java | 2 +- .../impl/RemoteExceptionHandlerImpl.java | 4 +- .../sca/test/extended/impl/BasicServiceImpl.java | 6 +- .../sca/test/extended/impl/MathServiceImpl.java | 2 +- .../sca/test/extended/ServiceLocateTestCase.java | 2 +- .../sca/itest/interfaces/LocalClientComponent.java | 2 +- .../itest/interfaces/LocalClientComponentImpl.java | 4 +- .../itest/interfaces/LocalServiceComponent.java | 2 +- .../interfaces/LocalServiceComponentImpl.java | 4 +- .../itest/interfaces/RemoteCallbackInterface.java | 2 +- .../itest/interfaces/RemoteClientComponent.java | 2 +- .../interfaces/RemoteClientComponentImpl.java | 6 +- .../itest/interfaces/RemoteServiceComponent.java | 4 +- .../interfaces/RemoteServiceComponentImpl.java | 4 +- .../LoopbackInteropDocServiceComponentImpl.java | 2 +- .../interop/client/InteropTestDocLitTestCase.java | 4 +- .../server/InteropDocServiceComponentImpl.java | 2 +- .../apache/tuscany/sca/binding/jms/ClientImpl.java | 4 +- .../apache/tuscany/sca/binding/jms/MyService.java | 4 +- .../tuscany/sca/binding/jms/JMSClientImpl.java | 4 +- .../apache/tuscany/sca/binding/jms/JMSService.java | 6 +- .../sca/binding/jms/JMSServiceCallback.java | 4 +- .../tuscany/sca/binding/jms/JMSServiceImpl.java | 4 +- .../tuscany/sca/binding/jms/OneWayClientImpl.java | 4 +- .../tuscany/sca/binding/jms/OneWayService.java | 4 +- .../jmsbytes/helloworld/HelloWorldReference.java | 2 +- .../helloworld/HelloWorldReferenceImpl.java | 2 +- .../jmsbytes/helloworld/HelloWorldService.java | 4 +- .../helloworld/HelloWorldReference.java | 2 +- .../helloworld/HelloWorldReferenceImpl.java | 2 +- .../jmsdelimited/helloworld/HelloWorldService.java | 4 +- .../jmsmessage/helloworld/HelloWorldReference.java | 2 +- .../helloworld/HelloWorldReferenceImpl.java | 2 +- .../jmsmessage/helloworld/HelloWorldService.java | 4 +- .../helloworld/HelloWorldServiceReferenceSide.java | 4 +- .../helloworld/HelloWorldReferenceImpl.java | 2 +- .../jmstextxml/helloworld/HelloWorldService.java | 2 +- .../jms/format/jmstextxml/helloworld/Person.java | 2 +- .../apache/tuscany/sca/binding/jms/ClientImpl.java | 4 +- .../tuscany/sca/binding/jms/SelectorService.java | 4 +- .../tuscany/sca/binding/jms/ExceptionService.java | 2 +- .../sca/binding/jms/ExceptionServiceClient.java | 4 +- .../sca/binding/jms/HelloWorldClientImpl.java | 4 +- .../tuscany/sca/binding/jms/HelloWorldService.java | 2 +- .../tuscany/sca/binding/jms/MsgClientImpl.java | 4 +- .../tuscany/sca/binding/jms/MsgClientService.java | 2 +- .../apache/tuscany/sca/binding/jms/MsgService.java | 4 +- .../tuscany/sca/binding/jms/MsgServiceImpl.java | 2 +- .../tuscany/sca/binding/jms/OneWayClientImpl.java | 4 +- .../sca/binding/jms/OneWayObjectService.java | 4 +- .../tuscany/sca/binding/jms/OneWayService.java | 4 +- .../tuscany/sca/itest/trninq/TrninqInterface.java | 2 +- .../src/main/java/calculator/AddService.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../src/main/java/calculator/SubtractService.java | 2 +- .../tuscany/sca/itest/oneway/OneWayService.java | 4 +- .../sca/itest/oneway/impl/OneWayClientImpl.java | 2 +- .../sca/test/opoverload/impl/OverloadASource.java | 4 +- .../sca/test/opoverload/impl/OverloadATarget.java | 2 +- .../main/java/supplychain/customer/Customer.java | 2 +- .../customer/JavaCustomerComponentImpl.java | 6 +- .../retailer/JavaRetailerComponentImpl.java | 6 +- .../shipper/JavaShipperComponentImpl.java | 6 +- .../warehouse/JavaWarehouseComponentImpl.java | 6 +- .../main/java/supplychain/customer/Customer.java | 2 +- .../customer/JavaCustomerComponentImpl.java | 6 +- .../retailer/JavaRetailerComponentImpl.java | 6 +- .../shipper/JavaShipperComponentImpl.java | 6 +- .../warehouse/JavaWarehouseComponentImpl.java | 6 +- .../java/callback/client/CallbackCallback.java | 2 +- .../main/java/callback/client/CallbackClient.java | 2 +- .../callback/client/JavaCallbackClientImpl.java | 4 +- .../java/callback/service/CallbackService.java | 4 +- .../callback/service/JavaCallbackServiceImpl.java | 4 +- .../callback/service/OSGiCallbackServiceImpl.java | 2 +- .../client/ConversationalCallback.java | 6 +- .../conversation/client/ConversationalClient.java | 2 +- .../client/ConversationalClientStatefulImpl.java | 16 +-- .../client/ConversationalClientStatelessImpl.java | 16 +-- .../ConversationalReferenceClient.java | 4 +- .../ConversationalReferenceClientImpl.java | 6 +- .../service/ConversationalService.java | 8 +- .../service/ConversationalServiceStatefulImpl.java | 14 +-- .../ConversationalServiceStatelessImpl.java | 12 +- .../src/main/java/helloworld/Greetings.java | 2 +- .../src/main/java/helloworld/HelloWorld.java | 2 +- .../java/helloworld/JavaGreetingsComponent.java | 8 +- .../java/helloworld/JavaHelloWorldComponent.java | 4 +- .../main/java/helloworld/OSGiGreetingsImpl.java | 2 +- .../java/helloworld/sdo/HelloWorldService.java | 2 +- .../helloworld/sdo/HelloWorldServiceComponent.java | 2 +- .../helloworld/sdo/client/HelloWorldClient.java | 2 +- .../src/main/java/helloworld/ws/HelloWorld.java | 2 +- .../stockquote/OSGiStockQuoteComponentImpl.java | 2 +- .../main/java/stockquote/OSGiStockQuoteImpl.java | 2 +- .../main/java/supplychain/customer/Customer.java | 2 +- .../customer/JavaCustomerComponentImpl.java | 6 +- .../supplychain/customer/OSGiCustomerImpl.java | 2 +- .../OSGiStatelessCustomerComponentImpl.java | 2 +- .../customer/OSGiStatelessCustomerImpl.java | 2 +- .../retailer/JavaRetailerComponentImpl.java | 8 +- .../shipper/JavaShipperComponentImpl.java | 8 +- .../shipper/OSGiStatelessShipperComponentImpl.java | 2 +- .../shipper/OSGiStatelessShipperServiceImpl.java | 2 +- .../warehouse/JavaWarehouseComponentImpl.java | 6 +- .../JavaWarehouseWithQueryComponentImpl.java | 6 +- .../osgi/conversation/ConversationalClient.mf | 2 +- .../conversation/ConversationalReferenceClient.mf | 2 +- .../osgi/conversation/ConversationalService.mf | 2 +- .../main/resources/osgi/sdo/ds/HelloWorldClient.mf | 2 +- .../resources/osgi/sdo/ds/HelloWorldService.mf | 2 +- .../src/test/resources/META-INF/MANIFEST.MF | 4 +- .../main/java/supplychain/customer/Customer.java | 4 +- .../customer/JavaCustomerComponentImpl.java | 6 +- .../retailer/JavaRetailerComponentImpl.java | 6 +- .../shipper/JavaShipperComponentImpl.java | 6 +- .../warehouse/JavaWarehouseComponentImpl.java | 6 +- .../src/main/resources/META-INF/SupplyChain.mf | 4 +- .../main/resources/META-INF/SupplyChainClient.mf | 4 +- .../main/java/helloworld/HelloWorldClientImpl.java | 4 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../java/helloworld/HelloWorldServiceImpl.java | 6 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../main/java/helloworld/HelloWorldClientImpl.java | 4 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../java/helloworld/HelloWorldServiceImpl.java | 6 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../src/main/java/calculator/AddService.java | 4 +- .../java/calculator/CalculatorServiceImpl.java | 4 +- .../src/main/java/calculator/DivideService.java | 4 +- .../main/java/com/example/ExampleClientImpl.java | 6 +- .../src/main/java/com/example/ExampleService.java | 2 +- .../mysca/test/myservice/impl/MyServiceImpl.java | 10 +- .../test/myservice/impl/MyTotalServiceImpl.java | 4 +- .../tuscany/sca/itest/ABCDComponentImpl.java | 4 +- .../org/apache/tuscany/sca/itest/ABComponent.java | 2 +- .../apache/tuscany/sca/itest/ABComponentImpl.java | 2 +- .../apache/tuscany/sca/itest/CDComponentImpl.java | 2 +- .../tuscany/sca/itest/PropertyComponentImpl.java | 6 +- .../org/apache/tuscany/sca/itest/cdi/Foo1.java | 6 +- .../org/apache/tuscany/sca/itest/cdi/Foo2.java | 6 +- .../org/apache/tuscany/sca/itest/cdi/Foo3.java | 6 +- .../java/mysca/test/myservice/MyServiceImpl.java | 4 +- .../test/myservice/MySimpleTotalServiceImpl.java | 4 +- .../recursive-ws/src/main/java/policy/Target.java | 2 +- .../src/main/java/policy/TargetClientImpl.java | 4 +- .../src/main/java/policy/TargetServiceImpl.java | 2 +- .../src/main/java/recursive/Composer.java | 2 +- .../main/java/recursive/ComposerClientImpl.java | 2 +- .../src/test/java/policy/PolicyTestCase.java | 2 +- .../src/main/java/composite/SourceImpl.java | 6 +- .../recursive/src/main/java/composite/Target.java | 4 +- .../src/main/java/composite/TargetImpl.java | 6 +- java/sca/itest/recursive/src/main/java/foo/A.java | 2 +- java/sca/itest/recursive/src/main/java/foo/B.java | 4 +- .../recursive/src/main/java/policy/Target.java | 2 +- .../src/main/java/policy/TargetClientImpl.java | 4 +- .../src/main/java/policy/TargetServiceImpl.java | 2 +- .../src/main/java/sample/ComponentAImpl.java | 4 +- .../src/main/java/sample/ComponentCImpl.java | 4 +- .../src/main/java/sample/ComponentEImpl.java | 4 +- .../src/main/java/sample/ComponentFImpl.java | 2 +- .../src/main/java/test/AggregatorImpl.java | 4 +- .../src/main/java/test/InnerSourceImpl.java | 2 +- .../src/main/java/test/OuterSourceImpl.java | 2 +- .../itest/recursive/src/main/java/test/Source.java | 2 +- .../src/main/java/test1/composite/TargetOne.java | 2 +- .../src/main/java/test1/composite/TargetTwo.java | 2 +- .../LocateServiceEmbeddedSCADomainTestCase.java | 4 +- .../composite/LocateServiceSCADomainTestCase.java | 4 +- .../recursive/src/test/java/sample/CImpl.java | 4 +- .../recursive/src/test/java/sample/XImpl.java | 2 +- .../recursive/src/test/java/sample/YImpl.java | 2 +- .../sca/itest/references/AComponentImpl.java | 4 +- .../sca/itest/references/BComponentImpl.java | 2 +- .../references/BComponentWrongTargetImpl.java | 2 +- .../sca/itest/references/DComponentImpl.java | 2 +- .../scopes/CompositeScopeStateVerifierImpl.java | 2 +- .../scopes/RequestScopeStateVerifierImpl.java | 6 +- .../servicereference/ConversationalService.java | 6 +- .../ConversationalServiceCallback.java | 2 +- .../ConversationalServiceImpl.java | 16 +-- .../servicereference/SCAManagedClientImpl.java | 6 +- .../SCAManagedConversationalClient.java | 2 +- .../SCAManagedConversationalClientImpl.java | 8 +- .../itest/servicereference/StatelessService.java | 2 +- .../servicereference/StatelessServiceImpl.java | 6 +- .../utils/ServiceReferenceUtils.java | 4 +- .../tuscany/sca/itest/services/AComponent.java | 2 +- .../tuscany/sca/itest/services/BComponentImpl.java | 2 +- .../tuscany/sca/itest/services/CComponent.java | 2 +- .../tuscany/sca/itest/services/DComponentImpl.java | 2 +- .../sca/itest/services/ServicesTestCase.java | 2 +- .../java/bigbank/stockquote/StockQuoteImpl.java | 2 +- .../java/bigbank/stockquote/StockQuoteService.java | 2 +- .../spring/annotations/CalculatorServiceImpl.java | 12 +- .../tuscany/sca/itest/spring/HelloWorld.java | 2 +- .../tuscany/sca/itest/spring/HelloWorldProxy.java | 2 +- .../transaction/CheckingAccountServiceImpl.java | 10 +- .../transaction/SavingsAccountServiceImpl.java | 10 +- .../sca/itest/transaction/TransferServiceImpl.java | 4 +- .../main/java/binding/ejb/account/Customer.java | 2 +- .../java/binding/ejb/account/CustomerImpl.java | 6 +- .../main/java/binding/jms/HelloWorldService.java | 2 +- .../main/java/calculator/warning/AddService.java | 2 +- .../java/calculator/warning/AddServiceImpl.java | 2 +- .../warning/AddServiceImplWithServiceName.java | 4 +- .../calculator/warning/CalculatorServiceImpl.java | 2 +- .../calculator/warning/PropertyServiceImpl.java | 2 +- .../SubtractServiceImplWithServiceName.java | 2 +- .../src/main/java/impl/java/AddServiceImpl.java | 2 +- .../main/java/impl/java/CalculatorServiceImpl.java | 2 +- .../src/main/java/impl/spring/HelloWorld.java | 4 +- .../src/main/java/impl/spring/HelloWorldProxy.java | 2 +- .../java/interfacejava/xml/CalculatorService.java | 2 +- .../interfacejava/xml/CalculatorServiceImpl.java | 2 +- .../calculator/warning/XSDValidationTestCase.java | 2 +- .../org/apache/tuscany/sca/itest/WireClient.java | 2 +- .../apache/tuscany/sca/itest/WireClientImpl.java | 4 +- .../org/apache/tuscany/sca/itest/WireService.java | 2 +- .../apache/tuscany/sca/itest/WireServiceImpl.java | 2 +- .../src/main/java/voidtest/HelloWorldImpl.java | 2 +- .../src/main/java/voidtest/HelloWorldService.java | 4 +- .../src/main/java/voidtest/TestClientImpl.java | 6 +- .../main/java/helloworld/HelloWorldCallback.java | 2 +- .../main/java/helloworld/HelloWorldClientImpl.java | 4 +- .../main/java/helloworld/HelloWorldService.java | 4 +- .../java/helloworld/HelloWorldServiceImpl.java | 4 +- .../services/accountdata/AccountDataService.java | 4 +- .../accountdata/AccountDataServiceImpl.java | 2 +- .../accountdata/AccountServiceClientImpl.java | 2 +- .../services/accountdata/Component2aImpl.java | 2 +- .../services/accountdata/Component2bImpl.java | 2 +- .../services/accountdata/Component3aImpl.java | 2 +- .../services/accountdata/Component3bImpl.java | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../helloworld/HelloWorldServiceComponent.java | 2 +- .../apache/tuscany/sca/itest/Component2aImpl.java | 2 +- .../apache/tuscany/sca/itest/Component2bImpl.java | 2 +- .../apache/tuscany/sca/itest/Component3aImpl.java | 2 +- .../apache/tuscany/sca/itest/Component3bImpl.java | 2 +- .../services/accountdata/AccountDataService.java | 4 +- .../accountdata/AccountDataServiceImpl.java | 2 +- .../accountdata/AccountServiceClientImpl.java | 2 +- .../services/accountdata/Component2aImpl.java | 2 +- .../services/accountdata/Component2bImpl.java | 2 +- .../services/accountdata/Component3aImpl.java | 2 +- .../services/accountdata/Component3bImpl.java | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../helloworld/HelloWorldServiceComponent.java | 2 +- .../apache/tuscany/sca/itest/Component2aImpl.java | 2 +- .../apache/tuscany/sca/itest/Component2bImpl.java | 2 +- .../apache/tuscany/sca/itest/Component3aImpl.java | 2 +- .../apache/tuscany/sca/itest/Component3bImpl.java | 2 +- .../src/main/java/service/SomeService.java | 2 +- .../src/main/java/service/SomeServiceImpl.java | 2 +- .../binding-atom-abdera/META-INF/MANIFEST.MF | 6 +- .../sca/binding/atom/collection/Collection.java | 2 +- .../binding/atom/collection/MediaCollection.java | 2 +- .../binding/atom/provider/AtomBindingInvoker.java | 2 +- .../sca/binding/atom/CustomerClientImpl.java | 2 +- .../sca/binding/atom/CustomerCollectionImpl.java | 2 +- .../sca/binding/atom/MediaCollectionImpl.java | 2 +- .../binding-corba-runtime/META-INF/MANIFEST.MF | 4 +- .../sca/binding/corba/provider/CorbaInvoker.java | 2 +- .../provider/CorbaServiceBindingProvider.java | 2 +- .../binding-ejb-runtime/META-INF/MANIFEST.MF | 4 +- .../tuscany/sca/binding/ejb/util/EJBHandler.java | 2 +- .../sca/binding/ejb/util/EJBObjectFactory.java | 2 +- .../sca/binding/ejb/util/EJBStubHelper.java | 4 +- .../binding/ejb/util/JavaReflectionAdapter.java | 2 +- .../src/test/java/account/BankManagerFacade.java | 2 +- .../src/test/java/account/Customer.java | 2 +- .../src/test/java/account/CustomerImpl.java | 6 +- .../binding-gdata-runtime/META-INF/MANIFEST.MF | 6 +- .../sca/binding/gdata/collection/Collection.java | 2 +- .../binding/gdata/collection/MediaCollection.java | 2 +- .../gdata/provider/GdataBindingInvoker.java | 2 +- .../sca/binding/gdata/CustomerClientImpl.java | 2 +- .../sca/binding/gdata/CustomerCollectionImpl.java | 2 +- .../binding-http-runtime/META-INF/MANIFEST.MF | 2 +- .../sca/binding/http/TestServiceCacheImpl.java | 2 +- .../tuscany/sca/binding/http/TestServiceImpl.java | 2 +- .../binding-jms-runtime/META-INF/MANIFEST.MF | 6 +- .../jms/provider/AbstractMessageProcessor.java | 2 +- .../binding/jms/provider/JMSBindingInvoker.java | 2 +- .../binding/jms/provider/RRBJMSBindingInvoker.java | 2 +- .../sca/binding/jms/HelloWorldClientImpl.java | 4 +- .../tuscany/sca/binding/jms/HelloWorldService.java | 2 +- .../binding-jsonrpc-runtime/META-INF/MANIFEST.MF | 6 +- .../jsonrpc/provider/JSONRPCServiceServlet.java | 2 +- .../src/test/java/echo/Echo.java | 2 +- .../binding-rmi-runtime/META-INF/MANIFEST.MF | 4 +- .../rmi/provider/RMIServiceBindingProvider.java | 2 +- .../src/test/java/helloworld/HelloWorldImpl.java | 2 +- .../test/java/helloworld/HelloWorldRmiImpl.java | 4 +- .../modules/binding-rss-rome/META-INF/MANIFEST.MF | 2 +- .../sca/binding/rss/collection/Collection.java | 2 +- .../binding/rss/collection/MediaCollection.java | 2 +- .../sca/binding/rss/CustomerClientImpl.java | 2 +- .../sca/binding/rss/CustomerCollectionImpl.java | 2 +- .../modules/binding-sca-axis2/META-INF/MANIFEST.MF | 4 +- .../sca/axis2/impl/Axis2SCABindingInvoker.java | 2 +- .../sca/binding/sca/axis2/SimpleTestCase.java | 2 +- .../axis2/helloworld/HelloWorldCallbackRemote.java | 2 +- .../HelloWorldServiceCallbackOnewayRemote.java | 6 +- .../HelloWorldServiceCallbackRemote.java | 4 +- .../axis2/helloworld/HelloWorldServiceRemote.java | 2 +- .../axis2/helloworld/HelloWorldServiceRemote2.java | 2 +- .../HelloWorldClientCallbackOnewayRemoteImpl.java | 2 +- .../impl/HelloWorldClientCallbackRemoteImpl.java | 2 +- .../helloworld/impl/HelloWorldClientLocalImpl.java | 2 +- .../impl/HelloWorldClientRemote2Impl.java | 2 +- .../impl/HelloWorldClientRemoteImpl.java | 2 +- .../HelloWorldServiceCallbackOnewayRemoteImpl.java | 2 +- .../impl/HelloWorldServiceCallbackRemoteImpl.java | 2 +- .../HelloWorldServiceMultipleServicesImpl.java | 2 +- .../modules/binding-sca-corba/META-INF/MANIFEST.MF | 2 +- .../binding/sca/corba/impl/CorbaSCAInvoker.java | 2 +- .../corba/impl/CorbaSCAServiceBindingProvider.java | 2 +- java/sca/modules/binding-sca/META-INF/MANIFEST.MF | 2 +- .../RuntimeSCAReferenceBindingProvider.java | 2 +- .../binding-ws-axis2-policy/META-INF/MANIFEST.MF | 4 +- .../Axis2ConfigParamPolicyProviderFactory.java | 2 +- .../modules/binding-ws-axis2/META-INF/MANIFEST.MF | 6 +- .../ws/axis2/Axis2BindingProviderFactory.java | 2 +- .../ws/axis2/Axis2ReferenceBindingProvider.java | 2 +- .../ws/axis2/Axis2ServiceBindingProvider.java | 2 +- .../sca/binding/ws/axis2/Axis2ServiceClient.java | 2 +- .../Axis2ServiceInOutSyncMessageReceiver.java | 2 +- .../sca/binding/ws/axis2/Axis2ServiceProvider.java | 2 +- ...xis2BindingBasicAuthenticationConfigurator.java | 2 +- .../sca/binding/ws/axis2/itests/Account.java | 2 +- .../tuscany/sca/binding/ws/axis2/itests/Echo.java | 2 +- .../sca/binding/ws/axis2/itests/EchoComponent.java | 2 +- .../sca/binding/ws/axis2/itests/HelloWorld.java | 2 +- .../ws/axis2/itests/HelloWorldComponent.java | 2 +- .../sca/binding/ws/axis2/itests/HelloWorldOM.java | 2 +- .../sca/binding/ws/axis2/itests/HelloWorldOM2.java | 2 +- .../ws/axis2/itests/HelloWorldOMComponent.java | 2 +- .../ws/axis2/itests/UriPrecedenceTestCase.java | 2 +- .../ws/axis2/itests/mtom/FileTransferClient.java | 2 +- .../ws/axis2/itests/mtom/FileTransferService.java | 2 +- .../axis2/itests/mtom/FileTransferServiceImpl.java | 2 +- .../binding-ws-wsdlgen/META-INF/MANIFEST.MF | 6 +- .../ws/wsdlgen/WSDLGenerationException.java | 2 +- .../ws/wsdlgen/BindingWSDLGeneratorTestCase.java | 2 +- .../sca/binding/ws/wsdlgen/TestJavaInterface.java | 4 +- .../modules/core-databinding/META-INF/MANIFEST.MF | 4 +- .../module/DataBindingModuleActivator.java | 2 +- .../transformers/Array2ArrayTransformer.java | 2 +- .../CallableReference2XMLStreamReader.java | 2 +- .../transformers/CallableReferenceDataBinding.java | 2 +- .../transformers/CallableReferenceXMLAdapter.java | 2 +- .../transformers/Input2InputTransformer.java | 2 +- .../transformers/Output2OutputTransformer.java | 2 +- .../XMLStreamReader2CallableReference.java | 2 +- .../wire/DataTransformationInterceptor.java | 2 +- .../databinding/wire/PassByValueInterceptor.java | 2 +- .../DataBindingJavaInterfaceProcessorTestCase.java | 2 +- java/sca/modules/core-spi/META-INF/MANIFEST.MF | 6 +- .../sca/context/ComponentContextFactory.java | 2 +- .../tuscany/sca/context/RequestContextFactory.java | 2 +- .../sca/runtime/RuntimeComponentContext.java | 6 +- java/sca/modules/core/META-INF/MANIFEST.MF | 10 +- .../sca/core/assembly/impl/EndpointWireImpl.java | 2 +- .../assembly/impl/RuntimeComponentServiceImpl.java | 2 +- .../sca/core/assembly/impl/RuntimeWireImpl.java | 2 +- .../sca/core/context/CallableReferenceExt.java | 2 +- .../tuscany/sca/core/context/CompositeContext.java | 2 +- .../context/DefaultComponentContextFactory.java | 2 +- .../core/context/DefaultRequestContextFactory.java | 2 +- .../sca/core/context/ServiceReferenceExt.java | 2 +- .../core/context/impl/CallableReferenceImpl.java | 4 +- .../core/context/impl/ComponentContextImpl.java | 8 +- .../core/context/impl/CompositeContextImpl.java | 2 +- .../sca/core/context/impl/RequestContextImpl.java | 4 +- .../core/context/impl/ServiceReferenceImpl.java | 4 +- .../sca/core/conversation/ConversationExt.java | 4 +- .../invocation/CallableReferenceObjectFactory.java | 2 +- .../invocation/CallbackInterfaceInterceptor.java | 2 +- .../invocation/CallbackReferenceObjectFactory.java | 2 +- .../sca/core/invocation/CglibProxyFactory.java | 4 +- .../core/invocation/ExtensibleProxyFactory.java | 2 +- .../core/invocation/NonBlockingInterceptor.java | 2 +- .../tuscany/sca/core/invocation/ProxyFactory.java | 2 +- .../sca/core/invocation/RuntimeWireInvoker.java | 4 +- .../impl/JDKCallbackInvocationHandler.java | 4 +- .../core/invocation/impl/JDKInvocationHandler.java | 8 +- .../sca/core/invocation/impl/JDKProxyFactory.java | 4 +- .../sca/core/invocation/impl/PhaseManager.java | 2 +- .../sca/core/work/impl/ThreadPoolWorkManager.java | 2 +- ...CallbackInterfaceInterceptorTestCase.java.fixme | 2 +- java/sca/modules/data-api/META-INF/MANIFEST.MF | 2 +- .../tuscany/sca/data/collection/Collection.java | 2 +- .../sca/data/collection/ItemCollection.java | 2 +- ....apache.tuscany.sca.databinding.PullTransformer | 4 +- .../modules/databinding-jaxb/META-INF/MANIFEST.MF | 4 +- .../sca/databinding/jaxb/DataConverter.java | 2 +- .../databinding/jaxb/JAXBPropertyDescriptor.java | 2 +- .../sca/databinding/jaxb/JAXBTypeHelper.java | 2 +- .../sca/databinding/jaxb/JAXBWrapperException.java | 2 +- .../modules/databinding-json/META-INF/MANIFEST.MF | 2 +- .../sca/databinding/json/axiom/JSON2OMElement.java | 2 +- .../modules/databinding-sdo/META-INF/MANIFEST.MF | 4 +- .../tuscany/sca/databinding/sdo/SDOTypeHelper.java | 2 +- .../databinding-xmlbeans/META-INF/MANIFEST.MF | 4 +- .../databinding/xmlbeans/XMLBeansDataBinding.java | 2 +- .../sca/databinding/xmlbeans/XmlObject2Node.java | 2 +- .../modules/domain-manager/META-INF/MANIFEST.MF | 10 +- .../impl/CompositeConfigurationCollectionImpl.java | 8 +- .../impl/CompositeConfigurationServiceImpl.java | 8 +- .../impl/CompositeGeneratorServiceImpl.java | 8 +- .../manager/impl/ContributionCollectionImpl.java | 12 +- .../manager/impl/ContributionServiceImpl.java | 6 +- .../impl/DeployableCompositeCollectionImpl.java | 8 +- .../impl/DeployableCompositeServiceImpl.java | 8 +- .../impl/DeployedCompositeCollectionImpl.java | 12 +- .../impl/DomainManagerConfigurationImpl.java | 8 +- .../sca/domain/manager/impl/DomainManagerUtil.java | 4 +- .../domain/manager/impl/FileCollectionImpl.java | 10 +- .../sca/domain/manager/impl/FileServiceImpl.java | 10 +- .../manager/impl/NodeConfigurationServiceImpl.java | 6 +- .../impl/NodeProcessCollectionFacadeImpl.java | 10 +- .../domain/manager/impl/QuickStartServiceImpl.java | 8 +- .../launcher/DomainManagerLauncherBootstrap.java | 4 +- java/sca/modules/endpoint/META-INF/MANIFEST.MF | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- java/sca/modules/host-webapp/META-INF/MANIFEST.MF | 4 +- .../tuscany/sca/host/webapp/jsp/ReferenceTag.java | 4 +- .../implementation-bpel-ode/META-INF/MANIFEST.MF | 2 +- .../BPELImplementationProviderFactory.java | 2 +- .../META-INF/MANIFEST.MF | 6 +- .../injection/RequestContextObjectFactory.java | 2 +- .../invocation/JavaComponentContextFactory.java | 2 +- .../invocation/JavaComponentContextProvider.java | 8 +- .../java/invocation/JavaImplementationInvoker.java | 2 +- .../invocation/JavaImplementationProvider.java | 4 +- .../implementation-java-xml/META-INF/MANIFEST.MF | 2 +- .../src/test/java/calculator/AddServiceImpl.java | 4 +- .../java/calculator/CalculatorServiceImpl.java | 4 +- .../test/java/calculator/DivideServiceImpl.java | 2 +- .../test/java/calculator/MultiplyServiceImpl.java | 2 +- .../test/java/calculator/SubtractServiceImpl.java | 2 +- .../implementation-java/META-INF/MANIFEST.MF | 6 +- .../java/introspect/JavaIntrospectionHelper.java | 4 +- .../impl/AllowsPassByReferenceProcessor.java | 2 +- .../introspect/impl/ComponentNameProcessor.java | 2 +- .../java/introspect/impl/ConstructorProcessor.java | 8 +- .../java/introspect/impl/ContextProcessor.java | 6 +- .../introspect/impl/ConversationIDProcessor.java | 2 +- .../introspect/impl/ConversationProcessor.java | 6 +- .../java/introspect/impl/DestroyProcessor.java | 2 +- .../impl/DuplicateConstructorException.java | 2 +- .../impl/DuplicateDestructorException.java | 2 +- .../introspect/impl/DuplicateInitException.java | 2 +- .../java/introspect/impl/EagerInitProcessor.java | 4 +- .../introspect/impl/HeuristicPojoProcessor.java | 12 +- .../impl/IllegalCallbackReferenceException.java | 2 +- .../introspect/impl/IllegalContextException.java | 2 +- .../impl/IllegalDestructorException.java | 2 +- .../java/introspect/impl/IllegalInitException.java | 2 +- .../impl/IllegalServiceDefinitionException.java | 2 +- .../java/introspect/impl/InitProcessor.java | 2 +- .../impl/InvalidConstructorException.java | 2 +- .../introspect/impl/InvalidPropertyException.java | 2 +- .../introspect/impl/InvalidReferenceException.java | 2 +- .../impl/InvalidServiceTypeException.java | 2 +- .../java/introspect/impl/PolicyProcessor.java | 14 +-- .../java/introspect/impl/PropertyProcessor.java | 2 +- .../java/introspect/impl/ReferenceProcessor.java | 4 +- .../java/introspect/impl/ScopeProcessor.java | 2 +- .../java/introspect/impl/ServiceProcessor.java | 12 +- .../impl/UnknownContextTypeException.java | 2 +- .../AllowsPassByReferenceProcessorTestCase.java | 2 +- .../impl/ConstructorProcessorTestCase.java | 16 +-- .../impl/ConstructorPropertyTestCase.java | 18 +-- .../impl/ConstructorReferenceTestCase.java | 20 ++-- .../impl/ConstructorResourceTestCase.java | 16 +-- .../introspect/impl/ContextProcessorTestCase.java | 8 +- .../impl/ConversationIDProcessorTestCase.java | 2 +- .../impl/ConversationProcessorTestCase.java | 6 +- .../introspect/impl/DestroyProcessorTestCase.java | 2 +- .../impl/EagerInitProcessorTestCase.java | 2 +- .../impl/HeuristicAndPropertyTestCase.java | 2 +- .../impl/HeuristicConstructorTestCase.java | 6 +- .../impl/HeuristicPojoProcessorTestCase.java | 8 +- .../HeutisticExtensibleConstructorTestCase.java | 8 +- .../introspect/impl/InitProcessorTestCase.java | 2 +- .../introspect/impl/PolicyProcessorTestCase.java | 4 +- .../introspect/impl/PropertyProcessorTestCase.java | 2 +- .../impl/ReferenceProcessorTestCase.java | 2 +- .../introspect/impl/ScopeProcessorTestCase.java | 10 +- .../introspect/impl/ServiceCallbackTestCase.java | 6 +- .../introspect/impl/ServiceProcessorTestCase.java | 6 +- .../META-INF/MANIFEST.MF | 4 +- .../NodeImplementationDaemonBootstrap.java | 4 +- .../NodeImplementationLauncherBootstrap.java | 4 +- .../osgi/context/OSGiAnnotations.java | 2 +- .../osgi/context/OSGiPropertyInjector.java | 6 +- .../osgi/runtime/OSGiInstanceWrapper.java | 4 +- .../osgi/test/OSGiTestWithPropertyImpl.java | 2 +- .../implementation-pojo/META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../script/itests/helloworld/HelloWorldProxy.java | 2 +- .../script/itests/properties/HelloWorldProxy.java | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../spring/itests/helloworld/HelloWorld.java | 2 +- .../spring/itests/helloworld/HelloWorldProxy.java | 2 +- .../implementation-spring/META-INF/MANIFEST.MF | 4 +- .../ComponentNameAnnotationProcessor.java | 2 +- .../processor/ConstructorAnnotationProcessor.java | 2 +- .../processor/InitDestroyAnnotationProcessor.java | 4 +- .../processor/PropertyAnnotationProcessor.java | 2 +- .../processor/ReferenceAnnotationProcessor.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../src/test/java/store/Catalog.java | 2 +- .../src/test/java/store/CatalogImpl.java | 2 +- .../implementation-xquery/META-INF/MANIFEST.MF | 2 +- .../interface-java-jaxws/META-INF/MANIFEST.MF | 6 +- .../java/jaxws/JAXWSFaultExceptionMapper.java | 2 +- .../sca/interfacedef/java/jaxws/TestInterface.java | 2 +- .../modules/interface-java/META-INF/MANIFEST.MF | 2 +- .../java/impl/JavaInterfaceIntrospectorImpl.java | 10 +- .../java/impl/PolicyJavaInterfaceVisitor.java | 6 +- ...avaInterfaceUtilDuplicateRemotableTestCase.java | 2 +- .../impl/ConversationalIntrospectionTestCase.java | 4 +- .../impl/PolicyProcessorTestCase.java | 4 +- java/sca/modules/node-api/META-INF/MANIFEST.MF | 4 +- .../java/org/apache/tuscany/sca/node/Client.java | 4 +- .../org/apache/tuscany/sca/node/NodeFactory.java | 6 +- java/sca/modules/node-impl/META-INF/MANIFEST.MF | 4 +- .../org/apache/tuscany/sca/node/impl/NodeImpl.java | 6 +- .../node-impl/src/test/java/hello/HelloWorld.java | 2 +- .../src/test/java/hello/HelloWorld.java | 2 +- .../src/test/java/hello/HelloWorldClient.java | 8 +- java/sca/modules/node-manager/META-INF/MANIFEST.MF | 4 +- .../node/manager/NodeProcessCollectionImpl.java | 8 +- .../node/manager/PingServiceImpl.java | 6 +- .../policy-security-jsr250/META-INF/MANIFEST.MF | 2 +- .../impl/PolicyProcessorTestCaseFIXME.java | 4 +- .../modules/policy-security/META-INF/MANIFEST.MF | 6 +- ...ityIdentityImplementationPolicyInterceptor.java | 2 +- .../jaas/JaasAuthenticationInterceptor.java | 2 +- java/sca/modules/sca-api/META-INF/MANIFEST.MF | 6 +- .../java/org/oasisopen/sca/CallableReference.java | 54 +++++++++ .../java/org/oasisopen/sca/ComponentContext.java | 122 +++++++++++++++++++++ .../src/main/java/org/oasisopen/sca/Constants.java | 34 ++++++ .../main/java/org/oasisopen/sca/Conversation.java | 30 +++++ .../oasisopen/sca/ConversationEndedException.java | 56 ++++++++++ .../sca/NoRegisteredCallbackException.java | 57 ++++++++++ .../java/org/oasisopen/sca/RequestContext.java | 55 ++++++++++ .../java/org/oasisopen/sca/ServiceReference.java | 54 +++++++++ .../org/oasisopen/sca/ServiceRuntimeException.java | 58 ++++++++++ .../oasisopen/sca/ServiceUnavailableException.java | 54 +++++++++ .../sca/annotation/AllowsPassByReference.java | 28 +++++ .../oasisopen/sca/annotation/Authentication.java | 58 ++++++++++ .../org/oasisopen/sca/annotation/Callback.java | 39 +++++++ .../oasisopen/sca/annotation/ComponentName.java | 25 +++++ .../oasisopen/sca/annotation/Confidentiality.java | 58 ++++++++++ .../org/oasisopen/sca/annotation/Constructor.java | 25 +++++ .../java/org/oasisopen/sca/annotation/Context.java | 28 +++++ .../sca/annotation/ConversationAttributes.java | 46 ++++++++ .../oasisopen/sca/annotation/ConversationID.java | 25 +++++ .../oasisopen/sca/annotation/Conversational.java | 27 +++++ .../java/org/oasisopen/sca/annotation/Destroy.java | 25 +++++ .../org/oasisopen/sca/annotation/EagerInit.java | 25 +++++ .../oasisopen/sca/annotation/EndsConversation.java | 24 ++++ .../java/org/oasisopen/sca/annotation/Init.java | 26 +++++ .../org/oasisopen/sca/annotation/Integrity.java | 58 ++++++++++ .../java/org/oasisopen/sca/annotation/Intent.java | 48 ++++++++ .../java/org/oasisopen/sca/annotation/OneWay.java | 25 +++++ .../org/oasisopen/sca/annotation/PolicySets.java | 35 ++++++ .../org/oasisopen/sca/annotation/Property.java | 41 +++++++ .../org/oasisopen/sca/annotation/Qualifier.java | 25 +++++ .../org/oasisopen/sca/annotation/Reference.java | 40 +++++++ .../org/oasisopen/sca/annotation/Remotable.java | 26 +++++ .../org/oasisopen/sca/annotation/Requires.java | 46 ++++++++ .../java/org/oasisopen/sca/annotation/Scope.java | 38 +++++++ .../java/org/oasisopen/sca/annotation/Service.java | 37 +++++++ .../main/java/org/osoa/sca/CallableReference.java | 54 --------- .../main/java/org/osoa/sca/ComponentContext.java | 122 --------------------- .../src/main/java/org/osoa/sca/Constants.java | 34 ------ .../src/main/java/org/osoa/sca/Conversation.java | 30 ----- .../org/osoa/sca/ConversationEndedException.java | 56 ---------- .../osoa/sca/NoRegisteredCallbackException.java | 57 ---------- .../src/main/java/org/osoa/sca/RequestContext.java | 55 ---------- .../main/java/org/osoa/sca/ServiceReference.java | 54 --------- .../java/org/osoa/sca/ServiceRuntimeException.java | 58 ---------- .../org/osoa/sca/ServiceUnavailableException.java | 54 --------- .../sca/annotations/AllowsPassByReference.java | 28 ----- .../org/osoa/sca/annotations/Authentication.java | 58 ---------- .../java/org/osoa/sca/annotations/Callback.java | 39 ------- .../org/osoa/sca/annotations/ComponentName.java | 25 ----- .../org/osoa/sca/annotations/Confidentiality.java | 58 ---------- .../java/org/osoa/sca/annotations/Constructor.java | 25 ----- .../java/org/osoa/sca/annotations/Context.java | 28 ----- .../sca/annotations/ConversationAttributes.java | 46 -------- .../org/osoa/sca/annotations/ConversationID.java | 25 ----- .../org/osoa/sca/annotations/Conversational.java | 27 ----- .../java/org/osoa/sca/annotations/Destroy.java | 25 ----- .../java/org/osoa/sca/annotations/EagerInit.java | 25 ----- .../org/osoa/sca/annotations/EndsConversation.java | 24 ---- .../main/java/org/osoa/sca/annotations/Init.java | 26 ----- .../java/org/osoa/sca/annotations/Integrity.java | 58 ---------- .../main/java/org/osoa/sca/annotations/Intent.java | 48 -------- .../main/java/org/osoa/sca/annotations/OneWay.java | 25 ----- .../java/org/osoa/sca/annotations/PolicySets.java | 35 ------ .../java/org/osoa/sca/annotations/Property.java | 41 ------- .../java/org/osoa/sca/annotations/Qualifier.java | 25 ----- .../java/org/osoa/sca/annotations/Reference.java | 40 ------- .../java/org/osoa/sca/annotations/Remotable.java | 26 ----- .../java/org/osoa/sca/annotations/Requires.java | 46 -------- .../main/java/org/osoa/sca/annotations/Scope.java | 38 ------- .../java/org/osoa/sca/annotations/Service.java | 37 ------- .../src/test/java/echo/EchoComponentImpl.java | 4 +- .../src/main/java/echo/EchoComponentImpl.java | 4 +- .../java/notification/broker/TrafficAdvisory.java | 2 +- .../broker/TrafficAdvisoryConsumer.java | 8 +- .../broker/TrafficAdvisoryProducer.java | 6 +- .../notification/consumer/TrafficAdvisory.java | 2 +- .../consumer/TrafficAdvisoryConsumer.java | 8 +- .../notification/producer/TrafficAdvisory.java | 2 +- .../producer/TrafficAdvisoryProducer.java | 6 +- .../src/main/java/calculator/AddService.java | 2 +- .../src/main/java/calculator/CalculatorClient.java | 8 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../main/java/calculator/CalculatorService.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../main/java/calculator/CalculatorService.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../src/main/java/calculator/AddService.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../src/main/java/calculator/SubtractService.java | 2 +- .../src/main/java/node/LaunchCalculatorNodeA.java | 2 +- .../src/main/java/calculator/CalculatorClient.java | 8 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../src/main/java/calculator/CalculatorClient.java | 8 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../test/java/calculator/CalculatorTestCase.java | 6 +- .../samples/calculator-osgi/META-INF/MANIFEST.MF | 2 +- .../src/main/java/calculator/CalculatorClient.java | 8 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../src/main/java/calculator/CalculatorClient.java | 8 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../main/java/calculator/CalculatorService.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../main/java/calculator/CalculatorService.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../src/main/java/calculator/AddService.java | 2 +- .../src/main/java/calculator/AddServiceImpl.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../src/main/java/calculator/SubtractService.java | 2 +- .../src/main/java/calculator/AddService.java | 2 +- .../src/main/java/calculator/AddServiceImpl.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../test/java/calculator/CalculatorTestCase.java | 4 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../src/main/java/myapp/MyClient.java | 2 +- .../src/main/java/myapp/MyClientImpl.java | 6 +- .../src/main/java/myserver/MyService.java | 6 +- .../src/main/java/myserver/MyServiceCallback.java | 2 +- .../src/main/java/myserver/MyService.java | 6 +- .../src/main/java/myserver/MyServiceCallback.java | 2 +- .../src/main/java/myserver/MyServiceImpl.java | 6 +- .../src/main/java/callbacks/OrderCallback.java | 4 +- .../src/main/java/callbacks/OrderService.java | 6 +- .../main/java/callbacks/OrderServiceClient.java | 4 +- .../src/main/java/callbacks/OrderServiceImpl.java | 4 +- .../src/main/java/sample/ChatService.java | 2 +- .../src/main/java/sample/ChatServiceImpl.java | 2 +- .../src/main/java/sample/ChatCallback.java | 2 +- .../src/main/java/sample/ChatService.java | 6 +- .../src/main/java/sample/ChatServiceImpl.java | 2 +- .../src/main/java/customer/CustomerService.java | 2 +- .../main/java/customer/CustomerServiceImpl.java | 4 +- .../src/main/java/customer/CustomerService.java | 2 +- .../main/java/customer/CustomerServiceImpl.java | 4 +- .../src/main/java/dbecho/ComponentAImpl.java | 6 +- .../src/main/java/dbecho/ComponentBImpl.java | 6 +- .../src/main/java/dbecho/Echo.java | 2 +- .../src/main/java/dbecho/Interface1.java | 2 +- .../src/main/java/dbecho/Interface2.java | 2 +- .../src/test/java/services/Cart.java | 2 +- .../test/java/services/ShoppingCartClientImpl.java | 4 +- .../src/test/java/services/ShoppingCartImpl.java | 4 +- .../src/main/java/feed/AggregatorImpl.java | 4 +- .../src/main/java/feed/SortImpl.java | 2 +- .../src/main/java/feed/AggregatorImpl.java | 4 +- .../src/main/java/feed/SortImpl.java | 2 +- .../src/main/java/sample/Helloworld.java | 2 +- .../src/main/java/sample/Helloworld.java | 2 +- .../helloworldjsonrpc/HelloWorldServiceImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../java/helloworld/HelloWorldServiceImpl.java | 2 +- .../helloworldjsonrpc/HelloWorldServiceImpl.java | 2 +- .../main/java/sample/HelloworldServiceImpl.java | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../main/java/sample/HelloworldServiceImpl.java | 2 +- .../src/main/java/sample/HelloworldServlet.java | 6 +- .../src/main/java/sample/HelloworldCallback.java | 4 +- .../src/main/java/sample/HelloworldService.java | 6 +- .../main/java/sample/HelloworldServiceImpl.java | 4 +- .../src/main/webapp/hello.html | 2 +- .../main/java/sample/HelloworldServiceImpl.java | 2 +- .../helloworld-web/src/main/webapp/hello.html | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../src/main/java/helloworld/HelloWorldClient.java | 6 +- .../main/java/helloworld/HelloWorldClient2.java | 6 +- .../main/java/helloworld/HelloWorldClient3.java | 6 +- .../main/java/helloworld/HelloWorldClient4.java | 8 +- .../main/java/helloworld/HelloWorldClient5.java | 8 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../src/main/java/helloworld/HelloWorld.java | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../src/main/java/helloworld/HelloWorldImpl.java | 2 +- .../main/java/helloworld/HelloWorldService.java | 2 +- .../org/example/orderservice/OrderServiceImpl.java | 2 +- .../src/main/java/calculator/AddService.java | 2 +- .../src/main/java/calculator/AddServiceImpl.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../src/main/java/composite/SourceImpl.java | 6 +- .../src/main/java/composite/Target.java | 4 +- .../src/main/java/composite/TargetImpl.java | 6 +- .../src/main/java/calculator/CalculatorClient.java | 10 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../java/notification/TrafficAdvisoryConsumer.java | 6 +- .../java/notification/TrafficAdvisoryProducer.java | 6 +- .../pojo/provider/POJOImplementationInvoker.java | 2 +- .../pojo/provider/POJOImplementationProvider.java | 2 +- .../main/java/loanapplication/LoanClientImpl.java | 4 +- .../src/main/java/loanapplication/LoanService.java | 8 +- .../main/java/loanapplication/LoanServiceImpl.java | 6 +- .../main/java/supplychain/customer/Customer.java | 2 +- .../customer/JavaCustomerComponentImpl.java | 6 +- .../retailer/JavaRetailerComponentImpl.java | 6 +- .../shipper/JavaShipperComponentImpl.java | 6 +- .../warehouse/JavaWarehouseComponentImpl.java | 6 +- .../src/main/java/services/Album.java | 2 +- .../src/main/java/services/AlbumImpl.java | 4 +- .../src/main/java/services/jcr/AlbumImpl.java | 4 +- .../java/xquery/quote/AvailQuoteProviderImpl.java | 2 +- .../xquery/quote/AvailQuoteProviderNodeInfo.java | 2 +- .../xquery/quote/AvailQuoteProviderService.java | 2 +- .../xquery/quote/ExternalReferencesQuoteJoin.java | 2 +- .../main/java/xquery/quote/PriceQuoteProvider.java | 2 +- .../xquery/quote/PriceQuoteProviderNodeInfo.java | 2 +- .../java/xquery/quote/PropertiesQuoteJoin.java | 2 +- .../main/java/xquery/quote/QuoteCalculator.java | 2 +- .../src/main/java/xquery/quote/QuoteJoin.java | 2 +- .../main/java/xquery/quote/QuoteJoinLocalImpl.java | 2 +- .../java/bigbank/account/AccountServiceImpl.java | 2 +- .../account/checking/CheckingAccountService.java | 4 +- .../java/bigbank/account/feed/AccountFeedImpl.java | 4 +- .../account/savings/SavingsAccountService.java | 2 +- .../account/savings/SavingsAccountServiceImpl.java | 2 +- .../bigbank/account/stock/StockAccountService.java | 2 +- .../account/stock/StockAccountServiceImpl.java | 2 +- .../java/bigbank/stockquote/StockQuoteService.java | 2 +- .../java/bigbank/account/AccountServiceImpl.java | 4 +- .../java/bigbank/stockquote/StockQuoteService.java | 2 +- .../src/main/java/simplecallback/MyClientImpl.java | 6 +- .../src/main/java/simplecallback/MyService.java | 6 +- .../java/simplecallback/MyServiceCallback.java | 2 +- .../main/java/simplecallback/MyServiceImpl.java | 6 +- .../src/main/java/simplecallback/MyClientImpl.java | 6 +- .../src/main/java/simplecallback/MyService.java | 4 +- .../main/java/simplecallback/MyServiceImpl.java | 6 +- .../src/main/java/sample/JavaInvoker.java | 2 +- .../src/main/java/sample/JavaInvokerFactory.java | 2 +- .../bigbank/calculator/CalculatorServiceImpl.java | 4 +- .../account/checking/CheckingAccountService.java | 4 +- .../checking/CheckingAccountServiceImpl.java | 2 +- .../java/bigbank/stockquote/StockQuoteImpl.java | 2 +- .../java/bigbank/stockquote/StockQuoteService.java | 2 +- .../src/main/java/services/Cart.java | 2 +- .../src/main/java/services/Catalog.java | 2 +- .../src/main/java/services/CurrencyConverter.java | 2 +- .../src/main/java/services/FruitsCatalogImpl.java | 6 +- .../src/main/java/services/ShoppingCartImpl.java | 4 +- .../src/main/java/services/Total.java | 2 +- .../samples/store/src/main/java/services/Cart.java | 2 +- .../store/src/main/java/services/Catalog.java | 2 +- .../src/main/java/services/CurrencyConverter.java | 2 +- .../src/main/java/services/FruitsCatalogImpl.java | 6 +- .../src/main/java/services/ShoppingCartImpl.java | 4 +- .../store/src/main/java/services/Total.java | 2 +- .../src/main/java/supplychain/Customer.java | 2 +- .../java/supplychain/CustomerComponentImpl.java | 2 +- .../java/supplychain/RetailerComponentImpl.java | 2 +- .../java/supplychain/ShipperComponentImpl.java | 2 +- .../java/supplychain/WarehouseComponentImpl.java | 2 +- .../src/main/java/location/USLocationImpl.java | 6 +- .../src/main/java/weather/WeatherForecastImpl.java | 4 +- .../src/main/java/zipcode/ZipCodeService.java | 2 +- .../src/main/java/zipcode/ZipCodeServiceImpl.java | 8 +- .../src/main/java/test/ASM_0001_Client.java | 2 +- .../src/main/java/test/ASM_0002_Client.java | 6 +- .../src/main/java/test/ASM_0003_Client.java | 6 +- .../sampleTest/src/main/java/test/Service1.java | 2 +- .../src/main/java/test/TestInvocation.java | 2 +- .../src/main/java/test/service1Impl.java | 2 +- .../src/main/java/test/service1Impl2.java | 2 +- .../src/main/java/test/service1Impl3.java | 2 +- .../src/main/java/test/service1Impl4.java | 2 +- .../src/main/java/test/service1Impl5.java | 2 +- .../src/main/java/test/service1SupersetImpl.java | 2 +- .../src/main/java/test/service2Impl.java | 2 +- .../java/calculator/CalculatorServiceImpl.java | 2 +- .../java2wsdl/generate/TuscanyJava2OMBuilder.java | 2 +- .../tools/java2wsdl/generate/ExampleService.java | 2 +- .../main/resources/RemotableInterfaceTemplate.xsl | 4 +- java/sca/tutorials/store/assets/services/Cart.java | 2 +- .../tutorials/store/assets/services/Catalog.java | 2 +- .../store/assets/services/CurrencyConverter.java | 2 +- .../store/assets/services/FruitsCatalogImpl.java | 6 +- .../store/assets/services/ShoppingCartImpl.java | 4 +- .../sca/tutorials/store/assets/services/Total.java | 2 +- .../assets/services/VegetablesCatalogImpl.java | 2 +- .../assets/services/db/ShoppingCartTableImpl.java | 8 +- .../assets/services/map/FruitsCatalogImpl.java | 6 +- .../assets/services/market/MarketCatalogImpl.java | 4 +- .../assets/services/merger/MergedCatalogImpl.java | 4 +- .../mediation/VegetablesCatalogMediationImpl.java | 4 +- .../store/store-client/client/Shopper.java | 2 +- .../store/store-client/client/ShopperImpl.java | 2 +- .../store/store-client/services/Cart.java | 2 +- .../store/store-client/services/Catalog.java | 2 +- .../store/store-client/services/Total.java | 2 +- java/sca/tutorials/store/store-market/build.xml | 2 +- .../tutorials/store/store-test/client/Shopper.java | 2 +- .../cart-amazon/amazon/cart/AmazonCart.java | 2 +- .../cart-amazon/amazon/cart/AmazonCartImpl.java | 2 +- .../shoppingstore/services/cart/CartService.java | 2 +- .../services/cart/CartServiceImpl.java | 2 +- .../services/proxy/ShoppingStoreService.java | 2 +- .../services/proxy/ShoppingStoreServiceImpl.java | 4 +- .../java/catalog/amazon/AmazonCatalogService.java | 2 +- .../catalog/amazon/AmazonCatalogServiceImpl.java | 6 +- .../main/java/catalog/ebay/EBayCatalogService.java | 2 +- .../java/catalog/ebay/EBayCatalogServiceImpl.java | 4 +- .../store-db/src/main/java/services/Catalog.java | 2 +- .../src/main/java/services/CatalogImpl.java | 4 +- .../src/main/java/services/CurrencyConverter.java | 2 +- .../assembly/component/impl/AServiceImpl.java | 4 +- .../assembly/component/impl/BServiceImpl.java | 4 +- .../assembly/component/ComponentTestCase.java | 2 +- .../assembly/composite/impl/AServiceImpl.java | 4 +- .../assembly/composite/impl/BServiceImpl.java | 4 +- .../assembly/composite/CompositeTestCase.java | 2 +- .../assembly/ctypefile/impl/AServiceImpl.java | 2 +- .../annotations/conversational/B2Service.java | 2 +- .../conversational/impl/AServiceImpl.java | 4 +- .../conversational/impl/B1ServiceImpl.java | 2 +- .../conversational/impl/B2ServiceImpl.java | 4 +- .../conversationattributes/B2Service.java | 2 +- .../conversationattributes/BService.java | 2 +- .../conversationattributes/CService.java | 2 +- .../conversationattributes/impl/AServiceImpl.java | 8 +- .../conversationattributes/impl/B2ServiceImpl.java | 6 +- .../conversationattributes/impl/BServiceImpl.java | 6 +- .../conversationattributes/impl/CServiceImpl.java | 4 +- .../ConversationAttributesAnnotationTestCase.java | 2 +- .../javaapi/annotations/destroy/AService.java | 2 +- .../annotations/destroy/impl/AServiceErr1Impl.java | 4 +- .../annotations/destroy/impl/AServiceErr2Impl.java | 4 +- .../annotations/destroy/impl/AServiceErr3Impl.java | 4 +- .../annotations/destroy/impl/AServiceErr4Impl.java | 4 +- .../annotations/destroy/impl/AServiceImpl.java | 4 +- .../destroy/DestroyAnnotationTestCase.java | 2 +- .../annotations/endsconversation/BService.java | 4 +- .../endsconversation/impl/AServiceImpl.java | 6 +- .../endsconversation/impl/BServiceImpl.java | 8 +- .../endsconversation/EndsConversationTestCase.java | 2 +- .../vtest/javaapi/annotations/init/AService.java | 2 +- .../annotations/init/impl/AServiceErr1Impl.java | 4 +- .../annotations/init/impl/AServiceErr2Impl.java | 4 +- .../annotations/init/impl/AServiceErr3Impl.java | 4 +- .../annotations/init/impl/AServiceErr4Impl.java | 4 +- .../annotations/init/impl/AServiceImpl.java | 8 +- .../annotations/init/InitAnnotationTestCase.java | 2 +- .../vtest/javaapi/annotations/oneway/AService.java | 2 +- .../annotations/oneway/impl/AServiceImpl.java | 4 +- .../annotations/oneway/impl/BServiceImpl.java | 2 +- .../javaapi/annotations/property/BService.java | 2 +- .../annotations/property/impl/AServiceImpl.java | 4 +- .../property/impl/AnotherAServiceImpl.java | 2 +- .../annotations/property/impl/BServiceImpl.java | 2 +- .../annotations/property/impl/CServiceImpl1.java | 8 +- .../annotations/property/impl/CServiceImpl2.java | 8 +- .../annotations/property/impl/CServiceImpl3.java | 8 +- .../annotations/property/impl/CServiceImpl4.java | 8 +- .../annotations/property/impl/CServiceImpl5.java | 8 +- .../annotations/property/impl/CServiceImpl6.java | 8 +- .../javaapi/annotations/reference/BService.java | 2 +- .../annotations/reference/impl/AServiceImpl.java | 4 +- .../reference/impl/AUnannotatedServiceImpl.java | 2 +- .../annotations/reference/impl/BServiceImpl.java | 2 +- .../vtest/javaapi/annotations/scope/DService.java | 2 +- .../vtest/javaapi/annotations/scope/FService.java | 2 +- .../vtest/javaapi/annotations/scope/GService.java | 2 +- .../vtest/javaapi/annotations/scope/HService.java | 2 +- .../vtest/javaapi/annotations/scope/IService.java | 4 +- .../vtest/javaapi/annotations/scope/JService.java | 2 +- .../vtest/javaapi/annotations/scope/KService.java | 2 +- .../vtest/javaapi/annotations/scope/LService.java | 2 +- .../vtest/javaapi/annotations/scope/MService.java | 2 +- .../vtest/javaapi/annotations/scope/NService.java | 2 +- .../vtest/javaapi/annotations/scope/OService.java | 2 +- .../annotations/scope/impl/AServiceImpl.java | 2 +- .../annotations/scope/impl/BServiceImpl.java | 10 +- .../annotations/scope/impl/CServiceImpl.java | 12 +- .../annotations/scope/impl/DServiceImpl.java | 12 +- .../annotations/scope/impl/FServiceImpl.java | 12 +- .../annotations/scope/impl/GServiceImpl.java | 12 +- .../annotations/scope/impl/HServiceImpl.java | 4 +- .../annotations/scope/impl/IServiceImpl.java | 14 +-- .../annotations/scope/impl/JServiceImpl.java | 10 +- .../annotations/scope/impl/KServiceImpl.java | 6 +- .../annotations/scope/impl/LServiceImpl.java | 8 +- .../annotations/scope/impl/MServiceImpl.java | 10 +- .../annotations/scope/impl/NServiceImpl.java | 6 +- .../annotations/scope/impl/OServiceImpl.java | 8 +- .../javaapi/annotations/service/AService.java | 2 +- .../javaapi/annotations/service/HService.java | 2 +- .../javaapi/annotations/service/IService.java | 2 +- .../annotations/service/impl/AServiceImpl.java | 2 +- .../annotations/service/impl/BServiceImpl.java | 4 +- .../annotations/service/impl/DServiceImpl.java | 2 +- .../annotations/service/impl/EServiceImpl.java | 2 +- .../annotations/service/impl/FServiceImpl.java | 6 +- .../annotations/service/impl/FServiceImpl2.java | 2 +- .../annotations/service/impl/GServiceImpl.java | 6 +- .../annotations/service/impl/HServiceImpl.java | 14 +-- .../annotations/service/impl/IServiceImpl.java | 14 +-- .../javaapi/apis/callablereference/AComponent.java | 2 +- .../javaapi/apis/callablereference/BComponent.java | 4 +- .../callablereference/impl/AComponentImpl.java | 16 +-- .../callablereference/impl/BComponentImpl.java | 14 +-- .../javaapi/apis/componentcontext/BService.java | 2 +- .../javaapi/apis/componentcontext/DComponent.java | 2 +- .../apis/componentcontext/impl/AComponentImpl.java | 22 ++-- .../impl/AUnannotatedComponentImpl.java | 22 ++-- .../apis/componentcontext/impl/BComponentImpl.java | 8 +- .../apis/componentcontext/impl/DComponentImpl.java | 2 +- .../componentcontext/ComponentContextTestCase.java | 2 +- .../javaapi/apis/conversation/AComponent.java | 2 +- .../javaapi/apis/conversation/BComponent.java | 4 +- .../apis/conversation/impl/AComponentImpl.java | 18 +-- .../apis/conversation/impl/BComponentImpl.java | 14 +-- .../vtest/javaapi/apis/exception/AComponent.java | 2 +- .../vtest/javaapi/apis/exception/BComponent.java | 2 +- .../vtest/javaapi/apis/exception/CComponent.java | 2 +- .../vtest/javaapi/apis/exception/DComponent.java | 2 +- .../apis/exception/impl/AComponentImpl.java | 24 ++-- .../apis/exception/impl/BComponentImpl.java | 10 +- .../apis/exception/impl/CComponentImpl.java | 12 +- .../apis/exception/impl/DComponentImpl.java | 2 +- .../javaapi/apis/requestcontext/BComponent.java | 2 +- .../apis/requestcontext/impl/AComponentImpl.java | 12 +- .../apis/requestcontext/impl/BComponentImpl.java | 10 +- .../javaapi/apis/servicereference/AComponent.java | 2 +- .../javaapi/apis/servicereference/BComponent.java | 4 +- .../apis/servicereference/impl/AComponentImpl.java | 16 +-- .../apis/servicereference/impl/BComponentImpl.java | 14 +-- .../apis/servicereference/impl/CComponentImpl.java | 6 +- .../conversation/callback/AServiceCallback.java | 4 +- .../javaapi/conversation/callback/BService.java | 6 +- .../conversation/callback/BServiceCallback.java | 4 +- .../javaapi/conversation/callback/CService.java | 6 +- .../callback/accessing/AServiceCallback.java | 4 +- .../conversation/callback/accessing/BService.java | 6 +- .../callback/accessing/impl/AServiceImpl.java | 8 +- .../callback/accessing/impl/BServiceImpl.java | 12 +- .../callback/custom/AServiceCallback.java | 4 +- .../conversation/callback/custom/BService.java | 6 +- .../callback/custom/CustomCallback.java | 4 +- .../callback/custom/impl/AServiceImpl.java | 8 +- .../callback/custom/impl/BServiceImpl.java | 6 +- .../callback/custom/impl/CustomCallbackImpl.java | 2 +- .../conversation/callback/id/AServiceCallback.java | 4 +- .../javaapi/conversation/callback/id/BService.java | 6 +- .../callback/id/impl/AServiceImpl.java | 12 +- .../callback/id/impl/BServiceImpl.java | 12 +- .../conversation/callback/impl/AServiceImpl.java | 8 +- .../conversation/callback/impl/BServiceImpl.java | 10 +- .../conversation/callback/impl/CServiceImpl.java | 6 +- .../callback/local/AServiceCallback.java | 2 +- .../conversation/callback/local/BService.java | 4 +- .../callback/local/BServiceCallback.java | 2 +- .../conversation/callback/local/CService.java | 4 +- .../callback/local/impl/AServiceImpl.java | 8 +- .../callback/local/impl/BServiceImpl.java | 10 +- .../callback/local/impl/CServiceImpl.java | 6 +- .../conversation/callback/mixed/CService.java | 4 +- .../callback/mixed/impl/BServiceImpl.java | 10 +- .../callback/mixed/impl/CServiceImpl.java | 6 +- .../callback/multi/AServiceCallback.java | 4 +- .../callback/multi/AServiceCallback2.java | 4 +- .../conversation/callback/multi/BService.java | 6 +- .../conversation/callback/multi/BService2.java | 6 +- .../callback/multi/impl/AServiceImpl.java | 8 +- .../callback/multi/impl/BServiceImpl.java | 6 +- .../callback/stateless/BServiceCallback.java | 2 +- .../conversation/callback/stateless/CService.java | 6 +- .../callback/stateless/impl/BServiceImpl.java | 10 +- .../callback/stateless/impl/BServiceImpl2.java | 14 +-- .../callback/stateless/impl/BServiceImpl3.java | 10 +- .../callback/stateless/impl/CServiceImpl.java | 6 +- .../conversation/callback/CallbackTestCase.java | 2 +- .../vtest/javaapi/conversation/id/AService.java | 2 +- .../vtest/javaapi/conversation/id/BService.java | 4 +- .../vtest/javaapi/conversation/id/CService.java | 4 +- .../javaapi/conversation/id/impl/AServiceImpl.java | 8 +- .../javaapi/conversation/id/impl/BServiceImpl.java | 8 +- .../javaapi/conversation/id/impl/CServiceImpl.java | 6 +- .../javaapi/conversation/lifetime/AService.java | 2 +- .../conversation/lifetime/AServiceCallback.java | 6 +- .../javaapi/conversation/lifetime/BService.java | 8 +- .../javaapi/conversation/lifetime/CService.java | 4 +- .../javaapi/conversation/lifetime/DService.java | 6 +- .../conversation/lifetime/impl/AServiceImpl.java | 14 +-- .../conversation/lifetime/impl/BServiceImpl.java | 8 +- .../conversation/lifetime/impl/CServiceImpl.java | 4 +- .../conversation/lifetime/impl/DServiceImpl.java | 6 +- .../conversation/lifetime/LifetimeTestCase.java | 2 +- .../javaapi/conversation/parameters/BService.java | 4 +- .../javaapi/conversation/parameters/CService.java | 2 +- .../conversation/parameters/impl/AServiceImpl.java | 6 +- .../conversation/parameters/impl/BServiceImpl.java | 4 +- .../conversation/parameters/impl/CServiceImpl.java | 4 +- .../wsbinding/nowsdl/defaultbinding/AService.java | 2 +- .../wsbinding/nowsdl/defaultbinding/BService.java | 2 +- .../wsbinding/nowsdl/defaultbinding/CService.java | 2 +- .../wsbinding/nowsdl/defaultbinding/DService.java | 2 +- .../nowsdl/defaultbinding/impl/AServiceImpl.java | 4 +- .../nowsdl/defaultbinding/impl/BServiceImpl.java | 2 +- .../nowsdl/defaultbinding/impl/CServiceImpl.java | 2 +- .../nowsdl/defaultbinding/impl/DServiceImpl.java | 4 +- .../nowsdl/multisoapbindings/AService.java | 2 +- .../nowsdl/multisoapbindings/BService.java | 2 +- .../nowsdl/multisoapbindings/CService.java | 2 +- .../nowsdl/multisoapbindings/DService.java | 2 +- .../multisoapbindings/impl/AServiceImpl.java | 4 +- .../multisoapbindings/impl/BServiceImpl.java | 2 +- .../multisoapbindings/impl/CServiceImpl.java | 2 +- .../multisoapbindings/impl/DServiceImpl.java | 4 +- .../vtest/wsbinding/nowsdl/promoted/AService.java | 2 +- .../vtest/wsbinding/nowsdl/promoted/BService.java | 2 +- .../wsbinding/nowsdl/promoted/BServiceSOAP.java | 2 +- .../wsbinding/nowsdl/promoted/BServiceSOAP11.java | 2 +- .../wsbinding/nowsdl/promoted/BServiceSOAP12.java | 2 +- .../vtest/wsbinding/nowsdl/promoted/CService.java | 2 +- .../vtest/wsbinding/nowsdl/promoted/DService.java | 2 +- .../nowsdl/promoted/impl/AServiceImpl.java | 4 +- .../nowsdl/promoted/impl/BServiceImpl.java | 2 +- .../nowsdl/promoted/impl/BServiceSOAP11Impl.java | 2 +- .../nowsdl/promoted/impl/BServiceSOAP12Impl.java | 2 +- .../nowsdl/promoted/impl/BServiceSOAPImpl.java | 2 +- .../nowsdl/promoted/impl/CServiceImpl.java | 2 +- .../nowsdl/promoted/impl/DServiceImpl.java | 4 +- .../wsbinding/nowsdl/soapversion/AService.java | 2 +- .../wsbinding/nowsdl/soapversion/BService.java | 2 +- .../wsbinding/nowsdl/soapversion/BServiceSOAP.java | 2 +- .../nowsdl/soapversion/BServiceSOAP11.java | 2 +- .../nowsdl/soapversion/BServiceSOAP12.java | 2 +- .../wsbinding/nowsdl/soapversion/CService.java | 2 +- .../wsbinding/nowsdl/soapversion/DService.java | 2 +- .../nowsdl/soapversion/impl/AServiceImpl.java | 4 +- .../nowsdl/soapversion/impl/BServiceImpl.java | 2 +- .../soapversion/impl/BServiceSOAP11Impl.java | 2 +- .../soapversion/impl/BServiceSOAP12Impl.java | 2 +- .../nowsdl/soapversion/impl/BServiceSOAPImpl.java | 2 +- .../nowsdl/soapversion/impl/CServiceImpl.java | 2 +- .../nowsdl/soapversion/impl/DServiceImpl.java | 4 +- .../sca/vtest/wsbinding/AClientService.java | 2 +- .../tuscany/sca/vtest/wsbinding/AService.java | 2 +- .../vtest/wsbinding/impl/AClientServiceImpl.java | 4 +- .../sca/vtest/wsbinding/impl/AServiceImpl.java | 2 +- .../wsbinding/wsdlelement/binding/AService.java | 2 +- .../wsbinding/wsdlelement/binding/BService.java | 2 +- .../wsbinding/wsdlelement/binding/BService2.java | 2 +- .../wsbinding/wsdlelement/binding/CService.java | 2 +- .../wsbinding/wsdlelement/binding/DService.java | 2 +- .../wsdlelement/binding/impl/AServiceImpl.java | 4 +- .../wsdlelement/binding/impl/BService2Impl.java | 2 +- .../wsdlelement/binding/impl/BServiceImpl.java | 2 +- .../wsdlelement/binding/impl/CServiceImpl.java | 2 +- .../wsdlelement/binding/impl/DServiceImpl.java | 4 +- .../vtest/wsbinding/wsdlelement/port/AService.java | 2 +- .../vtest/wsbinding/wsdlelement/port/BService.java | 2 +- .../wsbinding/wsdlelement/port/BService2.java | 2 +- .../vtest/wsbinding/wsdlelement/port/CService.java | 2 +- .../vtest/wsbinding/wsdlelement/port/DService.java | 2 +- .../wsdlelement/port/impl/AServiceImpl.java | 4 +- .../wsdlelement/port/impl/BService2Impl.java | 2 +- .../wsdlelement/port/impl/BServiceImpl.java | 2 +- .../wsdlelement/port/impl/CServiceImpl.java | 2 +- .../wsdlelement/port/impl/DServiceImpl.java | 4 +- .../wsbinding/wsdlelement/service/AService.java | 2 +- .../wsbinding/wsdlelement/service/BService.java | 2 +- .../wsbinding/wsdlelement/service/BService2.java | 2 +- .../wsbinding/wsdlelement/service/CService.java | 2 +- .../wsbinding/wsdlelement/service/DService.java | 2 +- .../wsdlelement/service/impl/AServiceImpl.java | 4 +- .../wsdlelement/service/impl/BService2Impl.java | 2 +- .../wsdlelement/service/impl/BServiceImpl.java | 2 +- .../wsdlelement/service/impl/CServiceImpl.java | 2 +- .../wsdlelement/service/impl/DServiceImpl.java | 4 +- 1729 files changed, 4656 insertions(+), 4656 deletions(-) create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/CallableReference.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Conversation.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ConversationEndedException.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/NoRegisteredCallbackException.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationAttributes.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationID.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Conversational.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EndsConversation.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java create mode 100644 java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/Constants.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java delete mode 100644 java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java (limited to 'java/sca') diff --git a/java/sca/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java b/java/sca/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java index 7356cd0d2a..81ec1ddad3 100644 --- a/java/sca/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java +++ b/java/sca/contrib/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/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java b/java/sca/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java index cc351442e7..455eef81cd 100644 --- a/java/sca/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java +++ b/java/sca/contrib/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/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java b/java/sca/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java index 7219a3395b..84232aa3af 100644 --- a/java/sca/contrib/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java +++ b/java/sca/contrib/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/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java b/java/sca/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java index 3e5705b14c..0aefce608b 100644 --- a/java/sca/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java b/java/sca/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java index db66b00a50..222dc3e394 100644 --- a/java/sca/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java b/java/sca/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java index 5d5953aaaa..41257d9a7f 100644 --- a/java/sca/contrib/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java b/java/sca/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java index 1577184b48..9ad63fa569 100644 --- a/java/sca/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java +++ b/java/sca/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/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/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java b/java/sca/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java index 0465dbe7e9..e800a87aef 100644 --- a/java/sca/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java +++ b/java/sca/contrib/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/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/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java b/java/sca/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java index d41dbd0a0f..c7c0f90710 100644 --- a/java/sca/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java +++ b/java/sca/contrib/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/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java b/java/sca/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java index d34cfe1b16..119282adb9 100644 --- a/java/sca/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java +++ b/java/sca/contrib/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/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java b/java/sca/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java index b699a02d1d..72f7dc9e43 100644 --- a/java/sca/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java +++ b/java/sca/contrib/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/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java b/java/sca/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java index 5e7d6761d9..651c967aad 100644 --- a/java/sca/contrib/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java +++ b/java/sca/contrib/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/contrib/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java b/java/sca/contrib/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java index 28dafedaeb..337bb004b5 100644 --- a/java/sca/contrib/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java +++ b/java/sca/contrib/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/contrib/modules/binding-ejb-runtime/src/test/java/account/Customer.java b/java/sca/contrib/modules/binding-ejb-runtime/src/test/java/account/Customer.java index 49ece71f7a..8585301868 100644 --- a/java/sca/contrib/modules/binding-ejb-runtime/src/test/java/account/Customer.java +++ b/java/sca/contrib/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/contrib/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java b/java/sca/contrib/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java index 3d3f785a50..7406b9bd37 100644 --- a/java/sca/contrib/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java b/java/sca/contrib/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java index 30068afa0a..61a133859b 100644 --- a/java/sca/contrib/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java +++ b/java/sca/contrib/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.feed.collection; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; import com.sun.syndication.feed.atom.Entry; diff --git a/java/sca/contrib/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java b/java/sca/contrib/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java index 39a4213a65..72365c8a29 100644 --- a/java/sca/contrib/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java +++ b/java/sca/contrib/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.binding.feed.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/contrib/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java b/java/sca/contrib/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java index 45b35d9206..45e332c366 100644 --- a/java/sca/contrib/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java +++ b/java/sca/contrib/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java @@ -32,7 +32,7 @@ import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.invocation.DataExchangeSemantics; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; import com.sun.syndication.feed.atom.Entry; import com.sun.syndication.feed.atom.Feed; diff --git a/java/sca/contrib/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java b/java/sca/contrib/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java index 884e954036..ff15ea7c2a 100644 --- a/java/sca/contrib/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java +++ b/java/sca/contrib/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.tuscany.sca.binding.feed.collection.Collection; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.sun.syndication.feed.atom.Content; import com.sun.syndication.feed.atom.Entry; diff --git a/java/sca/contrib/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java b/java/sca/contrib/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java index ca4a5a1946..7f65ca3c92 100644 --- a/java/sca/contrib/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java +++ b/java/sca/contrib/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.UUID; import org.apache.tuscany.sca.binding.feed.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.atom.Entry; diff --git a/java/sca/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java b/java/sca/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java index 8bff8631a6..b2a76196b4 100644 --- a/java/sca/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java +++ b/java/sca/contrib/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/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java b/java/sca/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java index 699e9f0172..86851ef6d8 100644 --- a/java/sca/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java +++ b/java/sca/contrib/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/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java b/java/sca/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java index 9575b2ebd0..27e290b97b 100644 --- a/java/sca/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java +++ b/java/sca/contrib/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java @@ -32,7 +32,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/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java b/java/sca/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java index a2b1da894d..488bfa0f71 100644 --- a/java/sca/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java b/java/sca/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java index 3c11fb70b9..e283b6e023 100644 --- a/java/sca/contrib/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java b/java/sca/contrib/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java index 2679071ea8..e7db6fdab5 100644 --- a/java/sca/contrib/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java +++ b/java/sca/contrib/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java @@ -22,7 +22,7 @@ import com.google.gdata.data.BaseEntry; import com.google.gdata.data.BaseFeed; import org.apache.tuscany.sca.implementation.data.collection.NotFoundException; -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/contrib/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java b/java/sca/contrib/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java index b9252d097a..7dacc4c170 100644 --- a/java/sca/contrib/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java +++ b/java/sca/contrib/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.binding.gdata.collection; import com.google.gdata.data.BaseEntry; import java.io.InputStream; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; import org.apache.tuscany.sca.implementation.data.collection.NotFoundException; diff --git a/java/sca/contrib/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java b/java/sca/contrib/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java index d2c5ed4017..96111013a7 100644 --- a/java/sca/contrib/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java +++ b/java/sca/contrib/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; 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; import com.google.gdata.client.GoogleService; import com.google.gdata.client.Query; diff --git a/java/sca/contrib/modules/binding-gdata2-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java b/java/sca/contrib/modules/binding-gdata2-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java index 8da6977c2c..5f384290ad 100644 --- a/java/sca/contrib/modules/binding-gdata2-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java +++ b/java/sca/contrib/modules/binding-gdata2-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java @@ -22,7 +22,7 @@ import com.google.gdata.data.BaseEntry; import com.google.gdata.data.BaseFeed; import org.apache.tuscany.sca.binding.gdata.collection.Collection; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class CalendarConsumerImpl { diff --git a/java/sca/contrib/modules/binding-gdata2-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerClientImpl.java b/java/sca/contrib/modules/binding-gdata2-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerClientImpl.java index d6261618bf..cbc7ef0657 100644 --- a/java/sca/contrib/modules/binding-gdata2-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerClientImpl.java +++ b/java/sca/contrib/modules/binding-gdata2-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerClientImpl.java @@ -29,8 +29,8 @@ import com.google.gdata.data.Source; import com.google.gdata.data.extensions.EventEntry; import com.google.gdata.data.extensions.When; import org.apache.tuscany.sca.binding.gdata.collection.Collection; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; @Scope("COMPOSITE") public class CustomerClientImpl implements CustomerClient { diff --git a/java/sca/contrib/modules/binding-gdata2-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java b/java/sca/contrib/modules/binding-gdata2-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java index 8233d01dd9..f57f2e14c9 100644 --- a/java/sca/contrib/modules/binding-gdata2-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java +++ b/java/sca/contrib/modules/binding-gdata2-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java @@ -32,7 +32,7 @@ import java.util.TimeZone; import java.util.UUID; import org.apache.tuscany.sca.binding.gdata.collection.Collection; import org.apache.tuscany.sca.implementation.data.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/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java b/java/sca/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java index ed846c1127..9dbd6724b0 100644 --- a/java/sca/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java b/java/sca/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java index 11945c8cd1..90cca27655 100644 --- a/java/sca/contrib/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java b/java/sca/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java index 2fcb07a07f..14236783ca 100644 --- a/java/sca/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java +++ b/java/sca/contrib/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.impl.JMSBinding; import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants; import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Base MessageProcessor for the JMSBinding. diff --git a/java/sca/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java b/java/sca/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java index 9c5fba5de6..4a9d9a6f4b 100644 --- a/java/sca/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java +++ b/java/sca/contrib/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/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java b/java/sca/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java index b78f1f2044..33d4366fe6 100644 --- a/java/sca/contrib/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java +++ b/java/sca/contrib/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/contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/java/sca/contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java index fb80362457..a3a2f0bf1e 100644 --- a/java/sca/contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/java/sca/contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java index 515da3144a..d68270f7df 100644 --- a/java/sca/contrib/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java +++ b/java/sca/contrib/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/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java b/java/sca/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java index c0d0415f91..37a598e1ac 100644 --- a/java/sca/contrib/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java +++ b/java/sca/contrib/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/contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java b/java/sca/contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java index ba87f22cf6..c46e5698d1 100644 --- a/java/sca/contrib/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java +++ b/java/sca/contrib/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/contrib/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java b/java/sca/contrib/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java index d09ea1f903..1250dae9b3 100644 --- a/java/sca/contrib/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java +++ b/java/sca/contrib/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java @@ -31,7 +31,7 @@ import org.apache.tuscany.sca.invocation.Invoker; 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; /** * InvokerFactory that creates RMIReferenceInvoker instances for the diff --git a/java/sca/contrib/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java b/java/sca/contrib/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java index 5d829162d9..45ac171ba4 100644 --- a/java/sca/contrib/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java +++ b/java/sca/contrib/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/contrib/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java b/java/sca/contrib/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java index 0a1f4283db..cd7a0fd625 100644 --- a/java/sca/contrib/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java b/java/sca/contrib/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java index 5b20d17c83..89ea795529 100644 --- a/java/sca/contrib/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java b/java/sca/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java index bb8dab391b..1124348158 100644 --- a/java/sca/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java +++ b/java/sca/contrib/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/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java b/java/sca/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java index 2213b50b53..a2b83465da 100644 --- a/java/sca/contrib/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java +++ b/java/sca/contrib/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/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java b/java/sca/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java index e71156c379..a80f721136 100644 --- a/java/sca/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java b/java/sca/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java index d45be65e20..505a9cdee3 100644 --- a/java/sca/contrib/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java b/java/sca/contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java index e4bb708a01..88a4b63637 100644 --- a/java/sca/contrib/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java index 2d2a23d7df..4be4c362ab 100644 --- a/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java +++ b/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java @@ -24,7 +24,7 @@ import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; 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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java b/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java index e788526069..1849479ed2 100644 --- a/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java +++ b/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java @@ -42,8 +42,8 @@ import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentContext; 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; /** * The very minimum node implementation to get these tests going without creating a dependency on diff --git a/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java index 1a2788ac74..0de092052f 100644 --- a/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java index a83fcb3069..5b2f73f9e2 100644 --- a/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java index c41548ec51..f4c4354a39 100644 --- a/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java index 62d61e4fff..2cec5893a9 100644 --- a/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java index 2dcc8cc64b..f4029e0ad5 100644 --- a/java/sca/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/java/sca/contrib/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/contrib/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java b/java/sca/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java index 32d5650f37..5816ff1c4c 100644 --- a/java/sca/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java b/java/sca/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java index 6e74686b61..5ad74ec0bd 100644 --- a/java/sca/contrib/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java +++ b/java/sca/contrib/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/contrib/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java b/java/sca/contrib/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java index 850fd77e96..c1afb233cb 100644 --- a/java/sca/contrib/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java +++ b/java/sca/contrib/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java @@ -38,7 +38,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/contrib/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java b/java/sca/contrib/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/contrib/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java b/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java index c7eb2b7794..0dc209f072 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java b/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java index 958d4aa41d..1ff938d727 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java b/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java index 5b26290732..1f975ee08b 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java b/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java index 0d3916019f..5c3be5839f 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java +++ b/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java @@ -84,7 +84,7 @@ import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeComponentService; 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/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java b/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java index d467e0b3c8..64e49e0b0d 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java index e82dd64ba5..8a04a30a3e 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java +++ b/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java @@ -106,7 +106,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/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java b/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java index 4c18c89353..3028a86714 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java +++ b/java/sca/contrib/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.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/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java b/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java index 4e7c1b0539..40d769d83a 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java b/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java index 6fccbcfd00..4e1e7dbdad 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java b/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java index 5e1a4cf259..3e96480c20 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java b/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java index f474c12af3..3ac30780b3 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java b/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java index 88705c1a95..0dd6e90c72 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java b/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java index 274f6c8d28..13a16c8e8a 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java b/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java index bf371430a1..0e50781061 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java b/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java index d1cbfb88fd..82f61bd7c2 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java b/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java index 5efbedba4c..f20b82226e 100644 --- a/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java +++ b/java/sca/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java @@ -27,7 +27,7 @@ import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMText; import org.apache.tuscany.sca.host.embedded.SCADomain; -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/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java b/java/sca/contrib/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/contrib/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java b/java/sca/contrib/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java index bf9e22f645..1a9b26d618 100644 --- a/java/sca/contrib/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java +++ b/java/sca/contrib/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/contrib/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java b/java/sca/contrib/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java index e474c7a318..6890c238f3 100644 --- a/java/sca/contrib/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java +++ b/java/sca/contrib/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java @@ -41,7 +41,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/contrib/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java b/java/sca/contrib/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java index 9635d65f99..5278a55d8a 100644 --- a/java/sca/contrib/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java +++ b/java/sca/contrib/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/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java b/java/sca/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java index 0eb7fb692b..9730203648 100644 --- a/java/sca/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java +++ b/java/sca/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.contribution.updater.impl; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface GreetService { diff --git a/java/sca/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java b/java/sca/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java index 38fa2721bb..758cfa9b71 100644 --- a/java/sca/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java +++ b/java/sca/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.contribution.updater.impl; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(GreetService.class) public class HelloComponent implements GreetService { diff --git a/java/sca/contrib/modules/core-databinding/META-INF/MANIFEST.MF b/java/sca/contrib/modules/core-databinding/META-INF/MANIFEST.MF index 89bb372230..230ab14373 100644 --- a/java/sca/contrib/modules/core-databinding/META-INF/MANIFEST.MF +++ b/java/sca/contrib/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", org.apache.tuscany.sca.xsd;version="2.0", - org.osoa.sca;version="2.0", - org.osoa.sca.annotations;version="2.0", + org.oasisopen.sca;version="2.0", + org.oasisopen.sca.annotation;version="2.0", org.w3c.dom;resolution:=optional Bundle-SymbolicName: org.apache.tuscany.sca.core.databinding Bundle-DocURL: http://www.apache.org/ diff --git a/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java b/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java index 2056789089..78f4abd1f6 100644 --- a/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java +++ b/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java @@ -42,7 +42,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/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java b/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java index 38ca2cd10c..427e0b254a 100644 --- a/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java +++ b/java/sca/contrib/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/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java b/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java index 124928db24..1c132acbfc 100644 --- a/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java +++ b/java/sca/contrib/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 implements PullTransformer { diff --git a/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java b/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java index 8733b91cd4..97e16da273 100644 --- a/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java +++ b/java/sca/contrib/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/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java b/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java index ff6e444dcd..fcdefb9a2e 100644 --- a/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java +++ b/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java @@ -31,7 +31,7 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.apache.tuscany.sca.databinding.xml.XMLStreamReader2String; -import org.osoa.sca.CallableReference; +import org.oasisopen.sca.CallableReference; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java index fb5f939edb..b05f0cc238 100644 --- a/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java +++ b/java/sca/contrib/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/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java index 8d586905c4..d5ba528475 100644 --- a/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java +++ b/java/sca/contrib/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/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java b/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java index 841efa9398..a8e3004c62 100644 --- a/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java +++ b/java/sca/contrib/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 diff --git a/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java index 5814f3d215..20dcb1b94a 100644 --- a/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java +++ b/java/sca/contrib/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/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java b/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java index 3586f54d71..1ff8d86f45 100644 --- a/java/sca/contrib/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java +++ b/java/sca/contrib/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/contrib/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java b/java/sca/contrib/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java index b0c39e18ef..3c1e48b1fc 100644 --- a/java/sca/contrib/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java +++ b/java/sca/contrib/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java @@ -31,7 +31,7 @@ import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; 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.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; import org.w3c.dom.Node; /** diff --git a/java/sca/contrib/modules/core-spi/META-INF/MANIFEST.MF b/java/sca/contrib/modules/core-spi/META-INF/MANIFEST.MF index eb09b93bf5..0a7f57f09a 100644 --- a/java/sca/contrib/modules/core-spi/META-INF/MANIFEST.MF +++ b/java/sca/contrib/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", 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",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",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", org.apache.tuscany.sca.runtime;version="2.0", org.apache.tuscany.sca.work;version="2.0", - org.osoa.sca;version="2.0" + org.oasisopen.sca;version="2.0" Bundle-SymbolicName: org.apache.tuscany.sca.core.spi Bundle-DocURL: http://www.apache.org/ diff --git a/java/sca/contrib/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/java/sca/contrib/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java index ed4b57639c..d4d9ce83ae 100644 --- a/java/sca/contrib/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java +++ b/java/sca/contrib/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/contrib/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/java/sca/contrib/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java index 546757c766..b363852df9 100644 --- a/java/sca/contrib/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java +++ b/java/sca/contrib/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.context; -import org.osoa.sca.RequestContext; +import org.oasisopen.sca.RequestContext; /** * Interface implemented by the provider of the RequestContext. diff --git a/java/sca/contrib/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/java/sca/contrib/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java index 801bb9e294..ee7ae468b8 100644 --- a/java/sca/contrib/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java +++ b/java/sca/contrib/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java @@ -25,9 +25,9 @@ import java.io.Writer; import org.apache.tuscany.sca.assembly.Binding; import org.apache.tuscany.sca.assembly.ComponentService; -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/contrib/modules/core-spring/src/test/java/calculator/AddServiceImpl.java b/java/sca/contrib/modules/core-spring/src/test/java/calculator/AddServiceImpl.java index 61654ea811..7ea5a32668 100644 --- a/java/sca/contrib/modules/core-spring/src/test/java/calculator/AddServiceImpl.java +++ b/java/sca/contrib/modules/core-spring/src/test/java/calculator/AddServiceImpl.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.EagerInit; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.EagerInit; +import org.oasisopen.sca.annotation.Scope; /** * An implementation of the Add service diff --git a/java/sca/contrib/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java index c1fceb575d..9f64dc8bca 100644 --- a/java/sca/contrib/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/contrib/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; /** * An implementation of the Calculator service. diff --git a/java/sca/contrib/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java b/java/sca/contrib/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java index e1f35f99b5..f5b8ff5be0 100644 --- a/java/sca/contrib/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java +++ b/java/sca/contrib/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** * An implementation of the Divide service. diff --git a/java/sca/contrib/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java b/java/sca/contrib/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java index d621407908..d146d23153 100644 --- a/java/sca/contrib/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java +++ b/java/sca/contrib/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** * An implementation of the Multiply service. diff --git a/java/sca/contrib/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java b/java/sca/contrib/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java index 4fed0a8c6a..ffe09c3dde 100644 --- a/java/sca/contrib/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java +++ b/java/sca/contrib/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** * An implementation of the subtract service. diff --git a/java/sca/contrib/modules/core/META-INF/MANIFEST.MF b/java/sca/contrib/modules/core/META-INF/MANIFEST.MF index 2cdef013e6..40e4bf6afb 100644 --- a/java/sca/contrib/modules/core/META-INF/MANIFEST.MF +++ b/java/sca/contrib/modules/core/META-INF/MANIFEST.MF @@ -5,12 +5,12 @@ Export-Package: org.apache.tuscany.sca.core.assembly;uses:="org.apache .sca.assembly.impl,org.apache.tuscany.sca.core,org.apache.tuscany.sca .core.conversation,javax.xml.namespace,javax.xml.stream,org.apache.tu scany.sca.endpointresolver,org.apache.tuscany.sca.contribution.resolv - er,org.apache.tuscany.sca.core.invocation,org.osoa.sca,org.apache.tus + er,org.apache.tuscany.sca.core.invocation,org.oasisopen.sca,org.apache.tus cany.sca.core.scope,org.apache.tuscany.sca.assembly,org.apache.tuscan y.sca.monitor,org.apache.tuscany.sca.interfacedef.java,org.apache.tus cany.sca.interfacedef,org.apache.tuscany.sca.invocation,org.apache.tu scany.sca.work,org.apache.tuscany.sca.contribution.processor";version - ="2.0",org.apache.tuscany.sca.core.work;uses:="javax.naming,org.osoa. + ="2.0",org.apache.tuscany.sca.core.work;uses:="javax.naming,org.oasisopen. sca.annotations,commonj.work,org.apache.tuscany.sca.work";version="1. 4",org.apache.tuscany.sca.core.context;uses:="org.apache.tuscany.sca. runtime,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.contex @@ -19,7 +19,7 @@ Export-Package: org.apache.tuscany.sca.core.assembly;uses:="org.apache .apache.tuscany.sca.interfacedef,javax.xml.namespace,org.apache.tusca ny.sca.invocation,javax.xml.stream,org.apache.tuscany.sca.core.assemb ly,org.apache.tuscany.sca.core.factory,org.apache.tuscany.sca.contrib - ution.processor,org.osoa.sca,org.apache.tuscany.sca.core.invocation,o + ution.processor,org.oasisopen.sca,org.apache.tuscany.sca.core.invocation,o rg.apache.tuscany.sca.core.scope,org.apache.tuscany.sca.assembly.buil der";version="2.0",org.apache.tuscany.sca.core.factory;version="2.0", org.apache.tuscany.sca.core.invocation;uses:="org.apache.tuscany.sca. @@ -30,9 +30,9 @@ Export-Package: org.apache.tuscany.sca.core.assembly;uses:="org.apache a,org.apache.tuscany.sca.extensibility,org.apache.tuscany.sca.interfa cedef,org.apache.tuscany.sca.invocation,org.apache.tuscany.sca.core.a ssembly,org.apache.tuscany.sca.work,org.apache.tuscany.sca.core.facto - ry,org.osoa.sca,org.apache.tuscany.sca.core.scope";version="2.0",org. + ry,org.oasisopen.sca,org.apache.tuscany.sca.core.scope";version="2.0",org. apache.tuscany.sca.core.conversation;uses:="org.apache.tuscany.sca.ru - ntime,org.apache.tuscany.sca.provider,org.osoa.sca,org.apache.tuscany + ntime,org.apache.tuscany.sca.provider,org.oasisopen.sca,org.apache.tuscany .sca.core.scope";version="2.0",org.apache.tuscany.sca.core.scope;uses :="org.apache.tuscany.sca.invocation,org.apache.tuscany.sca.runtime,o rg.apache.tuscany.sca.provider,org.apache.tuscany.sca.core.context,or @@ -82,8 +82,8 @@ Import-Package: commonj.work, org.apache.tuscany.sca.runtime;version="2.0", org.apache.tuscany.sca.work;version="2.0", - org.osoa.sca;version="2.0", - org.osoa.sca.annotations;version="2.0" + org.oasisopen.sca;version="2.0", + org.oasisopen.sca.annotation;version="2.0" Bundle-SymbolicName: org.apache.tuscany.sca.core Bundle-DocURL: http://www.apache.org/ diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java index 4f463b105d..8fc3b629bf 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java @@ -35,7 +35,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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java index af5230a163..1f2ffa2ae6 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java index b6f949f081..133037a5c1 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java @@ -57,7 +57,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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java index fc6d7abf6a..bcc8b91569 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java @@ -55,9 +55,9 @@ 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.Conversation; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.Conversation; +import org.oasisopen.sca.ServiceRuntimeException; /** * Base class for implementations of service and callback references. diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java index 78b0887482..30808bff0f 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java @@ -57,7 +57,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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java index 2bcf13f679..a939d6d5da 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java @@ -48,10 +48,10 @@ import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentContext; 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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java index c5b68389b2..1d1539c9ed 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.invocation.ProxyFactory; import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; 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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java index ed6c3df8fa..3459aba2ff 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java @@ -33,8 +33,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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java index 1d178421cf..1ee09598f5 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java @@ -29,8 +29,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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java index 03c18c26b8..77064bd8e8 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java index 588c43b8b1..8a54b7568f 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java +++ b/java/sca/contrib/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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java index d19aa237cd..1ee922144f 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java +++ b/java/sca/contrib/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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java index b5b40811ad..c07fd443e5 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java @@ -23,7 +23,7 @@ import java.util.List; import org.apache.tuscany.sca.core.factory.ObjectCreationException; import org.apache.tuscany.sca.core.factory.ObjectFactory; 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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java index 0fa1d27d2a..0afc9122de 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java @@ -34,8 +34,8 @@ import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl; 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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java index fcb48259b9..e20cfff007 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java @@ -22,12 +22,12 @@ package org.apache.tuscany.sca.core.invocation; import java.util.List; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.CallableReference; +import org.oasisopen.sca.CallableReference; /** * An extensible proxy factory. * - * @version $Rev: $ $Date: $ + * @version $Rev$ $Date$ */ public class ExtensibleProxyFactory implements ProxyFactory { diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java index cade0499d3..cf4de5874f 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/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.

TODO cache diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java index a23b9af9ad..c9d38cb2b7 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java @@ -53,10 +53,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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java index a2cbd1365b..e21d7cba0c 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java @@ -30,8 +30,8 @@ import org.apache.tuscany.sca.core.context.ServiceReferenceImpl; 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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java index 582d1ee141..92d6d25d46 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java +++ b/java/sca/contrib/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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java index a3c8429c7b..8ee425fe9f 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java index cb836e42c1..af9d44e473 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.core.invocation; import java.util.List; 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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java index 925a7c10a5..d3a6b20fb8 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java +++ b/java/sca/contrib/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/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java index 5b838116c5..62fbbe4616 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java @@ -32,11 +32,11 @@ import org.apache.tuscany.sca.store.Store; import org.apache.tuscany.sca.store.StoreExpirationEvent; import org.apache.tuscany.sca.store.StoreMonitor; import org.apache.tuscany.sca.store.StoreWriteException; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.EagerInit; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.EagerInit; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; /** * Implements a non-durable, non-transactional store using a simple in-memory map diff --git a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java index fb47a65edf..bfc34479ae 100644 --- a/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java +++ b/java/sca/contrib/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java @@ -27,7 +27,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ThreadFactory; -import org.osoa.sca.annotations.Destroy; +import org.oasisopen.sca.annotation.Destroy; import commonj.work.Work; import commonj.work.WorkEvent; diff --git a/java/sca/contrib/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java b/java/sca/contrib/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java index 1aba9656d8..f960c8ebb1 100644 --- a/java/sca/contrib/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java +++ b/java/sca/contrib/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.core.invocation.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/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java b/java/sca/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java index f559d5d914..f1841c975e 100644 --- a/java/sca/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java +++ b/java/sca/contrib/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/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java b/java/sca/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java index c30bbc771a..229b29f5cd 100644 --- a/java/sca/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java +++ b/java/sca/contrib/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/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java b/java/sca/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java index c2332ae2c9..4be90b6808 100644 --- a/java/sca/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java +++ b/java/sca/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.implementation.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/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java b/java/sca/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java index 757152725d..9060399dc3 100644 --- a/java/sca/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java +++ b/java/sca/contrib/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.implementation.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/contrib/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/java/sca/contrib/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer index a1f18f9638..9c2357d4f4 100644 --- a/java/sca/contrib/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer +++ b/java/sca/contrib/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/contrib/modules/databinding-jaxb/META-INF/MANIFEST.MF b/java/sca/contrib/modules/databinding-jaxb/META-INF/MANIFEST.MF index e39c9eecd8..f1bb306cf3 100644 --- a/java/sca/contrib/modules/databinding-jaxb/META-INF/MANIFEST.MF +++ b/java/sca/contrib/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 @@ -45,7 +45,7 @@ Import-Package: javax.activation, org.apache.tuscany.sca.xsd;version="2.0", org.apache.ws.commons.schema.resolver, - org.osoa.sca;version="2.0", + org.oasisopen.sca;version="2.0", org.w3c.dom, org.xml.sax Bundle-SymbolicName: org.apache.tuscany.sca.databinding.jaxb diff --git a/java/sca/contrib/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java b/java/sca/contrib/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java index 003b4fb992..35adffe23b 100644 --- a/java/sca/contrib/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java +++ b/java/sca/contrib/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/contrib/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java b/java/sca/contrib/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java index 8805d72627..556f784102 100644 --- a/java/sca/contrib/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java +++ b/java/sca/contrib/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 acesss to a bean property. Values can be queried/changed using the diff --git a/java/sca/contrib/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java b/java/sca/contrib/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java index a60a882801..097be3ef6c 100644 --- a/java/sca/contrib/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java +++ b/java/sca/contrib/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java @@ -46,7 +46,7 @@ import org.apache.tuscany.sca.interfacedef.util.XMLType; import org.apache.tuscany.sca.xsd.XSDFactory; import org.apache.tuscany.sca.xsd.XSDefinition; import org.apache.ws.commons.schema.resolver.URIResolver; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; import org.w3c.dom.Document; import org.xml.sax.InputSource; diff --git a/java/sca/contrib/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java b/java/sca/contrib/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java index f83c7f09d9..7473a8e56e 100644 --- a/java/sca/contrib/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java +++ b/java/sca/contrib/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/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java b/java/sca/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java index 1072b70029..fb02d27b05 100644 --- a/java/sca/contrib/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java +++ b/java/sca/contrib/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/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java b/java/sca/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java index c1978883df..0927f87f3b 100644 --- a/java/sca/contrib/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java +++ b/java/sca/contrib/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/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java b/java/sca/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java index 15616979c2..4e557522fe 100644 --- a/java/sca/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java +++ b/java/sca/contrib/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/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java b/java/sca/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java index c820d9d250..9620d38eaf 100644 --- a/java/sca/contrib/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java +++ b/java/sca/contrib/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/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java index 0e25068f5f..65959645ae 100644 --- a/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java +++ b/java/sca/contrib/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/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java index 09bb05cf87..7522b5dce2 100644 --- a/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java +++ b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java @@ -86,10 +86,10 @@ import org.apache.tuscany.sca.workspace.WorkspaceFactory; import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder; import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl; import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor; -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/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java index 9e024d2d6b..1ab411ecd2 100644 --- a/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java +++ b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java @@ -68,10 +68,10 @@ import org.apache.tuscany.sca.domain.manager.impl.CompositeGeneratorServiceImpl. import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor; -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/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java index 0b304a0854..3c3c84c32b 100644 --- a/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java +++ b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java @@ -83,12 +83,12 @@ import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder; import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl; 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/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java index a4d7680cb0..46652984b9 100644 --- a/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java +++ b/java/sca/contrib/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/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java index e66a8b6684..7683e788fe 100644 --- a/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java +++ b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java @@ -72,10 +72,10 @@ import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder; import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl; import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor; -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/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java index 14ab9579f4..d36bf77c96 100644 --- a/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java +++ b/java/sca/contrib/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/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java index e95a0cc585..461556ab27 100644 --- a/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java +++ b/java/sca/contrib/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/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java index a5ce6e12d6..21c7cd4383 100644 --- a/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java +++ b/java/sca/contrib/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/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java index fee1efc37a..644ebd86d0 100644 --- a/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java +++ b/java/sca/contrib/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/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java index a53250515a..22eff61840 100644 --- a/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java +++ b/java/sca/contrib/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/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java index 2adb623876..7881217436 100644 --- a/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java +++ b/java/sca/contrib/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/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java index 06d28b0502..695f25f480 100644 --- a/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java +++ b/java/sca/contrib/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/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java index d68cfa3786..9a47d98ee9 100644 --- a/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java +++ b/java/sca/contrib/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/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java b/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java index 23c506446f..f7ae597c52 100644 --- a/java/sca/contrib/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java +++ b/java/sca/contrib/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/contrib/modules/endpoint/META-INF/MANIFEST.MF b/java/sca/contrib/modules/endpoint/META-INF/MANIFEST.MF index 1d40e24c71..6cb674013f 100644 --- a/java/sca/contrib/modules/endpoint/META-INF/MANIFEST.MF +++ b/java/sca/contrib/modules/endpoint/META-INF/MANIFEST.MF @@ -25,7 +25,7 @@ Import-Package: javax.xml.stream;resolution:=optional, org.apache.tuscany.sca.interfacedef;version="2.0";resolution:=optional, org.apache.tuscany.sca.monitor;version="2.0";resolution:=optional, org.apache.tuscany.sca.policy;version="2.0";resolution:=optional, - org.osoa.sca.annotations;version="2.0";resolution:=optional + org.oasisopen.sca.annotation;version="2.0";resolution:=optional Bundle-SymbolicName: org.apache.tuscany.sca.endpoint Bundle-DocURL: http://www.apache.org/ diff --git a/java/sca/contrib/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java index 3d861f2018..17fad7de6b 100644 --- a/java/sca/contrib/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/contrib/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/contrib/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java b/java/sca/contrib/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java index c91618c24d..4a1ca4c58f 100644 --- a/java/sca/contrib/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java +++ b/java/sca/contrib/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java @@ -50,7 +50,7 @@ import org.apache.tuscany.sca.contribution.service.ContributionWriteException; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.extension.helper.utils.AbstractStAXArtifactProcessor; import org.apache.tuscany.sca.extension.helper.utils.DynamicImplementation; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * An SCDL ArtifactProcessor which uses the Implementation class getters/setters diff --git a/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java b/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java index a7f148cdda..f638eacb5d 100644 --- a/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java +++ b/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java @@ -23,9 +23,9 @@ import java.lang.reflect.Constructor; import org.apache.tuscany.sca.extensibility.ServiceDiscovery; import org.apache.tuscany.sca.host.embedded.impl.DefaultSCADomain; import org.apache.tuscany.sca.host.embedded.management.ComponentManager; -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 handle to an SCA domain. diff --git a/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java b/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java index c9bfe499c6..f6d834cb2e 100644 --- a/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java +++ b/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.host.embedded; import org.apache.tuscany.sca.host.embedded.management.ComponentManager; -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/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java b/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java index 1bca290c27..084f1ff169 100644 --- a/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java +++ b/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java @@ -46,8 +46,8 @@ import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.SCANodeFactory; import org.apache.tuscany.sca.node.impl.NodeImpl; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ServiceReference; /** * A default SCA domain facade implementation. diff --git a/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java b/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java index 519e76d0ae..e9861b4efd 100644 --- a/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java +++ b/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java @@ -44,9 +44,9 @@ import org.apache.tuscany.sca.node.impl.RuntimeBootStrapper; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentContext; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -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; /** * An SCA domain facade implementation. diff --git a/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java b/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java index d59f1544e5..9b74eba08b 100644 --- a/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java +++ b/java/sca/contrib/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java @@ -41,9 +41,9 @@ import org.apache.tuscany.sca.contribution.service.util.FileHelper; import org.apache.tuscany.sca.core.assembly.ActivationException; import org.apache.tuscany.sca.host.embedded.SCADomain; import org.apache.tuscany.sca.host.embedded.management.ComponentManager; -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; /** * An SCADomain that starts a Tuscany runtime supporting multiple diff --git a/java/sca/contrib/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java b/java/sca/contrib/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java index 9252b114a1..1900b12057 100644 --- a/java/sca/contrib/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java +++ b/java/sca/contrib/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java @@ -22,7 +22,7 @@ package org.apache.tuscany.sca.host.embedded; import junit.framework.TestCase; import org.apache.tuscany.sca.host.embedded.test.extension.TestService; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.ServiceReference; diff --git a/java/sca/contrib/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java b/java/sca/contrib/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java index c52c16d8e1..402099a460 100644 --- a/java/sca/contrib/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java +++ b/java/sca/contrib/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java @@ -22,7 +22,7 @@ package org.apache.tuscany.sca.host.embedded; import junit.framework.TestCase; import org.apache.tuscany.sca.host.embedded.test.extension.TestService; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.ServiceReference; diff --git a/java/sca/contrib/modules/host-embedded/src/test/java/sample/Helloworld.java b/java/sca/contrib/modules/host-embedded/src/test/java/sample/Helloworld.java index 386426df73..e2b7c698ac 100644 --- a/java/sca/contrib/modules/host-embedded/src/test/java/sample/Helloworld.java +++ b/java/sca/contrib/modules/host-embedded/src/test/java/sample/Helloworld.java @@ -19,7 +19,7 @@ package sample; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Helloworld { diff --git a/java/sca/contrib/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java b/java/sca/contrib/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java index b7eb93222e..b17f23908e 100644 --- a/java/sca/contrib/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java +++ b/java/sca/contrib/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.embedded.SCADomain; import org.apache.tuscany.sca.host.webapp.WebAppServletHost; -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"); SCADomain scaDomain = null; if (componentContext == null) { scaDomain = (SCADomain)servletContext.getAttribute(WebAppServletHost.SCA_DOMAIN_ATTRIBUTE); diff --git a/java/sca/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java b/java/sca/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java index c5d6555a24..ed327e237b 100644 --- a/java/sca/contrib/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java +++ b/java/sca/contrib/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/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAInvoker.java b/java/sca/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAInvoker.java index e74bf4d134..89841c6399 100644 --- a/java/sca/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAInvoker.java +++ b/java/sca/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAInvoker.java @@ -34,7 +34,7 @@ import org.apache.tuscany.sca.implementation.data.jdbc.JDBCResultSetStreamReader 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; /** * Implements a target invoker for DAS component implementations. diff --git a/java/sca/contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java b/java/sca/contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java index 7f0707c0bc..7bf263814e 100644 --- a/java/sca/contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java +++ b/java/sca/contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java @@ -23,7 +23,7 @@ import org.apache.tuscany.sca.data.collection.Collection; import org.apache.tuscany.sca.data.collection.Entry; import org.apache.tuscany.sca.data.collection.NotFoundException; import org.apache.tuscany.sca.implementation.data.DATA; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import commonj.sdo.DataObject; diff --git a/java/sca/contrib/modules/implementation-java-runtime/META-INF/MANIFEST.MF b/java/sca/contrib/modules/implementation-java-runtime/META-INF/MANIFEST.MF index 91794eae05..e199165d5c 100644 --- a/java/sca/contrib/modules/implementation-java-runtime/META-INF/MANIFEST.MF +++ b/java/sca/contrib/modules/implementation-java-runtime/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Export-Package: org.apache.tuscany.sca.implementation.java.context;use rg.apache.tuscany.sca.implementation.java,org.apache.tuscany.sca.inte rfacedef,org.w3c.dom,javax.xml.namespace,org.apache.tuscany.sca.invoc ation,org.apache.tuscany.sca.core.factory,org.apache.tuscany.sca.inte - rfacedef.impl,org.osoa.sca,org.apache.tuscany.sca.core.invocation";ve + rfacedef.impl,org.oasisopen.sca,org.apache.tuscany.sca.core.invocation";ve rsion="2.0" Private-Package: org.apache.tuscany.sca.implementation.java.invocation ;version="2.0",org.apache.tuscany.sca.implementation.java.module;vers @@ -52,8 +52,8 @@ Import-Package: javax.xml.namespace, org.apache.tuscany.sca.policy.util;version="2.0", org.apache.tuscany.sca.provider;version="2.0", org.apache.tuscany.sca.runtime;version="2.0", - org.osoa.sca;version="2.0", - org.osoa.sca.annotations;version="2.0", + org.oasisopen.sca;version="2.0", + org.oasisopen.sca.annotation;version="2.0", org.w3c.dom Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java.runtim e diff --git a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java index ca9c08fe63..bab4d897d6 100644 --- a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java +++ b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java @@ -23,7 +23,7 @@ import org.apache.tuscany.sca.core.context.RequestContextImpl; import org.apache.tuscany.sca.core.factory.ObjectCreationException; import org.apache.tuscany.sca.core.factory.ObjectFactory; import org.apache.tuscany.sca.core.invocation.ProxyFactory; -import org.osoa.sca.RequestContext; +import org.oasisopen.sca.RequestContext; /** * Creates instances of diff --git a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java index 2903cc6fc8..f2a0d576db 100644 --- a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java +++ b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.implementation.java.invocation; import org.apache.tuscany.sca.core.factory.ObjectCreationException; import org.apache.tuscany.sca.core.factory.ObjectFactory; -import org.osoa.sca.ComponentContext; +import org.oasisopen.sca.ComponentContext; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java index e585b3d46f..f705e04587 100644 --- a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java +++ b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java @@ -63,8 +63,8 @@ import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.ConversationID; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.ConversationID; /** * The runtime instantiation of Java component implementations @@ -119,7 +119,7 @@ public class JavaComponentContextProvider { /* if(Modifier.isPublic(field.getModifiers())) { instanceFactoryProvider.getInjectionSites().add(element); - } else if(field.getAnnotation(org.osoa.sca.annotations.Property.class) != null) { + } else if(field.getAnnotation(org.oasisopen.sca.annotation.Property.class) != null) { instanceFactoryProvider.getInjectionSites().add(element); } */ @@ -192,7 +192,7 @@ public class JavaComponentContextProvider { Field field = (Field)element.getAnchor(); if(Modifier.isPublic(field.getModifiers())) { instanceFactoryProvider.getInjectionSites().add(element); - } else if(field.getAnnotation(org.osoa.sca.annotations.Reference.class) != null) { + } else if(field.getAnnotation(org.oasisopen.sca.annotation.Reference.class) != null) { instanceFactoryProvider.getInjectionSites().add(element); } } else { diff --git a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java index 25d538cff4..19ce7a2778 100644 --- a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java +++ b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java @@ -36,7 +36,7 @@ import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.runtime.EndpointReference; import org.apache.tuscany.sca.runtime.ReferenceParameters; import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * Responsible for synchronously dispatching an invocation to a Java component diff --git a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java index e9eea607c9..2606430ffe 100644 --- a/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java +++ b/java/sca/contrib/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java @@ -45,8 +45,8 @@ import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java-xml/META-INF/MANIFEST.MF b/java/sca/contrib/modules/implementation-java-xml/META-INF/MANIFEST.MF index 6513277b12..4b09e5e4b0 100644 --- a/java/sca/contrib/modules/implementation-java-xml/META-INF/MANIFEST.MF +++ b/java/sca/contrib/modules/implementation-java-xml/META-INF/MANIFEST.MF @@ -33,7 +33,7 @@ Import-Package: javax.xml.namespace, org.apache.tuscany.sca.monitor;version="2.0", org.apache.tuscany.sca.policy;version="2.0", - org.osoa.sca.annotations;version="2.0";resolution:=optional + org.oasisopen.sca.annotation;version="2.0";resolution:=optional Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java.xml Bundle-DocURL: http://www.apache.org/ diff --git a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java index 3f28d740a7..64298b6275 100644 --- a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java +++ b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.EagerInit; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.EagerInit; +import org.oasisopen.sca.annotation.Scope; /** * An implementation of the Add service. diff --git a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java index c1fceb575d..9f64dc8bca 100644 --- a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; /** * An implementation of the Calculator service. diff --git a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java index e1f35f99b5..f5b8ff5be0 100644 --- a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java +++ b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** * An implementation of the Divide service. diff --git a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java index d621407908..d146d23153 100644 --- a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java +++ b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** * An implementation of the Multiply service. diff --git a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java index 4fed0a8c6a..ffe09c3dde 100644 --- a/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java +++ b/java/sca/contrib/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** * An implementation of the subtract service. diff --git a/java/sca/contrib/modules/implementation-java/META-INF/MANIFEST.MF b/java/sca/contrib/modules/implementation-java/META-INF/MANIFEST.MF index 96d32c1e9e..d001fa9228 100644 --- a/java/sca/contrib/modules/implementation-java/META-INF/MANIFEST.MF +++ b/java/sca/contrib/modules/implementation-java/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Export-Package: org.apache.tuscany.sca.implementation.java.introspect; uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.impleme - ntation.java,org.osoa.sca";version="2.0",org.apache.tuscany.sca.imple + ntation.java,org.oasisopen.sca";version="2.0",org.apache.tuscany.sca.imple mentation.java;uses:="org.apache.tuscany.sca.assembly,org.apache.tusc any.sca.implementation.java.introspect,org.apache.tuscany.sca.core,or g.apache.tuscany.sca.policy,org.apache.tuscany.sca.interfacedef.java" @@ -32,8 +32,8 @@ Import-Package: javax.jws, org.apache.tuscany.sca.interfacedef.util;version="2.0", org.apache.tuscany.sca.policy;version="2.0", org.apache.tuscany.sca.policy.util;version="2.0.0", - org.osoa.sca;version="2.0", - org.osoa.sca.annotations;version="2.0" + org.oasisopen.sca;version="2.0", + org.oasisopen.sca.annotation;version="2.0" Bundle-SymbolicName: org.apache.tuscany.sca.implementation.java Bundle-DocURL: http://www.apache.org/ diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java index 4a3ce0c343..3368d2fde3 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java @@ -23,7 +23,7 @@ import java.lang.reflect.Method; import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.implementation.java.IntrospectionException; import org.apache.tuscany.sca.implementation.java.JavaImplementation; -import org.osoa.sca.annotations.AllowsPassByReference; +import org.oasisopen.sca.annotation.AllowsPassByReference; /** * Processes {@link AllowsPassByReference} on an implementation diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java index 556f0b77e9..dd7720906e 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.implementation.java.IntrospectionException; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl; import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl; -import org.osoa.sca.annotations.ComponentName; +import org.oasisopen.sca.annotation.ComponentName; /** * Processes {@link @ComponentName} annotations on a component implementation and adds diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java index 17e28479d3..269555bac7 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java @@ -28,7 +28,7 @@ import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl; /** * Handles processing of a constructor decorated with - * {@link org.osoa.sca.annotations.Constructor} + * {@link org.oasisopen.sca.annotation.Constructor} * * @version $Rev$ $Date$ */ @@ -46,7 +46,7 @@ public class ConstructorProcessor extends BaseJavaClassVisitor { for (Constructor constructor : ctors) { JavaConstructorImpl definition = new JavaConstructorImpl(constructor); type.getConstructors().put(constructor, definition); - if (constructor.getAnnotation(org.osoa.sca.annotations.Constructor.class) != null) { + if (constructor.getAnnotation(org.oasisopen.sca.annotation.Constructor.class) != null) { if (found) { throw new DuplicateConstructorException("Multiple constructors marked with @Constructor", constructor); } @@ -59,8 +59,8 @@ public class ConstructorProcessor extends BaseJavaClassVisitor { @Override public void visitConstructor(Constructor constructor, JavaImplementation type) throws IntrospectionException { - org.osoa.sca.annotations.Constructor annotation = constructor - .getAnnotation(org.osoa.sca.annotations.Constructor.class); + org.oasisopen.sca.annotation.Constructor annotation = constructor + .getAnnotation(org.oasisopen.sca.annotation.Constructor.class); if (annotation == null) { return; } diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java index 177ceaa57c..04b1c9a97a 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java @@ -26,9 +26,9 @@ import org.apache.tuscany.sca.implementation.java.IntrospectionException; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl; import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Context; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.Context; /** * Processes {@link @Context} annotations on a component implementation and adds diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java index 985f8baa82..e7a0aadb0c 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.implementation.java.IntrospectionException; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl; import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl; -import org.osoa.sca.annotations.ConversationID; +import org.oasisopen.sca.annotation.ConversationID; /** * Processes {@link @ConversationID} annotations on a component implementation and adds diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java index efd04262dd..9c06ec52fe 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java @@ -24,9 +24,9 @@ import java.lang.reflect.Method; import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.implementation.java.IntrospectionException; import org.apache.tuscany.sca.implementation.java.JavaImplementation; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java index 50e4d46e97..a98d1f25db 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java @@ -24,7 +24,7 @@ import java.lang.reflect.Modifier; import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.implementation.java.IntrospectionException; import org.apache.tuscany.sca.implementation.java.JavaImplementation; -import org.osoa.sca.annotations.Destroy; +import org.oasisopen.sca.annotation.Destroy; /** * Processes the {@link @Destroy} annotation on a component implementation and diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java index 88a245cbf3..d6494e3845 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java @@ -24,7 +24,7 @@ import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** * Thrown when more than one component implementation constructor is annotated with {@link - * org.osoa.sca.annotations.Constructor} + * org.oasisopen.sca.annotation.Constructor} * * @version $Rev$ $Date$ */ diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java index 9b834e7e87..8bfae89162 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Thrown when an implementation is annotated multiple times with {@link org.osoa.sca.annotations.Destroy} + * Thrown when an implementation is annotated multiple times with {@link org.oasisopen.sca.annotation.Destroy} * * @version $Rev$ $Date$ */ diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java index 4325faef26..38f6478531 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Thrown when an implementation is annotated multiple times with {@link @org.osoa.sca.annotations.Init} + * Thrown when an implementation is annotated multiple times with {@link @org.oasisopen.sca.annotation.Init} * * @version $Rev$ $Date$ */ diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java index 5619275b82..2396471482 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java @@ -21,10 +21,10 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.implementation.java.IntrospectionException; import org.apache.tuscany.sca.implementation.java.JavaImplementation; -import org.osoa.sca.annotations.EagerInit; +import org.oasisopen.sca.annotation.EagerInit; /** - * Handles processing of {@link org.osoa.sca.annotations.EagerInit} + * Handles processing of {@link org.oasisopen.sca.annotation.EagerInit} * * @version $Rev$ $Date$ */ diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java index b7f6748ed2..fd62cd41da 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java @@ -53,11 +53,11 @@ import org.apache.tuscany.sca.interfacedef.java.JavaInterface; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Remotable; /** * Heuristically evaluates an un-annotated Java implementation type to determine @@ -250,7 +250,7 @@ public class HeuristicPojoProcessor extends BaseJavaClassVisitor { Constructor constructor; boolean explict = false; if (definition != null && definition.getConstructor() - .isAnnotationPresent(org.osoa.sca.annotations.Constructor.class)) { + .isAnnotationPresent(org.oasisopen.sca.annotation.Constructor.class)) { // the constructor was already defined explicitly return; } else if (definition != null) { diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java index 9fe2fcd468..badd41fbb9 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java @@ -23,7 +23,7 @@ import java.lang.reflect.Member; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Denotes an illegal use of {@link org.osoa.sca.annotations.Callback} on a reference + * Denotes an illegal use of {@link org.oasisopen.sca.annotation.Callback} on a reference * * @version $Rev$ $Date$ */ diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java index f5696122df..fa1e67a336 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java @@ -23,7 +23,7 @@ import java.lang.reflect.Member; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Denotes an illegal signature for a method decorated with {@link org.osoa.sca.annotations.Context} + * Denotes an illegal signature for a method decorated with {@link org.oasisopen.sca.annotation.Context} * * @version $Rev$ $Date$ */ diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java index 6a0d60c92f..0c4c3d5646 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java @@ -23,7 +23,7 @@ import java.lang.reflect.Member; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Denotes an illegal signature for a method decorated with {@link org.osoa.sca.annotations.Destroy} + * Denotes an illegal signature for a method decorated with {@link org.oasisopen.sca.annotation.Destroy} * * @version $Rev$ $Date$ */ diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java index 8f50852c2d..2956b60b65 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java @@ -23,7 +23,7 @@ import java.lang.reflect.Member; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Denotes an illegal signature for a method decorated with {@link @org.osoa.sca.annotations.Init} + * Denotes an illegal signature for a method decorated with {@link @org.oasisopen.sca.annotation.Init} * * @version $Rev$ $Date$ */ diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java index e130f4221d..e0f90779a1 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Denotes an illegal use of the {@link @org.osoa.sca.annotations.Service} annotation + * Denotes an illegal use of the {@link @org.oasisopen.sca.annotation.Service} annotation * * @version $Rev$ $Date$ */ diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java index 583ccc86cd..e34399e467 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java @@ -24,7 +24,7 @@ import java.lang.reflect.Modifier; import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.implementation.java.IntrospectionException; import org.apache.tuscany.sca.implementation.java.JavaImplementation; -import org.osoa.sca.annotations.Init; +import org.oasisopen.sca.annotation.Init; /** * Processes the {@link @Init} annotation on a component implementation and diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java index 91b97b2caf..c75dfdaf46 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java @@ -22,7 +22,7 @@ import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** * Denotes an invalid constructor definition, e.g. when the number of injection names specified in {@link - * org.osoa.sca.annotations.Constructor} do not match the number of actual constructor parameters + * org.oasisopen.sca.annotation.Constructor} do not match the number of actual constructor parameters * * @version $Rev$ $Date$ */ diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java index 976b4da120..429b88aa1f 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Denotes an invalid usage of {@link org.osoa.sca.annotations.Property} + * Denotes an invalid usage of {@link org.oasisopen.sca.annotation.Property} * * @version $Rev$ $Date$ */ diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java index e77a6beb0d..fbf3fc9ed3 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Denotes an invalid usage of {@link org.osoa.sca.annotations.Reference} + * Denotes an invalid usage of {@link org.oasisopen.sca.annotation.Reference} * * @version $Rev$ $Date$ */ diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java index 7147da55b4..62337181e9 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; import org.apache.tuscany.sca.implementation.java.IntrospectionException; /** - * Thrown when a service type specified by an {@link org.osoa.sca.annotations.Service} annotation is invalid, e.g. it is + * Thrown when a service type specified by an {@link org.oasisopen.sca.annotation.Service} annotation is invalid, e.g. it is * not an interface * * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java index 6039bd91f8..239c36aa9a 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java @@ -41,7 +41,7 @@ import java.util.Map; import java.util.Set; import java.util.logging.Logger; -import org.osoa.sca.CallableReference; +import org.oasisopen.sca.CallableReference; /** * Implements various reflection-related operations @@ -68,7 +68,7 @@ public final class JavaIntrospectionHelper { private static void checkInvalidAnnotations(AnnotatedElement element) { for (Annotation a : element.getAnnotations()) { - if (a.annotationType().getName().startsWith("org.osoa.sca.annotations.")) { + if (a.annotationType().getName().startsWith("org.oasisopen.sca.annotation.")) { logger.warning("Invalid annotation " + a + " is found on " + element); } } diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java index 954a3abbc8..ea05cdde3e 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java @@ -39,11 +39,11 @@ import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.PolicyFactory; import org.apache.tuscany.sca.policy.PolicySet; import org.apache.tuscany.sca.policy.PolicySetAttachPoint; -import org.osoa.sca.annotations.PolicySets; -import org.osoa.sca.annotations.Requires; +import org.oasisopen.sca.annotation.PolicySets; +import org.oasisopen.sca.annotation.Requires; /** - * Processes an {@link org.osoa.sca.annotations.Requires} annotation + * Processes an {@link org.oasisopen.sca.annotation.Requires} annotation * * @version $Rev$ $Date$ */ @@ -224,8 +224,8 @@ public class PolicyProcessor extends BaseJavaClassVisitor { private Reference getReference(Method method, JavaImplementation type) { //since the ReferenceProcessor is called ahead of the PolicyProcessor the type should have //picked up the reference setter method - org.osoa.sca.annotations.Reference annotation = - method.getAnnotation(org.osoa.sca.annotations.Reference.class); + org.oasisopen.sca.annotation.Reference annotation = + method.getAnnotation(org.oasisopen.sca.annotation.Reference.class); if (annotation != null) { if (JavaIntrospectionHelper.isSetter(method)) { String name = annotation.name(); @@ -249,8 +249,8 @@ public class PolicyProcessor extends BaseJavaClassVisitor { @Override public void visitField(Field field, JavaImplementation type) throws IntrospectionException { - org.osoa.sca.annotations.Reference annotation = - field.getAnnotation( org.osoa.sca.annotations.Reference.class); + org.oasisopen.sca.annotation.Reference annotation = + field.getAnnotation( org.oasisopen.sca.annotation.Reference.class); if (annotation == null) { return; } diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java index cf1b4a9830..a755146997 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * Processes an {@link @Property} annotation, updating the component type with diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java index a1f8a766ae..1f66fc7c3d 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java @@ -37,8 +37,8 @@ import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; import org.apache.tuscany.sca.interfacedef.java.JavaInterface; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Reference; /** * Processes an {@link @Reference} annotation, updating the component type with diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java index a3d3889d30..15fff297c8 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java @@ -38,7 +38,7 @@ public class ScopeProcessor extends BaseJavaClassVisitor { public void visitClass(Class clazz, JavaImplementation type) throws IntrospectionException { - org.osoa.sca.annotations.Scope annotation = clazz.getAnnotation(org.osoa.sca.annotations.Scope.class); + org.oasisopen.sca.annotation.Scope annotation = clazz.getAnnotation(org.oasisopen.sca.annotation.Scope.class); if (annotation == null) { type.setJavaScope(JavaScopeImpl.STATELESS); return; diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java index 6854acdc2a..35505ec9ed 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java @@ -39,14 +39,14 @@ import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; import org.apache.tuscany.sca.interfacedef.java.JavaInterface; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; /** - * Processes an {@link org.osoa.sca.annotations.Service} annotation and updates + * Processes an {@link org.oasisopen.sca.annotation.Service} annotation and updates * the component type with corresponding {@link Service}s. Also processes - * related {@link org.osoa.sca.annotations.Callback} annotations. + * related {@link org.oasisopen.sca.annotation.Callback} annotations. * * @version $Rev$ $Date$ */ @@ -61,7 +61,7 @@ public class ServiceProcessor extends BaseJavaClassVisitor { @Override public void visitClass(Class 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 interfaces = getAllInterfaces(clazz); diff --git a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java index 57d224b2bf..bfaa759cd2 100644 --- a/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java +++ b/java/sca/contrib/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl; /** - * Thrown when a method or field marked with {@link org.osoa.sca.annotations.Context} takes an unknown type + * Thrown when a method or field marked with {@link org.oasisopen.sca.annotation.Context} takes an unknown type * * @version $Rev$ $Date$ */ diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java index e5abb07760..34fc58d241 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory; import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; -import org.osoa.sca.annotations.AllowsPassByReference; +import org.oasisopen.sca.annotation.AllowsPassByReference; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java index fa1527fbe5..9a55c2a4ce 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java @@ -37,8 +37,8 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ @@ -105,19 +105,19 @@ public class ConstructorProcessorTestCase extends TestCase { private static class BadFoo { - @org.osoa.sca.annotations.Constructor("foo") + @org.oasisopen.sca.annotation.Constructor("foo") public BadFoo(String foo) { } - @org.osoa.sca.annotations.Constructor( {"foo", "bar"}) + @org.oasisopen.sca.annotation.Constructor( {"foo", "bar"}) public BadFoo(String foo, String bar) { } } private static class Foo { - @org.osoa.sca.annotations.Constructor("foo") + @org.oasisopen.sca.annotation.Constructor("foo") public Foo(String foo) { } @@ -129,13 +129,13 @@ public class ConstructorProcessorTestCase extends TestCase { } private static class BadAnnotation { - @org.osoa.sca.annotations.Constructor("foo") + @org.oasisopen.sca.annotation.Constructor("foo") public BadAnnotation(String foo, Foo ref) { } } public static final class Mixed { - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public Mixed(@Reference String param1, @Property(name = "foo") String param2, @Reference(name = "bar") @@ -144,7 +144,7 @@ public class ConstructorProcessorTestCase extends TestCase { } public static final class Multiple { - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public Multiple(@Reference Collection param1, @Property(name = "foo") String[] param2, @Reference(name = "bar", required = true) diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java index 690869ccb8..8ca8f195b4 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java @@ -26,7 +26,7 @@ import java.util.List; import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * @version $Rev$ $Date$ @@ -109,22 +109,22 @@ public class ConstructorPropertyTestCase extends AbstractProcessorTest { private static class Foo { - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public Foo(@Property(name = "myProp", required = true)String prop) { } - @org.osoa.sca.annotations.Constructor("myProp") + @org.oasisopen.sca.annotation.Constructor("myProp") public Foo(@Property Integer prop) { } - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public Foo(@Property(name = "myProp1")String prop1, @Property(name = "myProp2")String prop2) { } - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public Foo(@Property List prop) { } @@ -132,22 +132,22 @@ public class ConstructorPropertyTestCase extends AbstractProcessorTest { private static class BadFoo { - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public BadFoo(@Property(name = "myProp")String prop1, @Property(name = "myProp")String prop2) { } - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public BadFoo(@Property String prop) { } - @org.osoa.sca.annotations.Constructor("myProp") + @org.oasisopen.sca.annotation.Constructor("myProp") public BadFoo(@Property Integer prop, @Property Integer prop2) { } - @org.osoa.sca.annotations.Constructor({"myRef", "myRef2"}) + @org.oasisopen.sca.annotation.Constructor({"myRef", "myRef2"}) public BadFoo(@Property List ref, @Property(name = "myOtherRef")List ref2) { } diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java index 8c10df2146..51ab00644a 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.assembly.Multiplicity; import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ @@ -111,22 +111,22 @@ public class ConstructorReferenceTestCase extends AbstractProcessorTest { private static class Foo { - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public Foo(@Reference(name = "myRef", required = true)String prop) { } - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public Foo(@Reference(name = "myRef1")String prop1, @Reference(name = "myRef2")String prop2) { } - @org.osoa.sca.annotations.Constructor("myRef") + @org.oasisopen.sca.annotation.Constructor("myRef") public Foo(@Reference Integer prop) { } - @org.osoa.sca.annotations.Constructor() + @org.oasisopen.sca.annotation.Constructor() public Foo(@Reference List prop) { } @@ -134,7 +134,7 @@ public class ConstructorReferenceTestCase extends AbstractProcessorTest { private static class NoNameFoo { - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public NoNameFoo(@Reference String prop) { } @@ -142,22 +142,22 @@ public class ConstructorReferenceTestCase extends AbstractProcessorTest { private static class BadFoo { - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public BadFoo(@Reference(name = "myRef")String prop1, @Reference(name = "myRef")String prop2) { } - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public BadFoo(@Reference String prop) { } - @org.osoa.sca.annotations.Constructor("myRef") + @org.oasisopen.sca.annotation.Constructor("myRef") public BadFoo(@Reference Integer ref, @Reference Integer ref2) { } - @org.osoa.sca.annotations.Constructor({"myRef", "myRef2"}) + @org.oasisopen.sca.annotation.Constructor({"myRef", "myRef2"}) public BadFoo(@Reference List ref, @Reference(name = "myOtherRef")List ref2) { } diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java index 365fb12afe..42cd1ace1f 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java @@ -104,22 +104,22 @@ public class ConstructorResourceTestCase extends AbstractProcessorTest { private static class Foo { - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public Foo(@Resource(name = "myResource") String resource) { } - @org.osoa.sca.annotations.Constructor("myResource") + @org.oasisopen.sca.annotation.Constructor("myResource") public Foo(@Resource Integer resource) { } - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public Foo(@Resource(name = "myResource1") String res1, @Resource(name = "myResource2") String res2) { } - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public Foo(@Resource List res) { } @@ -127,22 +127,22 @@ public class ConstructorResourceTestCase extends AbstractProcessorTest { private static class BadFoo { - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public BadFoo(@Resource(name = "myResource") String res1, @Resource(name = "myResource") String res2) { } - @org.osoa.sca.annotations.Constructor + @org.oasisopen.sca.annotation.Constructor public BadFoo(@Resource String res) { } - @org.osoa.sca.annotations.Constructor("myProp") + @org.oasisopen.sca.annotation.Constructor("myProp") public BadFoo(@Resource Integer res, @Resource Integer res2) { } - @org.osoa.sca.annotations.Constructor({"myRes", "myRes2"}) + @org.oasisopen.sca.annotation.Constructor({"myRes", "myRes2"}) public BadFoo(@Resource List res, @Resource(name = "myOtherRes") List res2) { } diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java index f77c9abad9..0a14f9babd 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java @@ -27,10 +27,10 @@ import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory; import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.ComponentName; -import org.osoa.sca.annotations.Context; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.ComponentName; +import org.oasisopen.sca.annotation.Context; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java index c6b2626e9c..7591095fff 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory; import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; -import org.osoa.sca.annotations.ConversationID; +import org.oasisopen.sca.annotation.ConversationID; /** * Test the ConversationIDProcessor diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java index 4555736813..f8b0a04595 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java @@ -27,9 +27,9 @@ import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory; import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java index ffc67325fa..47561aabde 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory; import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; -import org.osoa.sca.annotations.Destroy; +import org.oasisopen.sca.annotation.Destroy; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java index 09bcc7ab6c..3c32b7c680 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFacto import org.apache.tuscany.sca.implementation.java.IntrospectionException; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; -import org.osoa.sca.annotations.EagerInit; +import org.oasisopen.sca.annotation.EagerInit; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java index c7f340bd46..9fc0dde0d1 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java @@ -29,7 +29,7 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java index e98a8fec1f..b2661e49e8 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java @@ -31,9 +31,9 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java index ff267cd938..e0ae754dea 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java @@ -34,10 +34,10 @@ import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl; import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.annotation.Service; /** * Verifies component type information is properly introspected from an unadorned diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java index ed0527d3d7..5870b8c450 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java @@ -76,7 +76,7 @@ public class HeutisticExtensibleConstructorTestCase extends AbstractProcessorTes * annotation processors is called.

For example, given: * * 

-     *  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)
      *
* *

Heuristic evaluation of @@ -132,15 +132,15 @@ public class HeutisticExtensibleConstructorTestCase extends AbstractProcessorTes public static class Foo { public Foo(@Bar - String prop, @org.osoa.sca.annotations.Property(name = "foo") + String prop, @org.oasisopen.sca.annotation.Property(name = "foo") String prop2) { } } public static class Foo2 { - public Foo2(@org.osoa.sca.annotations.Reference(name = "baz") + public Foo2(@org.oasisopen.sca.annotation.Reference(name = "baz") String prop1, @Bar - String prop2, @org.osoa.sca.annotations.Property(name = "foo") + String prop2, @org.oasisopen.sca.annotation.Property(name = "foo") String prop3) { } } diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java index 70c615ca24..72660b2206 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory; import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory; import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; -import org.osoa.sca.annotations.Init; +import org.oasisopen.sca.annotation.Init; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java index 4a625982b0..3007724765 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java @@ -37,8 +37,8 @@ import org.apache.tuscany.sca.interfacedef.java.impl.PolicyJavaInterfaceVisitor; import org.apache.tuscany.sca.policy.DefaultPolicyFactory; import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.PolicySetAttachPoint; -import org.osoa.sca.annotations.Requires; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Requires; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java index 8d5e816a08..a410e22c4e 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java @@ -30,7 +30,7 @@ import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFacto import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java index d68b1530f0..1011a0dc72 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java @@ -32,7 +32,7 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.JavaInterface; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java index d7de4e522e..5f0a497c6e 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java @@ -87,23 +87,23 @@ public class ScopeProcessorTestCase extends TestCase { parent = EasyMock.createNiceMock(Component.class); } - @org.osoa.sca.annotations.Scope("COMPOSITE") + @org.oasisopen.sca.annotation.Scope("COMPOSITE") private class Composite { } - @org.osoa.sca.annotations.Scope("SESSION") + @org.oasisopen.sca.annotation.Scope("SESSION") private class Session { } - @org.osoa.sca.annotations.Scope("CONVERSATION") + @org.oasisopen.sca.annotation.Scope("CONVERSATION") private class Conversation { } - @org.osoa.sca.annotations.Scope("REQUEST") + @org.oasisopen.sca.annotation.Scope("REQUEST") private class Request { } - @org.osoa.sca.annotations.Scope("STATELESS") + @org.oasisopen.sca.annotation.Scope("STATELESS") private class Stateless { } diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java index 10f0500e4d..1fc4445f28 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java @@ -32,9 +32,9 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.apache.tuscany.sca.interfacedef.InvalidCallbackException; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java index aea90aa6eb..19355f5c62 100644 --- a/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java +++ b/java/sca/contrib/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java @@ -28,9 +28,9 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementation; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.JavaInterface; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java b/java/sca/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java index 0264574fb9..d4b94db143 100644 --- a/java/sca/contrib/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java +++ b/java/sca/contrib/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.SCAClient; import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.SCANodeFactory; -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/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java b/java/sca/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java index 33c790585c..e5a726c8c0 100644 --- a/java/sca/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java +++ b/java/sca/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java @@ -299,7 +299,7 @@ public class OSGiAnnotations { public void visitClass(Class 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/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java b/java/sca/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java index 0264f0b102..8eee337638 100644 --- a/java/sca/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java +++ b/java/sca/contrib/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/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java b/java/sca/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java index e775041592..a4fb1ec2ca 100644 --- a/java/sca/contrib/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java +++ b/java/sca/contrib/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/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java b/java/sca/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java index 630c1502d1..e59032e3ea 100644 --- a/java/sca/contrib/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java +++ b/java/sca/contrib/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/contrib/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java b/java/sca/contrib/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java index 980864869f..cffe65c27a 100644 --- a/java/sca/contrib/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java +++ b/java/sca/contrib/modules/implementation-script/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/contrib/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java b/java/sca/contrib/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java index 47cdc03e0e..719212e831 100644 --- a/java/sca/contrib/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java +++ b/java/sca/contrib/modules/implementation-script/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/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java b/java/sca/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java index cd0567f461..6e0987791b 100644 --- a/java/sca/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java +++ b/java/sca/contrib/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/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java b/java/sca/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java index 4dadf37189..689ac27f0f 100644 --- a/java/sca/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java +++ b/java/sca/contrib/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 constructorAnnotationType - = org.osoa.sca.annotations.Constructor.class; + = org.oasisopen.sca.annotation.Constructor.class; private Class autowiredAnnotationType = Autowired.class; diff --git a/java/sca/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java b/java/sca/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java index 44737bf9d1..129a15e72e 100644 --- a/java/sca/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java +++ b/java/sca/contrib/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/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java b/java/sca/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java index d8755c58f4..fbc0e2b36f 100644 --- a/java/sca/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java +++ b/java/sca/contrib/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/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java b/java/sca/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java index 52f8ac3684..48c727baab 100644 --- a/java/sca/contrib/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java +++ b/java/sca/contrib/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/contrib/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java b/java/sca/contrib/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java index fd295daaf6..935ff19992 100644 --- a/java/sca/contrib/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java +++ b/java/sca/contrib/modules/implementation-spring/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/contrib/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java b/java/sca/contrib/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java index bd35e9f3b9..0c912fddfa 100644 --- a/java/sca/contrib/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java +++ b/java/sca/contrib/modules/implementation-spring/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/contrib/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java b/java/sca/contrib/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java index dba3f62d35..fd87edb52e 100644 --- a/java/sca/contrib/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java +++ b/java/sca/contrib/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java @@ -22,10 +22,10 @@ package org.apache.tuscany.sca.implementation.web.runtime; import java.util.Collection; import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.ServiceReference; /** * Proxy ComponentContext wrappering a RuntimeComponent as the diff --git a/java/sca/contrib/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java b/java/sca/contrib/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java index 2518ba5381..084bd227a5 100644 --- a/java/sca/contrib/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java +++ b/java/sca/contrib/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java @@ -53,8 +53,8 @@ public class WebImplementationProviderFactory implements ImplementationProviderF public ImplementationProvider createImplementationProvider(RuntimeComponent component, WebImplementation implementation) { - servletHost.addServletMapping("org.osoa.sca.componentContext.js", contextServlet); - contextServlet.setAttribute("org.osoa.sca.ComponentContext", new ComponentContextProxy(component)); + servletHost.addServletMapping("org.oasisopen.sca.componentContext.js", contextServlet); + contextServlet.setAttribute("org.oasisopen.sca.ComponentContext", new ComponentContextProxy(component)); contextServlet.setAttribute("org.apache.tuscany.sca.implementation.web.RuntimeComponent", component); return new ImplementationProvider() { diff --git a/java/sca/contrib/modules/implementation-widget-runtime/src/test/java/store/Catalog.java b/java/sca/contrib/modules/implementation-widget-runtime/src/test/java/store/Catalog.java index 370474f29f..5dd7d70e6c 100644 --- a/java/sca/contrib/modules/implementation-widget-runtime/src/test/java/store/Catalog.java +++ b/java/sca/contrib/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/contrib/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java b/java/sca/contrib/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java index bed053eeee..1a34094cc5 100644 --- a/java/sca/contrib/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java +++ b/java/sca/contrib/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/contrib/modules/interface-java-jaxws/META-INF/MANIFEST.MF b/java/sca/contrib/modules/interface-java-jaxws/META-INF/MANIFEST.MF index b420f7f79d..a47840881d 100644 --- a/java/sca/contrib/modules/interface-java-jaxws/META-INF/MANIFEST.MF +++ b/java/sca/contrib/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 @@ -43,8 +43,8 @@ Import-Package: javax.jws, org.objectweb.asm;version="3.1", org.objectweb.asm.util;version="3.1";resolution:=optional, - org.osoa.sca;version="2.0", - org.osoa.sca.annotations;version="2.0";resolution:=optional + org.oasisopen.sca;version="2.0", + org.oasisopen.sca.annotation;version="2.0";resolution:=optional Bundle-SymbolicName: org.apache.tuscany.sca.interface.java.jaxws Bundle-DocURL: http://www.apache.org/ diff --git a/java/sca/contrib/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java b/java/sca/contrib/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java index 75a0aa8131..242da0ebd4 100644 --- a/java/sca/contrib/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java +++ b/java/sca/contrib/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/contrib/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java b/java/sca/contrib/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java index a6a3375eff..997713a780 100644 --- a/java/sca/contrib/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java +++ b/java/sca/contrib/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/contrib/modules/interface-java/META-INF/MANIFEST.MF b/java/sca/contrib/modules/interface-java/META-INF/MANIFEST.MF index 10df0680f0..841d126cca 100644 --- a/java/sca/contrib/modules/interface-java/META-INF/MANIFEST.MF +++ b/java/sca/contrib/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", org.apache.tuscany.sca.interfacedef.util;version="2.0", org.apache.tuscany.sca.policy;version="2.0", - org.osoa.sca.annotations;version="2.0" + org.oasisopen.sca.annotation;version="2.0" Bundle-SymbolicName: org.apache.tuscany.sca.interface.java Bundle-DocURL: http://www.apache.org/ diff --git a/java/sca/contrib/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/java/sca/contrib/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java index b1198824fa..b33640bd58 100644 --- a/java/sca/contrib/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java +++ b/java/sca/contrib/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/contrib/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java b/java/sca/contrib/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java index ed00510a67..bf80bef175 100644 --- a/java/sca/contrib/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java +++ b/java/sca/contrib/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/contrib/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java b/java/sca/contrib/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java index 14b0577f65..d7331402ec 100644 --- a/java/sca/contrib/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java +++ b/java/sca/contrib/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java @@ -35,7 +35,7 @@ import org.apache.tuscany.sca.interfacedef.impl.InterfaceImpl; import org.apache.tuscany.sca.interfacedef.impl.OperationImpl; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; -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/contrib/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java b/java/sca/contrib/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java index f90a5cb8a1..ed0735cccd 100644 --- a/java/sca/contrib/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java +++ b/java/sca/contrib/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java @@ -26,8 +26,8 @@ import org.apache.tuscany.sca.interfacedef.InvalidOperationException; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; -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/contrib/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java b/java/sca/contrib/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java index 5a454f176c..d62c368fa4 100644 --- a/java/sca/contrib/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java +++ b/java/sca/contrib/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java @@ -25,8 +25,8 @@ import org.apache.tuscany.sca.interfacedef.java.JavaInterface; import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; import org.apache.tuscany.sca.interfacedef.java.impl.PolicyJavaInterfaceVisitor; import org.apache.tuscany.sca.policy.DefaultPolicyFactory; -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/contrib/modules/node-api/META-INF/MANIFEST.MF b/java/sca/contrib/modules/node-api/META-INF/MANIFEST.MF index 6f7b072a19..f5b995feb6 100644 --- a/java/sca/contrib/modules/node-api/META-INF/MANIFEST.MF +++ b/java/sca/contrib/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" 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",org.osoa.sca +Import-Package: org.apache.tuscany.sca.node;version="2.0",org.oasisopen.sca ;version="2.0" Bundle-SymbolicName: org.apache.tuscany.sca.node.api Bundle-DocURL: http://www.apache.org/ diff --git a/java/sca/contrib/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java b/java/sca/contrib/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java index f390e8881e..2723d038f1 100644 --- a/java/sca/contrib/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java +++ b/java/sca/contrib/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.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/contrib/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java b/java/sca/contrib/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java index 2b0dbc88eb..d0c5bd76ae 100644 --- a/java/sca/contrib/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java +++ b/java/sca/contrib/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.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/contrib/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java b/java/sca/contrib/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java index e41afd29c4..7111794ef3 100644 --- a/java/sca/contrib/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java +++ b/java/sca/contrib/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.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/contrib/modules/node-impl/META-INF/MANIFEST.MF b/java/sca/contrib/modules/node-impl/META-INF/MANIFEST.MF index 17dc510e42..d5e59fe191 100644 --- a/java/sca/contrib/modules/node-impl/META-INF/MANIFEST.MF +++ b/java/sca/contrib/modules/node-impl/META-INF/MANIFEST.MF @@ -41,8 +41,8 @@ Import-Package: javax.xml.namespace, org.apache.tuscany.sca.workspace;version="2.0", org.apache.tuscany.sca.workspace.builder;version="2.0", - org.osoa.sca;version="2.0", - org.osoa.sca.annotations;version="2.0";resolution:=optional + org.oasisopen.sca;version="2.0", + org.oasisopen.sca.annotation;version="2.0";resolution:=optional Bundle-SymbolicName: org.apache.tuscany.sca.node.impl Bundle-DocURL: http://www.apache.org/ diff --git a/java/sca/contrib/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/java/sca/contrib/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java index a8a076a602..df3caf5adc 100644 --- a/java/sca/contrib/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java +++ b/java/sca/contrib/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java @@ -74,9 +74,9 @@ import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentContext; -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 local representation of the SCADomain running on a single node diff --git a/java/sca/contrib/modules/node-impl/src/test/java/hello/HelloWorld.java b/java/sca/contrib/modules/node-impl/src/test/java/hello/HelloWorld.java index 2f519cb81d..e3fcdfd25f 100644 --- a/java/sca/contrib/modules/node-impl/src/test/java/hello/HelloWorld.java +++ b/java/sca/contrib/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/contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java b/java/sca/contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java index 2f519cb81d..e3fcdfd25f 100644 --- a/java/sca/contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java +++ b/java/sca/contrib/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/contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java b/java/sca/contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java index 11e008619c..8232acb658 100644 --- a/java/sca/contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java +++ b/java/sca/contrib/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/contrib/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java b/java/sca/contrib/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java index 2f519cb81d..e3fcdfd25f 100644 --- a/java/sca/contrib/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java +++ b/java/sca/contrib/modules/node-launcher-osgi/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/contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java b/java/sca/contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java index 019c2562ec..340c6236fa 100644 --- a/java/sca/contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java +++ b/java/sca/contrib/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/contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java b/java/sca/contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java index d0475e1dd3..d23674ed4a 100644 --- a/java/sca/contrib/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java +++ b/java/sca/contrib/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/contrib/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java b/java/sca/contrib/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java index f8b56c88d6..c3d7b4d248 100644 --- a/java/sca/contrib/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java +++ b/java/sca/contrib/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java @@ -126,7 +126,7 @@ public class FelixRuntime extends OSGiRuntime implements BundleActivator { if (!tuscanyRunningInOSGiContainer) { - systemPackages = systemPackages + ", org.osoa.sca.annotations, org.osoa.sca"; + systemPackages = systemPackages + ", org.oasisopen.sca.annotation, org.oasisopen.sca"; systemPackages = systemPackages + ", commonj.sdo, commonj.sdo.helper, org.apache.tuscany.sdo.helper, org.apache.tuscany.sdo.impl, org.apache.tuscany.sdo.model, org.apache.tuscany.sdo.model.impl"; systemPackages = systemPackages + ", org.eclipse.emf.ecore, org.eclipse.emf.ecore.util, org.eclipse.emf.ecore.impl"; } diff --git a/java/sca/contrib/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java b/java/sca/contrib/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java index 894117354e..59f8dc632f 100644 --- a/java/sca/contrib/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java +++ b/java/sca/contrib/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java @@ -37,8 +37,8 @@ import org.apache.tuscany.sca.interfacedef.java.impl.PolicyJavaInterfaceVisitor; import org.apache.tuscany.sca.policy.DefaultPolicyFactory; import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.PolicySetAttachPoint; -import org.osoa.sca.annotations.Requires; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Requires; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java b/java/sca/contrib/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java index 1559e22cb9..869549ca1d 100644 --- a/java/sca/contrib/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java +++ b/java/sca/contrib/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java @@ -30,7 +30,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.SecurityUtil; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; /** * @version $Rev$ $Date$ diff --git a/java/sca/contrib/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java b/java/sca/contrib/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java index 328c290fad..41a7b62772 100644 --- a/java/sca/contrib/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java +++ b/java/sca/contrib/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/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java b/java/sca/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java index 7351ecabe0..58cadd3261 100644 --- a/java/sca/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java +++ b/java/sca/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java @@ -29,7 +29,7 @@ import org.apache.AnnotationProcessor; import org.apache.catalina.core.StandardContext; import org.apache.tuscany.sca.host.embedded.SCADomain; import org.apache.tuscany.sca.host.webapp.WebAppServletHost; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * A Tuscany specific Tomcat annotation processor for processing SCA annotations diff --git a/java/sca/contrib/modules/sca-api/META-INF/MANIFEST.MF b/java/sca/contrib/modules/sca-api/META-INF/MANIFEST.MF index bad814ed6f..9d83493854 100644 --- a/java/sca/contrib/modules/sca-api/META-INF/MANIFEST.MF +++ b/java/sca/contrib/modules/sca-api/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Export-Package: org.osoa.sca.annotations;version="2.0",org.osoa.sca;us +Export-Package: org.oasisopen.sca.annotation;version="2.0",org.oasisopen.sca;us es:="javax.security.auth";version="2.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",org.oso - a.sca.annotations;version="2.0" +Import-Package: javax.security.auth,org.oasisopen.sca;version="2.0",org.oas + isopen.sca.annotation;version="2.0" Bundle-SymbolicName: org.apache.tuscany.sca.api Bundle-DocURL: http://www.apache.org/ diff --git a/java/sca/contrib/modules/sca-api/pom.xml b/java/sca/contrib/modules/sca-api/pom.xml index 13f1fb85c1..812f2976ca 100644 --- a/java/sca/contrib/modules/sca-api/pom.xml +++ b/java/sca/contrib/modules/sca-api/pom.xml @@ -43,7 +43,7 @@ 1.4 org.apache.tuscany.sca.api ${pom.description} - org.osoa.sca* + org.oasisopen.sca* diff --git a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java index 7f6756bcbd..cdfaded693 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java index e25917e0f8..7e1a2e6b2e 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/Constants.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/Constants.java index b1b2af8048..5135c23dde 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/Constants.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java index 12733a7bd2..d4e4034eed 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java index 2e3b71fd1c..72944d6dfc 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java index 0a0c2afff9..fcf88f75c1 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java index cdcfa9a791..5c8fe61073 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java index 8da6bcd1f3..55d875a5f3 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java index 70f5f904a4..d11c1904c5 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java index dd6b1c3242..5d8e4af6ff 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java index 556dd4e68e..dbc08a7655 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java index f7fca41212..cfc0af0318 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java index 0ee613fdcb..b8d71dac05 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java index bc73d22c9d..8fc3cd4013 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java index 25ade6f091..5c594bc7d3 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java index bc09c8ccdd..a5728e51d4 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java index baacb2f520..e7f7aef069 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java index e9fcfee2d3..498cc3eea3 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java index b2f6f17129..2cc62afdbf 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java index f0350f8ff5..6a406f2acc 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java index d65558653b..2ad6fdc892 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java index 21bf986705..d53e9e4fc4 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java index c65ff5838f..4f58c50802 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java index d610e21d64..3fe9bf585f 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java index a8cf28475b..0c196f1ce5 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java index fc925aa402..c3e9914f23 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java index eaf9e3207c..458d05cc92 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java index b22a6a840c..150d8dabc8 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java index 71af35634d..0ab54ef6e4 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java index 44388bea74..a5fd102859 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java index 4d71b3f357..9a7154fcf3 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java index 53d58b7dc1..77ff4e26f9 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java index 3af699de07..e44775398e 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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; *

  • {http://www.osoa.org/xmlns/sca/1.0}confidentiality.message
    • * * 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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java index cd88df1128..d7cfaab3f5 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java index 62f4abdbee..36c5bff5e9 100644 --- a/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java +++ b/java/sca/contrib/modules/sca-api/src/main/java/org/osoa/sca/annotations/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; diff --git a/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java b/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java index e070e0b8f1..cf2f906388 100644 --- a/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java +++ b/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java @@ -29,8 +29,8 @@ import org.apache.tuscany.sca.binding.atom.collection.Collection; import org.apache.tuscany.sca.binding.atom.collection.NotFoundException; import org.apache.tuscany.sca.demos.aggregator.types.AlertType; import org.apache.tuscany.sca.demos.aggregator.types.AlertsType; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * Read all new alerts from the specified sources diff --git a/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java b/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java index c4bf13ce7a..8797349640 100644 --- a/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java +++ b/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.demos.aggregator; import org.apache.tuscany.sca.demos.aggregator.types.AlertsType; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * Retrieve and manage alerts diff --git a/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java b/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java index 28e27a9978..569d9b7f6f 100644 --- a/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java +++ b/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java @@ -27,8 +27,8 @@ import org.apache.tuscany.sca.demos.aggregator.types.AlertType; import org.apache.tuscany.sca.demos.aggregator.types.AlertsType; import org.apache.tuscany.sca.demos.aggregator.types.ConfigType; import org.apache.tuscany.sca.demos.aggregator.types.SourceType; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * Read all new alerts from the specified sources diff --git a/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java b/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java index 7b943b1b45..f61c307120 100644 --- a/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java +++ b/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.demos.aggregator; import org.apache.tuscany.sca.demos.aggregator.types.ConfigType; import org.apache.tuscany.sca.demos.aggregator.types.SourceType; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * Retrieve and manage alert sources diff --git a/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java b/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java index ca2fc95b4a..38e7ba31a6 100644 --- a/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java +++ b/java/sca/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java @@ -27,8 +27,8 @@ import org.apache.tuscany.sca.demos.aggregator.types.ConfigType; import org.apache.tuscany.sca.demos.aggregator.types.SourceType; import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory; import org.apache.tuscany.sca.demos.aggregator.types.impl.SourceTypeImpl; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import commonj.sdo.helper.HelperContext; import commonj.sdo.helper.XMLDocument; diff --git a/java/sca/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java b/java/sca/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java index bf919525c4..c984700efc 100644 --- a/java/sca/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java +++ b/java/sca/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java @@ -18,8 +18,8 @@ */ package bigbank.account.checking; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.annotation.Service; /** * @version $$Rev$$ $$Date$$ diff --git a/java/sca/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java b/java/sca/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java index 0ed4b1dd2e..d79cf373ee 100644 --- a/java/sca/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java +++ b/java/sca/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java @@ -21,7 +21,7 @@ package bigbank.account.checking; import java.util.HashMap; import java.util.Map; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * diff --git a/java/sca/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java b/java/sca/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java index 5bf6e6d26b..4a28b3f90b 100644 --- a/java/sca/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java +++ b/java/sca/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java @@ -18,7 +18,7 @@ */ package bigbank.account.savings; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $$Rev$$ $$Date$$ diff --git a/java/sca/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java b/java/sca/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java index 1f4f02ea6d..d93007279c 100644 --- a/java/sca/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java +++ b/java/sca/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java @@ -21,7 +21,7 @@ package bigbank.account.savings; import java.util.HashMap; import java.util.Map; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * diff --git a/java/sca/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java b/java/sca/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java index fcbf8a4831..da2e7940ca 100644 --- a/java/sca/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java +++ b/java/sca/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java @@ -18,7 +18,7 @@ */ package bigbank.account.stock; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * diff --git a/java/sca/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java b/java/sca/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java index 28101a1986..c3474a554f 100644 --- a/java/sca/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java +++ b/java/sca/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java @@ -21,7 +21,7 @@ package bigbank.account.stock; import java.util.HashMap; import java.util.Map; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * diff --git a/java/sca/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java index ed7bee0f4e..0b42a6ab1f 100644 --- a/java/sca/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of the Calculator service. diff --git a/java/sca/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java b/java/sca/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java index 2a0801f9b8..63c31bd116 100644 --- a/java/sca/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java +++ b/java/sca/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java @@ -18,7 +18,7 @@ */ package stockquote; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the StockQuote service. diff --git a/java/sca/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java b/java/sca/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java index 9d128657eb..a20f4e46dd 100644 --- a/java/sca/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java +++ b/java/sca/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java @@ -18,7 +18,7 @@ */ package stockquote; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the StockQuote service. diff --git a/java/sca/demos/bigbank/src/main/java/bigbank/account/AccountService.java b/java/sca/demos/bigbank/src/main/java/bigbank/account/AccountService.java index 2cb8027874..951cd175d3 100644 --- a/java/sca/demos/bigbank/src/main/java/bigbank/account/AccountService.java +++ b/java/sca/demos/bigbank/src/main/java/bigbank/account/AccountService.java @@ -18,7 +18,7 @@ */ package bigbank.account; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $$Rev$$ $$Date$$ diff --git a/java/sca/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/java/sca/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java index 4f0e3879dc..4cff2b7966 100644 --- a/java/sca/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java +++ b/java/sca/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java @@ -18,9 +18,9 @@ */ package bigbank.account; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; import stockquote.StockQuoteService; import bigbank.account.checking.CheckingAccountDetails; diff --git a/java/sca/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/java/sca/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java index 13d79a9c33..b8aff2a3b1 100644 --- a/java/sca/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java +++ b/java/sca/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java @@ -21,8 +21,8 @@ package bigbank.account.feed; import org.apache.tuscany.sca.data.collection.Collection; import org.apache.tuscany.sca.data.collection.Entry; import org.apache.tuscany.sca.data.collection.NotFoundException; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; import bigbank.account.AccountService; diff --git a/java/sca/demos/bigbank/src/main/java/stockquote/StockQuoteService.java b/java/sca/demos/bigbank/src/main/java/stockquote/StockQuoteService.java index 749b8ee2f4..5d3366ae00 100644 --- a/java/sca/demos/bigbank/src/main/java/stockquote/StockQuoteService.java +++ b/java/sca/demos/bigbank/src/main/java/stockquote/StockQuoteService.java @@ -18,7 +18,7 @@ */ package stockquote; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the StockQuote service. diff --git a/java/sca/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java b/java/sca/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java index efa89b4fe9..872893945e 100644 --- a/java/sca/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java +++ b/java/sca/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCANode2; import org.apache.tuscany.sca.node.SCANode2Factory; import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; public class LaunchClient { public static void main(String[] args) throws Exception { diff --git a/java/sca/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java index 65dc030d89..23beb7f933 100644 --- a/java/sca/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java +++ b/java/sca/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java b/java/sca/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java index 7245513b2a..513c2e3129 100644 --- a/java/sca/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java b/java/sca/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java index ec95a60227..26048de722 100644 --- a/java/sca/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java +++ b/java/sca/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java @@ -18,7 +18,7 @@ */ package credit; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CreditCheck { diff --git a/java/sca/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java b/java/sca/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java index f19e8a1250..20a0c5dd7f 100644 --- a/java/sca/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java +++ b/java/sca/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java @@ -18,7 +18,7 @@ */ package credit; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of the CreditReportService service diff --git a/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java b/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java index c5787b7819..2d830fdf7a 100644 --- a/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java +++ b/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java @@ -18,7 +18,7 @@ */ package mortgage; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * CreditCheck interface diff --git a/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java b/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java index dc803d9688..8f85bc7d9c 100644 --- a/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java +++ b/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java @@ -18,7 +18,7 @@ */ package mortgage; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * A pojo implementation of the CreditCheck service diff --git a/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java b/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java index 8c642667f1..e5d7a1f077 100644 --- a/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java +++ b/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java @@ -18,7 +18,7 @@ */ package mortgage; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(InterestRateQuote.class) public class InterestRateQuoteImpl implements InterestRateQuote { diff --git a/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java b/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java index 40bfdc4a1d..f211e1356c 100644 --- a/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java +++ b/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java @@ -18,9 +18,9 @@ */ package mortgage; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of the LoanApproval service. diff --git a/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java b/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java index cacd8694de..350b2c24ea 100644 --- a/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java +++ b/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java @@ -18,7 +18,7 @@ */ package mortgage; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The Mortgage Calculator service interface. diff --git a/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java b/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java index 015f1bae98..839e9e098c 100644 --- a/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java +++ b/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java @@ -18,7 +18,7 @@ */ package mortgage; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of the Calculator service. diff --git a/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java b/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java index c2116366ec..0e88093c61 100644 --- a/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java +++ b/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java @@ -19,7 +19,7 @@ package mortgage; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * A pojo implementation of RiskAssessment service diff --git a/java/sca/demos/workpool-distributed/src/main/java/workpool/MyWorker.java b/java/sca/demos/workpool-distributed/src/main/java/workpool/MyWorker.java index c45696e3cf..3d4df38c95 100644 --- a/java/sca/demos/workpool-distributed/src/main/java/workpool/MyWorker.java +++ b/java/sca/demos/workpool-distributed/src/main/java/workpool/MyWorker.java @@ -23,7 +23,7 @@ import org.apache.tuscany.sca.databinding.job.Job; import org.apache.tuscany.sca.databinding.job.JobDataMap; import org.apache.tuscany.sca.databinding.job.JobExecutionContext; import org.apache.tuscany.sca.databinding.job.RemoteJob; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; @Scope("COMPOSITE") public class MyWorker extends WorkerServiceImpl { diff --git a/java/sca/demos/workpool-distributed/src/main/java/workpool/Trigger.java b/java/sca/demos/workpool-distributed/src/main/java/workpool/Trigger.java index 469675b19b..52703d6954 100644 --- a/java/sca/demos/workpool-distributed/src/main/java/workpool/Trigger.java +++ b/java/sca/demos/workpool-distributed/src/main/java/workpool/Trigger.java @@ -20,7 +20,7 @@ package workpool; import org.apache.tuscany.sca.databinding.annotation.DataBinding; import org.apache.tuscany.sca.databinding.job.Job; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable @DataBinding("org.apache.tuscany.sca.databinding.job.Job") diff --git a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java index 520203e190..d2b306cbd5 100644 --- a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java +++ b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java @@ -17,8 +17,8 @@ * under the License. */ package workpool; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.CallableReference; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.CallableReference; @Remotable public interface WorkerManager { CallableReference addWorker(); diff --git a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java index d4337cad2f..9660a6c2b2 100644 --- a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java +++ b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java @@ -28,16 +28,16 @@ import org.apache.tuscany.sca.assembly.Composite; import org.apache.tuscany.sca.contribution.Contribution; import org.apache.tuscany.sca.contribution.DeployedArtifact; import org.apache.tuscany.sca.contribution.service.impl.ContributionServiceImpl; -import org.osoa.sca.CallableReference; +import org.oasisopen.sca.CallableReference; import org.apache.tuscany.sca.node.management.SCANodeManagerInitService; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.impl.SCANodeImpl; import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import java.util.LinkedList; import java.util.ArrayList; diff --git a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerService.java b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerService.java index 37b7ea227a..3f702db369 100644 --- a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerService.java +++ b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerService.java @@ -18,10 +18,10 @@ */ package workpool; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.OneWay; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.annotation.OneWay; import org.apache.tuscany.sca.core.context.CallableReferenceImpl; import org.apache.tuscany.sca.databinding.annotation.DataBinding; import org.apache.tuscany.sca.databinding.job.Job; diff --git a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java index 6fb1278e5e..22cfc38ff4 100644 --- a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java +++ b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java @@ -19,7 +19,7 @@ package workpool; import org.apache.tuscany.sca.databinding.job.Job; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface WorkerServiceCallback { diff --git a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java index 2c9bf5ea48..c38b27a6cf 100644 --- a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java +++ b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java @@ -18,14 +18,14 @@ */ package workpool; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import org.apache.tuscany.sca.core.context.CallableReferenceImpl; import org.apache.tuscany.sca.databinding.annotation.DataBinding; import org.apache.tuscany.sca.databinding.job.Job; diff --git a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java index 6520954bdd..46fbda7998 100644 --- a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java +++ b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java @@ -18,9 +18,9 @@ */ package workpool; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface WorkpoolManager { diff --git a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java index f7c727ad04..cf353fb3fe 100644 --- a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java +++ b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java @@ -18,8 +18,8 @@ */ package workpool; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; import java.util.Collections; import java.util.Enumeration; import java.io.IOException; @@ -44,7 +44,7 @@ import org.apache.tuscany.sca.databinding.job.Job; import org.apache.tuscany.sca.node.NodeManagerInitService; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.impl.SCANodeImpl; -import org.osoa.sca.CallableReference; +import org.oasisopen.sca.CallableReference; import org.drools.FactHandle; import org.drools.RuleBase; import org.drools.RuleBaseFactory; @@ -53,13 +53,13 @@ import org.drools.StatelessSession; import org.drools.compiler.DroolsParserException; import org.drools.compiler.PackageBuilder; import org.drools.rule.Package; -import org.osoa.sca.annotations.Constructor; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Destroy; -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.Constructor; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Destroy; +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 java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; diff --git a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java index d84ae549d8..239e5d145d 100644 --- a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java +++ b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java @@ -21,9 +21,9 @@ package workpool; import org.apache.tuscany.sca.core.context.CallableReferenceImpl; import org.apache.tuscany.sca.databinding.annotation.DataBinding; import org.apache.tuscany.sca.databinding.job.Job; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.ServiceReference; @DataBinding("org.apache.tuscany.sca.databinding.job.Job") @Remotable diff --git a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java index 52b88af42c..268edae530 100644 --- a/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java +++ b/java/sca/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java @@ -24,10 +24,10 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Logger; import org.apache.tuscany.sca.core.context.CallableReferenceImpl; import org.apache.tuscany.sca.databinding.annotation.DataBinding; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import org.apache.tuscany.sca.databinding.job.Job; import org.apache.tuscany.sca.databinding.job.JobDataMap; import java.util.concurrent.ConcurrentHashMap; diff --git a/java/sca/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java b/java/sca/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java index 1c0c612987..bb37b97fb8 100644 --- a/java/sca/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java +++ b/java/sca/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java @@ -25,7 +25,7 @@ import java.net.URL; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java b/java/sca/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java index 2ce1e86062..77af28d6cd 100644 --- a/java/sca/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java +++ b/java/sca/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java @@ -25,10 +25,10 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import org.apache.axiom.om.OMElement; -import org.osoa.sca.ServiceRuntimeException; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ServiceRuntimeException; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java b/java/sca/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java index bb8ff85f45..96f9e9bd18 100644 --- a/java/sca/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java +++ b/java/sca/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java @@ -19,7 +19,7 @@ package bigbank; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; import com.sun.syndication.feed.synd.SyndFeed; diff --git a/java/sca/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java b/java/sca/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java index fcb3707cfe..3b95f5240f 100644 --- a/java/sca/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java +++ b/java/sca/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java @@ -29,9 +29,9 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathFactory; -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 org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/java/sca/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java b/java/sca/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java index 26753a9e9e..7896cf7890 100644 --- a/java/sca/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java +++ b/java/sca/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java @@ -22,7 +22,7 @@ package bigbank; import javax.xml.stream.XMLStreamReader; import org.apache.axiom.om.OMElement; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/demos/xml-bigbank/src/main/java/bigbank/StockValue.java b/java/sca/demos/xml-bigbank/src/main/java/bigbank/StockValue.java index c300103398..6b9ab1f9a3 100644 --- a/java/sca/demos/xml-bigbank/src/main/java/bigbank/StockValue.java +++ b/java/sca/demos/xml-bigbank/src/main/java/bigbank/StockValue.java @@ -21,7 +21,7 @@ package bigbank; import javax.xml.stream.XMLStreamReader; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java index b3d2137767..f081537dab 100644 --- a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java +++ b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java @@ -1,6 +1,6 @@ package org.apache.tuscany.sca.itest.admin; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface MyListService { diff --git a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java index 025302fb6d..b4224e286e 100644 --- a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java +++ b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java @@ -1,6 +1,6 @@ package org.apache.tuscany.sca.itest.admin; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface MyListServiceByYear { diff --git a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java index de480e6d85..550303d856 100644 --- a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java +++ b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java @@ -3,9 +3,9 @@ package org.apache.tuscany.sca.itest.admin; import java.util.List; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; import org.apache.tuscany.sca.itest.admin.MyListService; import org.apache.tuscany.sca.itest.admin.MyListServiceByYear; diff --git a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java index bd820884e7..344d0cb6b5 100644 --- a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java +++ b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java @@ -2,7 +2,7 @@ package org.apache.tuscany.sca.itest.admin; import java.util.Date; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface MyServiceByDate { diff --git a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java index fa2720001b..9789726156 100644 --- a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java +++ b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java @@ -2,11 +2,11 @@ package org.apache.tuscany.sca.itest.admin; import java.util.Date; -import org.osoa.sca.annotations.ComponentName; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ComponentName; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; import org.apache.tuscany.sca.itest.admin.MyListService; import org.apache.tuscany.sca.itest.admin.MyListServiceByYear; import org.apache.tuscany.sca.itest.admin.MyLogger; diff --git a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java index d712662cb3..dbb190beee 100644 --- a/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java +++ b/java/sca/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java @@ -3,9 +3,9 @@ package org.apache.tuscany.sca.itest.admin; import java.util.Date; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; -import org.osoa.sca.annotations.ComponentName; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; +import org.oasisopen.sca.annotation.ComponentName; import org.apache.tuscany.sca.itest.admin.MyListService; import org.apache.tuscany.sca.itest.admin.MyListServiceByYear; import org.apache.tuscany.sca.itest.admin.MyService; diff --git a/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java b/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java index d1b4ecbd15..3a546dcf72 100644 --- a/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java +++ b/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java @@ -19,7 +19,7 @@ package itest; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class MyClientImpl implements MyService { diff --git a/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyService.java b/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyService.java index e5123f087c..b1daa53c86 100644 --- a/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyService.java +++ b/java/sca/itest/binding-sca-jms/client/src/main/java/itest/MyService.java @@ -19,7 +19,7 @@ package itest; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface MyService { diff --git a/java/sca/itest/binding-sca-jms/service/src/main/java/itest/MyService.java b/java/sca/itest/binding-sca-jms/service/src/main/java/itest/MyService.java index e5123f087c..b1daa53c86 100644 --- a/java/sca/itest/binding-sca-jms/service/src/main/java/itest/MyService.java +++ b/java/sca/itest/binding-sca-jms/service/src/main/java/itest/MyService.java @@ -19,7 +19,7 @@ package itest; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface MyService { diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java index 532b84bd22..d7dff093f9 100644 --- a/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java +++ b/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java @@ -18,7 +18,7 @@ */ package greetings; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java index 86d7f245e8..5ecf5494be 100644 --- a/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java +++ b/java/sca/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java @@ -18,7 +18,7 @@ */ package greetings; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java index 672dbdc0b5..f46893481b 100644 --- a/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for the helloworld service diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java index d7ebd5cbb8..a687534bb2 100644 --- a/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java +++ b/java/sca/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java @@ -20,7 +20,7 @@ package helloworld; import greetings.GreetingsService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * The HelloWorld service implementation diff --git a/java/sca/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/java/sca/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java index ffdbc50a22..0999e97065 100644 --- a/java/sca/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java +++ b/java/sca/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java @@ -20,7 +20,7 @@ package helloworld; import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/java/sca/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java index ffdbc50a22..0999e97065 100644 --- a/java/sca/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java +++ b/java/sca/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java @@ -20,7 +20,7 @@ package helloworld; import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java index 932ae3987a..fb23a4e60f 100644 --- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java +++ b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.itest.builder; import java.util.List; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * Implementation class for ComponentD. diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java index f9ef0a1b4f..5ee020e181 100644 --- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java +++ b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.itest.builder; import java.util.List; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * Implementation class for ComponentD. diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java index c041a76b47..2d8a37d5f0 100644 --- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java +++ b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.builder; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * Implementation class for ComponentD. diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java index ccfeff0997..4fdaac1fb1 100644 --- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java +++ b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.builder; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * Implementation class for ComponentD. diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java index 9a775feec9..1feb08b876 100644 --- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java +++ b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.builder; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * Interface for Service3 in ComponentD. diff --git a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java index 98a1741fb6..3a872376ea 100644 --- a/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java +++ b/java/sca/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.builder; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * Interface for Service3a in ComponentD. diff --git a/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java b/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java index c46087d865..9a486b3be0 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java @@ -18,13 +18,13 @@ */ package com.example; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(ExampleClient.class) @Scope("COMPOSITE") diff --git a/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java b/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java index 670c145cc3..9264def0dc 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java @@ -18,9 +18,9 @@ */ package com.example; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface ExampleService { diff --git a/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java b/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java index eb4d647a22..22aecc8b27 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java @@ -18,8 +18,8 @@ */ package com.example; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ServiceReference; public class ExampleServiceImpl implements ExampleService { diff --git a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java index bb5e57397d..6ecf3d662e 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.callablerefwsreturn; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Alpha { diff --git a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java index 6e5f1cedf9..64a11f0bf3 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java @@ -18,13 +18,13 @@ */ package org.apache.tuscany.sca.itest.callablerefwsreturn; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.Conversation; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.Conversation; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(Alpha.class) @Scope("COMPOSITE") diff --git a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java index 995e4fcf39..9861b0a85e 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.callablerefwsreturn; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Beta { diff --git a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java index be72fd779e..c870cd87fe 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java @@ -18,13 +18,13 @@ */ package org.apache.tuscany.sca.itest.callablerefwsreturn; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(Beta.class) @Scope("COMPOSITE") diff --git a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java index b73f26b573..ee9d0f0b26 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.callablerefwsreturn; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; +import org.oasisopen.sca.annotation.Remotable; @Remotable @Conversational diff --git a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java index c3abc4c65d..9a4f31d79d 100644 --- a/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java +++ b/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.callablerefwsreturn; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(Gamma.class) @Scope("CONVERSATION") diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java index 5934f16851..33783be887 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.callableref; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface AComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java index 7c2fd092dc..f99051cd5f 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java @@ -22,12 +22,12 @@ import java.io.ByteArrayOutputStream; import java.io.ObjectOutputStream; import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(AComponent.class) public class AComponentImpl implements AComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java index ade672b0ab..1cf3029d82 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.callableref; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface BComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java index 518e77d3a8..084572b6e5 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.callableref; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Service; @Service(BComponent.class) public class BComponentImpl implements BComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java index fdf80cc1c8..059f42c4d3 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.callableref; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java index cc8ec8f000..76fdd61191 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.callableref; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(CComponent.class) public class CComponentImpl implements CComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java index 48b697df31..8b2988b700 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.callableref; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface DComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java index 27ad48b9fe..a43b3818c5 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java @@ -24,10 +24,10 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary; -import org.osoa.sca.CallableReference; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Service; @Service(DComponent.class) public class DComponentImpl implements DComponent { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java index abcedfa6e1..33bc49e4d8 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.callablerefconversational; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Conversational; /** * Simple conversational Service that is used to testing the method diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java index f2e0ce7582..36bafba562 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java @@ -18,12 +18,12 @@ */ package org.apache.tuscany.sca.itest.callablerefconversational; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Simple conversational Service that is used to testing the method diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java index ab21421c4d..bf5a2e65cc 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.callablerefreturn; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Alpha diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java index 5b5984b164..59fed12279 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java @@ -18,12 +18,12 @@ */ package org.apache.tuscany.sca.itest.callablerefreturn; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.Conversation; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.Conversation; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; @Scope("COMPOSITE") public class AlphaImpl implements Alpha { diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java index 223c467f47..b8dd1c5640 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.callablerefreturn; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Beta diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java index ed4e66bec3..8425425c16 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java @@ -18,12 +18,12 @@ */ package org.apache.tuscany.sca.itest.callablerefreturn; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; @Scope("COMPOSITE") public class BetaImpl implements Beta diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java index e32051373f..445fb7bf7f 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.callablerefreturn; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; +import org.oasisopen.sca.annotation.Remotable; @Remotable @Conversational diff --git a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java index adf5a1c1ce..0670629bae 100644 --- a/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java +++ b/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.callablerefreturn; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; @Scope("CONVERSATION") public class GammaImpl implements Gamma diff --git a/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java b/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java index a9cbb5d0a1..fb3a5d79b9 100644 --- a/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java +++ b/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java @@ -25,7 +25,7 @@ import org.apache.tuscany.sca.itest.callablerefconversational.ConversationalServ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.ServiceReference; /** * Simple test case that creates a ServiceReference to a Conversational Component diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java index 11996c82d7..b013462f9f 100644 --- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java +++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable /** diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java index 71709410b6..252e4dc45f 100644 --- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java +++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CallBackApiClient { diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java index e5526f6745..d883dc2d6f 100644 --- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java +++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.test; import org.junit.Assert; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(CallBackApiClient.class) public class CallBackApiClientImpl implements CallBackApiClient, CallBackApiCallBack { diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java index cef9418988..afb7c45e2c 100644 --- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java +++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; @Remotable @Callback(CallBackApiCallBack.class) diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java index 42ca10aa2d..bdac56d222 100644 --- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java +++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java @@ -18,12 +18,12 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Service; @Service(CallBackApiService.class) public class CallBackApiServiceImpl implements CallBackApiService { diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java index c1fb05c036..291a72b9d6 100644 --- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java +++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable /** diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java index fbda3a6d9f..19f366c423 100644 --- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java +++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CallBackBasicClient { diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java index 5cb87510b8..4bb6b29a8d 100644 --- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java +++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.test; import org.junit.Assert; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(CallBackBasicClient.class) public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBasicCallBack { diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java index 5b3bacd1a2..5396879e83 100644 --- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java +++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; @Remotable @Callback(CallBackBasicCallBack.class) diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java index 83b909ef37..07010f61e1 100644 --- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java +++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; @Service(CallBackBasicService.class) public class CallBackBasicServiceImpl implements CallBackBasicService { diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java index e8ab5c8205..627d37e27d 100644 --- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java +++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable /** diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java index 9f2af0f3dc..966ad17b9a 100644 --- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java +++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CallBackCTypeClient { diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java index afccce516e..d2dc0add75 100644 --- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java +++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.test; import org.junit.Assert; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(CallBackCTypeClient.class) public class CallBackCTypeClientImpl implements CallBackCTypeClient, CallBackCTypeCallBack { diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java index d3e207de18..e3fb7d6238 100644 --- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java +++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable // @Callback(CallBackCTypeCallBack.class) diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java index 5691b9d747..f7a1a195ed 100644 --- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java +++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; @Service(CallBackCTypeService.class) public class CallBackCTypeServiceImpl implements CallBackCTypeService { diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java index 2c90dfa84d..643cb3beb8 100644 --- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java +++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable /** diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java index cd1461b3c6..6e5a0c7654 100644 --- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java +++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CallBackIdClient { diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java index 4c57a433cd..aaf99a534b 100644 --- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java +++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java @@ -19,12 +19,12 @@ package org.apache.tuscany.sca.test; import org.junit.Assert; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(CallBackIdClient.class) public class CallBackIdClientImpl implements CallBackIdClient, CallBackIdCallBack { diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java index a0231ce458..cc7907f6ae 100644 --- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java +++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; @Remotable @Callback(CallBackIdCallBack.class) diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java index d21767167c..4f04959b9d 100644 --- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java +++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java @@ -18,11 +18,11 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Service; @Service(CallBackIdService.class) public class CallBackIdServiceImpl implements CallBackIdService { diff --git a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java index df91f3d268..0fe34b9d68 100644 --- a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java +++ b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.test.callback; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Demonstrates a component-to-component callback invocation diff --git a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java index a0a9564002..6b455a1f5b 100644 --- a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java +++ b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.test.callback; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Demonstrates a component-to-component callback invocation diff --git a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java index cfd601f546..66758a1e73 100644 --- a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java +++ b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.test.callback; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.OneWay; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.OneWay; /** * This service that will be invoked in a non-blocking fashion diff --git a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java index 856fbc4bde..49df5aa17a 100644 --- a/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java +++ b/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java @@ -18,10 +18,10 @@ */ package org.apache.tuscany.sca.test.callback; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * This class implements MyService and uses a callback. diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java index f812a39058..dc66003604 100644 --- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java +++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the client interface for the call backs in a separate thread tests diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java index c6cc285bcc..f03144db8a 100644 --- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java +++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java @@ -22,8 +22,8 @@ package org.apache.tuscany.sca.itest; import java.util.concurrent.atomic.AtomicInteger; import org.junit.Assert; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This is the client implementation for the call backs in a separate thread tests diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java index 3f86d14059..137ea6a658 100644 --- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java +++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The call back interface for the EventProcessorService that is implemented diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java index 127c63eb9e..a00578427c 100644 --- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java +++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java @@ -19,9 +19,9 @@ package org.apache.tuscany.sca.itest; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.Remotable; /** * Sample Event Processor Service diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java index 5c14dc9659..692ffbe8dd 100644 --- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java +++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java @@ -25,11 +25,11 @@ import java.util.TimerTask; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Sample Event Processor Service Implementation diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java index 8012fceb98..e54b9b4004 100644 --- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java +++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Callback; +import org.oasisopen.sca.annotation.Callback; // @Remotable @Callback(CallBackSetCallbackCallback.class) diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java index 0a22b0e01f..3e72b7ef3c 100644 --- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java +++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.test; import java.io.File; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(CallBackSetCallbackCallback.class) public class CallBackSetCallbackCallbackImpl implements CallBackSetCallbackCallback { diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java index 1161a5bf40..6fd13eec5f 100644 --- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java +++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CallBackSetCallbackClient { diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java index 98eb44de84..08c8b94a2f 100644 --- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java +++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java @@ -21,10 +21,10 @@ package org.apache.tuscany.sca.test; import java.io.File; import org.junit.Assert; -import org.osoa.sca.NoRegisteredCallbackException; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.NoRegisteredCallbackException; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(CallBackSetCallbackClient.class) public class CallBackSetCallbackClientImpl implements CallBackSetCallbackClient { diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java index 4ec37f0d8b..78bc793c81 100644 --- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java +++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java @@ -18,12 +18,12 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Service; @Service(CallBackSetCalbackService.class) public class CallBackSetCallbackServiceImpl implements CallBackSetCalbackService { diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java index b2096b28e7..825d1d6486 100644 --- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java +++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.annotation.Conversational; // @Remotable @Conversational diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java index 2a5fcd9bb2..b5c3e6e8b8 100644 --- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java +++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CallBackSetCallbackConvClient { diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java index 35f64d1344..12a206affa 100644 --- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java +++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java @@ -19,12 +19,12 @@ package org.apache.tuscany.sca.test; import org.junit.Assert; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(CallBackSetCallbackConvClient.class) @Scope("CONVERSATION") diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java index 7a7b47d04e..74c19961ba 100644 --- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java +++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.test; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Conversational; // @Remotable @Conversational diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java index 5532943943..d79b9278e2 100644 --- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java +++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java @@ -20,13 +20,13 @@ package org.apache.tuscany.sca.test; import java.io.File; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(CallBackSetCallbackConvService.class) @Scope("CONVERSATION") diff --git a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java index 814c38777a..8cadb2420e 100644 --- a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java +++ b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java @@ -18,7 +18,7 @@ */ package supplychain.customer; -import org.osoa.sca.annotations.OneWay; +import org.oasisopen.sca.annotation.OneWay; /** * This is the business interface of the Customer service component. diff --git a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java index e4daf0ec02..6a4bb82953 100644 --- a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java @@ -18,9 +18,9 @@ */ package supplychain.customer; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.retailer.Retailer; diff --git a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java index e4b3bc7048..3c88ac9272 100644 --- a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java +++ b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java @@ -18,9 +18,9 @@ */ package supplychain.illegal; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.customer.Customer; import supplychain.retailer.JavaRetailerComponentImpl; diff --git a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java index 698aa2aa5d..e8342ee7b9 100644 --- a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.retailer; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.warehouse.Warehouse; diff --git a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java index 9e01f00a79..cf016617a6 100644 --- a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java +++ b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.shipper; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.customer.Customer; diff --git a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java index cdd12d589d..e81a11e55a 100644 --- a/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java +++ b/java/sca/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java @@ -18,7 +18,7 @@ */ package supplychain.warehouse; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; import supplychain.shipper.Shipper; diff --git a/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java index b123951ef6..9918ce8fca 100644 --- a/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java +++ b/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java @@ -36,7 +36,7 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.ServiceReference; /* * diff --git a/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java index e65422136f..32b024bccb 100644 --- a/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java +++ b/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java @@ -18,7 +18,7 @@ */ package hello; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the Hello service. diff --git a/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java index 5369c18497..0c60e62d35 100644 --- a/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java +++ b/java/sca/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java @@ -18,7 +18,7 @@ */ package hello; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java index 74d22ed830..134da7e34b 100644 --- a/java/sca/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java index 966f56d7d5..05bd7b7138 100644 --- a/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java +++ b/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java @@ -20,8 +20,8 @@ package helloworld; import hello.Hello; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java index 74d22ed830..134da7e34b 100644 --- a/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java index 4cdcc1fd0b..2186c00e57 100644 --- a/java/sca/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java +++ b/java/sca/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java index 4cdcc1fd0b..2186c00e57 100644 --- a/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java +++ b/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java index 74d22ed830..134da7e34b 100644 --- a/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/java/sca/itest/contribution-multiple/src/test/java/hello/HelloImpl.java index ff9f6e75f3..7cd950453d 100644 --- a/java/sca/itest/contribution-multiple/src/test/java/hello/HelloImpl.java +++ b/java/sca/itest/contribution-multiple/src/test/java/hello/HelloImpl.java @@ -18,7 +18,7 @@ */ package hello; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/java/sca/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java index c062afaed0..e90d10dc24 100644 --- a/java/sca/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java +++ b/java/sca/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java @@ -20,8 +20,8 @@ package helloworld; import hello.Hello; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java index ae4ed12b7b..d3fa7a8f41 100644 --- a/java/sca/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java index 53dadc3dc7..b6c694c8a9 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.annotation.Conversational; @Conversational public interface ConversationIdService { diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java index cb7a032e85..b6645aec23 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; +import org.oasisopen.sca.annotation.Remotable; /** diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java index 2532346349..772602568c 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The client for the conversational itest. Is implemented by clients diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java index 8f008fa711..481ed7b388 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Remotable; /** * The client that calls into an existing conversation by accepting diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java index 1e36ce6917..c9d46b9072 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java @@ -18,10 +18,10 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; +import org.oasisopen.sca.annotation.Remotable; /** diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java index b4d3fe3d71..b46cb831df 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java @@ -18,10 +18,10 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; +import org.oasisopen.sca.annotation.Remotable; /** diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java index ed3a01c10b..4c3809676c 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java index 1603916cca..2d048a76b5 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java @@ -21,9 +21,9 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.BusinessException; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(ConversationalService.class) @Scope("CONVERSATION") diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java index accc1eee27..34b8fbe9d0 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java @@ -20,9 +20,9 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.ConversationIdService; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(ConversationIdService.class) @Scope("CONVERSATION") diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java index 90f6de86ac..0d3ca8d350 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java @@ -21,9 +21,9 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.BusinessException; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(ConversationalService.class) @Scope("CONVERSATION") diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java index 3f7a90b3dc..db3bcabe02 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java @@ -23,15 +23,15 @@ import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; import org.apache.tuscany.sca.itest.conversational.ConversationalClient; import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * The client for the conversational itest which presents a stateful diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java index ab91498132..e25f367cf6 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java @@ -23,15 +23,15 @@ import org.apache.tuscany.sca.itest.conversational.ConversationalClient; import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; import org.apache.tuscany.sca.itest.conversational.ConversationalService; import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * The client for the conversational itest which presents a stateful diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java index e4f83656de..3ac259ed7c 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java @@ -23,13 +23,13 @@ import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; import org.apache.tuscany.sca.itest.conversational.ConversationalClient; import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * The client for the conversational itest which presents a stateful diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java index 8fe7c5b6ba..1abe9e51c3 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Service; /** * A client component that accepts a reference to an ongoing conversation diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java index 9f4857f703..fc485b6c4b 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java @@ -23,12 +23,12 @@ import java.util.HashMap; import org.apache.tuscany.sca.itest.conversational.BusinessException; import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java index 4b06251414..a783e79cae 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java @@ -21,13 +21,13 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.BusinessException; import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java index be039748fc..5f34de66b3 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java @@ -21,13 +21,13 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.BusinessException; import org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback; import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java index 42f2f1a603..02a2fb1d4d 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java @@ -23,11 +23,11 @@ import java.util.HashMap; import org.apache.tuscany.sca.itest.conversational.BusinessException; import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Service; /** diff --git a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java index a852aeda56..4550e3eaa1 100644 --- a/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java +++ b/java/sca/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java @@ -24,8 +24,8 @@ import java.util.Map; import org.apache.tuscany.sca.itest.conversational.BusinessException; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Service; @Service(ConversationalService.class) public class ConversationalServiceStatelessScopeImpl implements ConversationalService { diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java index e7583c339a..27939e3996 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.annotation.Conversational; /** * Simple conversational Service that uses another Conversational Service diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java index bc4a5fc571..7887417e55 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java index eeb7aa98e2..735bcee176 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.annotation.Conversational; /** * Simple conversational Service diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java index e422938b27..1c5d2cdbb8 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java index e8887071c3..cebbea0701 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.annotation.Conversational; /** * Simple conversational Service that uses another Conversational Service diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java index f0f5ac041d..9ca4abb9d3 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.annotation.Conversational; @Conversational public interface ConversationIdService { diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java index fff6320e76..734fb9fe7b 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; +import org.oasisopen.sca.annotation.Remotable; /** * The callback interface used when testing conversational callbacks diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java index d9d989c830..99f4c85d8f 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The client for the conversational itest. Is implemented by clients diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java index 3de73e4f42..fb4ecb56e7 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Remotable; /** * The client that calls into an existing conversation by accepting diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java index 2aba0799bc..21a4db737e 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java @@ -18,10 +18,10 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; +import org.oasisopen.sca.annotation.Remotable; /** * The service interface used when testing conversations diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java index 9fb4a0b473..48c1644b87 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java @@ -18,10 +18,10 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; +import org.oasisopen.sca.annotation.Remotable; /** * The service interface used when testing conversations diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java index e7295a6aee..2c205c2cae 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; /** * Simple conversational Service diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java index 5f97b16088..48c203ab35 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java @@ -19,9 +19,9 @@ package org.apache.tuscany.sca.itest.conversational; import org.apache.tuscany.sca.itest.Record; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java index d356b7d20a..614c0a96b5 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.conversational; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The callback interface used when testing conversational callbacks diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java index 3b71679675..86a96aaa75 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java @@ -21,10 +21,10 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.AService; import org.apache.tuscany.sca.itest.conversational.BService; import org.apache.tuscany.sca.itest.conversational.Constants; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Simple conversational Service that uses another Conversational Service diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java index 1a3cc562d6..b56186ea88 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java @@ -23,12 +23,12 @@ import org.apache.tuscany.sca.itest.TestResult; import org.apache.tuscany.sca.itest.conversational.Alpha; import org.apache.tuscany.sca.itest.conversational.Beta; import org.apache.tuscany.sca.itest.conversational.Gamma; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java index fd3734a953..f394770ffc 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java @@ -20,9 +20,9 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.BService; import org.apache.tuscany.sca.itest.conversational.Constants; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Simple conversational Service diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java index e2bca68220..b94e8a6452 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java @@ -20,13 +20,13 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.Beta; import org.apache.tuscany.sca.itest.conversational.Gamma; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java index d13ff53350..737c2940dd 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java @@ -20,10 +20,10 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.CService; import org.apache.tuscany.sca.itest.conversational.DService; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Simple conversational Service that uses another Conversational Service diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java index 8dccf41820..8f2736ad2d 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java @@ -20,9 +20,9 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(ConversationalService.class) @Scope("CONVERSATION") diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java index efbae3ad16..8b3a8663d8 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java @@ -20,9 +20,9 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.ConversationIdService; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(ConversationIdService.class) @Scope("CONVERSATION") diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java index 0604d0ca98..ae8bee8040 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java @@ -20,9 +20,9 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(ConversationalService.class) @Scope("CONVERSATION") diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java index 08d618018d..3784dfd53e 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java @@ -22,15 +22,15 @@ import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; import org.apache.tuscany.sca.itest.conversational.ConversationalClient; import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * The client for the conversational itest which presents a stateful diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java index 7dbf7bcd3e..137dfc4108 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java @@ -22,15 +22,15 @@ import org.apache.tuscany.sca.itest.conversational.ConversationalClient; import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; import org.apache.tuscany.sca.itest.conversational.ConversationalService; import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * The client for the conversational itest which presents a stateful diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java index ddfed4519f..c9c5138515 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java @@ -22,13 +22,13 @@ import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; import org.apache.tuscany.sca.itest.conversational.ConversationalClient; import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * The client for the conversational itest which presents a stateful diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java index 14487dcf69..134ffda75d 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Service; /** * A client component that accepts a reference to an ongoing conversation diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java index ee24fca53d..73a6d7d27e 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java @@ -22,12 +22,12 @@ import java.util.HashMap; import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * The service used when testing stateful conversations diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java index cf95cc83f3..5bafa5e075 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java @@ -20,13 +20,13 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * The service used when testing stateful conversations diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java index ebb474e3fe..8d63ebbbef 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java @@ -20,13 +20,13 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback; import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * The service used when testing stateful conversations diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java index cc02d048b6..ecf108c656 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java @@ -22,12 +22,12 @@ import java.util.HashMap; import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * The service used when testing stateful conversations diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java index 3abeda9ba3..ee09e99f1b 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java @@ -23,8 +23,8 @@ import java.util.HashMap; import java.util.Map; import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Service; @Service(ConversationalService.class) public class ConversationalServiceStatelessScopeImpl implements ConversationalService { diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java index 610a81aaa8..ad0c1fb7da 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java @@ -19,9 +19,9 @@ package org.apache.tuscany.sca.itest.conversational.impl; import org.apache.tuscany.sca.itest.conversational.DService; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Simple conversational Service diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java index 67305698f1..55390189cf 100644 --- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java +++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java @@ -22,9 +22,9 @@ import java.util.ArrayList; import org.apache.tuscany.sca.itest.Record; import org.apache.tuscany.sca.itest.conversational.Gamma; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java index 58afba0d10..a686754d3a 100644 --- a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java +++ b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java @@ -27,7 +27,7 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.osoa.sca.ConversationEndedException; +import org.oasisopen.sca.ConversationEndedException; public class ConversationalAgeTestCase { diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java index 4f6eacc9ff..1bc2156183 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.corba.types; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java index a3be6daa23..a198eaf646 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.corba.types; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java index aec0f7b1bf..aa2f06909b 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.test.corba.types; import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java index 04aef326af..c7569720f0 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.corba.types; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java index 30e4e2994a..1813de4e67 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java @@ -24,7 +24,7 @@ import org.apache.tuscany.sca.test.corba.generated.ScenarioOne; import org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations; import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; import org.apache.tuscany.sca.test.corba.generated.WrongColor; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java index a4f15488cd..ac7b0af175 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.test.corba.types; import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; import org.apache.tuscany.sca.test.corba.generated.WrongColor; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java index 7d43badb23..13bc1d499e 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.corba.types; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java index 917cceedf5..12b0f404ae 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.corba.types; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java index d7c72b40da..937d82b33e 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.corba.types; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm index b2346aa973..db24ceab14 100644 --- a/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm +++ b/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm @@ -22,8 +22,8 @@ package $template.getJavaPackage(); import junit.framework.TestCase; import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; import ${template.getJavaPackage()}.GreeterService; diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm index 77a12e92ec..2df4a558e6 100644 --- a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm +++ b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm @@ -26,7 +26,7 @@ import $file.getJavaPackage().$typeInstance.getTypeName(); #end #end -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The automatically generated interface to the service that reflects data objects diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm index ee73db6152..b73173247f 100644 --- a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm +++ b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm @@ -26,7 +26,7 @@ import $file.getJavaPackage().$typeInstance.getTypeName(); #end #end -import org.osoa.sca.annotations.AllowsPassByReference; +import org.oasisopen.sca.annotation.AllowsPassByReference; /** * GreeterServiceClient diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm index aab564dc1e..46c74ec819 100644 --- a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm +++ b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm @@ -19,8 +19,8 @@ package $template.getJavaPackage(); -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; #foreach($file in $fileList) #set($typeList = $file.getType_()) diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm index 5507a0b747..2fd10ef0bf 100644 --- a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm +++ b/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm @@ -26,7 +26,7 @@ import $file.getJavaPackage().$typeInstance.getTypeName(); #end #end -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * The automatically generated service implementation that reflects data objects diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java index 7f9b62f9b4..5d389643cc 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.databindings.jaxb; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for AClientService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java index 1762812c1f..52f1c01fd8 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.itest.databindings.jaxb; import javax.jws.soap.SOAPBinding; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for AService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java index 12ed7d0ec7..be446c9759 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.databindings.jaxb; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for GenericsService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java index 34ac9024f6..df9e6e53ec 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.databindings.jaxb; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for HelloServiceSimple. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java index c5553688e2..690a2adb3d 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.databindings.jaxb; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for PrimitivesService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java index 2842205085..3b9690b7d2 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.databindings.jaxb; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java index 8b484e93f0..2f3bd3f2cb 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.AClientService; import org.apache.tuscany.sca.itest.databindings.jaxb.AService; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements AService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java index 4a35d41c04..078be8896e 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.AService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements AService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java index 9e042ffe6a..4d451e6d32 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java @@ -24,8 +24,8 @@ import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2; import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3; import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService; import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of GenericsLocalServiceClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java index ec929ddece..d520e64881 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService; import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of GenericsServiceClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java index 58808eec4f..27dc25289e 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java @@ -24,7 +24,7 @@ import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2; import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3; import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService; import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of GenericsService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java index 51e48edbc9..37b3f1b680 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java @@ -26,8 +26,8 @@ import java.util.Map; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimpleClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of HelloServiceSimpleClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java index de52cdfac3..44b6e9d906 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimpleClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of HelloServiceSimpleClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java index 199335c38c..5c389bf67f 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java @@ -26,7 +26,7 @@ import java.util.Map; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of HelloServiceSimple. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java index fe9121be9d..eea19521c4 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of PrimitivesLocalServiceClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java index 28ace6aab7..263d1212ca 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of PrimitivesServiceClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java index ab1a3b4ab8..9e14140752 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of PrimitivesService. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java index 0a8f6772b5..3ceee3c4b1 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java @@ -35,8 +35,8 @@ import javax.xml.transform.Source; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of StandardTypesLocalServiceClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java index 626b0e9844..6aefb05c83 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of StandardTypesServiceClient. diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java index 19a6cae01b..42fb9cbac2 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java @@ -35,7 +35,7 @@ import javax.xml.transform.Source; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of StandardTypesService. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java index 352f805c7d..ab2d9630eb 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for HelloService. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java index 8c0fb24da9..ac6c8d5a60 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.databindings.jaxb; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for PrimitivesService. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java index 4be057fe68..1f3b7ec633 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java @@ -32,7 +32,7 @@ import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import javax.xml.transform.Source; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java index c4026fdb9a..61449c8981 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java @@ -26,8 +26,8 @@ import java.util.Map; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloService; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of HelloServiceClient. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java index fc2dc64b7d..c0868f0146 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of HelloService. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java index ef1a907b29..e55d2527f4 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of PrimitivesServiceClient. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java index e60ae41767..72ff27b85e 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.impl; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of PrimitivesService. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java index 8803eb262a..b3d3c3eb3a 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java @@ -35,8 +35,8 @@ import javax.xml.transform.Source; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * An implementation of StandardTypesServiceClient. diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java index 46569311ff..b58d04a04c 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java @@ -34,7 +34,7 @@ import javax.xml.namespace.QName; import javax.xml.transform.Source; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of StandardTypesService. diff --git a/java/sca/itest/definitions-multiple/src/main/java/calculator/AddService.java b/java/sca/itest/definitions-multiple/src/main/java/calculator/AddService.java index 3e56bf3fad..198a38b657 100644 --- a/java/sca/itest/definitions-multiple/src/main/java/calculator/AddService.java +++ b/java/sca/itest/definitions-multiple/src/main/java/calculator/AddService.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.annotation.Service; /** * The Add service interface diff --git a/java/sca/itest/definitions-multiple/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/itest/definitions-multiple/src/main/java/calculator/CalculatorServiceImpl.java index c4cb5ad9d2..b4a797e597 100644 --- a/java/sca/itest/definitions-multiple/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/itest/definitions-multiple/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/itest/definitions-multiple/src/main/java/calculator/DivideService.java b/java/sca/itest/definitions-multiple/src/main/java/calculator/DivideService.java index f72b05cece..8f4c675370 100644 --- a/java/sca/itest/definitions-multiple/src/main/java/calculator/DivideService.java +++ b/java/sca/itest/definitions-multiple/src/main/java/calculator/DivideService.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.annotation.Service; /** * The divide service interface diff --git a/java/sca/itest/domain/src/main/java/calculator/AddService.java b/java/sca/itest/domain/src/main/java/calculator/AddService.java index 797ebb4024..138213b5fc 100644 --- a/java/sca/itest/domain/src/main/java/calculator/AddService.java +++ b/java/sca/itest/domain/src/main/java/calculator/AddService.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The Add service interface diff --git a/java/sca/itest/domain/src/main/java/calculator/CalculatorService.java b/java/sca/itest/domain/src/main/java/calculator/CalculatorService.java index 2718ab8772..12d80ffd1c 100644 --- a/java/sca/itest/domain/src/main/java/calculator/CalculatorService.java +++ b/java/sca/itest/domain/src/main/java/calculator/CalculatorService.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** diff --git a/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java index 3cb255843f..6250563a09 100644 --- a/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/itest/domain/src/main/java/calculator/SubtractService.java b/java/sca/itest/domain/src/main/java/calculator/SubtractService.java index 615320e670..be3f1a61fc 100644 --- a/java/sca/itest/domain/src/main/java/calculator/SubtractService.java +++ b/java/sca/itest/domain/src/main/java/calculator/SubtractService.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for the multiply service diff --git a/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java index 4f4fe50041..ffef7a4d71 100644 --- a/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java +++ b/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.test.exceptions.impl.jaxb.ObjectFactory; import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest; import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer; import org.apache.tuscany.sca.test.exceptions.impl.jaxb.TestNotDeclaredAtSourceFault; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * JAXB version of StockExceptionTest impl diff --git a/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java index 842dd4e602..1147b4c715 100644 --- a/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java +++ b/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java @@ -24,8 +24,8 @@ import java.rmi.RemoteException; import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException; import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException; import org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; import stockexceptiontestservice.scatesttool.ScatesttoolFactory; import stockexceptiontestservice.scatesttool.StockOffer; diff --git a/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java index ab65efbb58..4ee01fa303 100644 --- a/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java +++ b/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java @@ -24,7 +24,7 @@ */ package org.apache.tuscany.sca.test.exceptions.sdohandgen; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; import stockexceptiontestservice.scatesttool.StockOffer; diff --git a/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java index fc49fa1d7d..3e9febb6bc 100644 --- a/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java +++ b/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java @@ -23,7 +23,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.host.embedded.SCADomain; import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO; import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; import stockexceptiontestservice.scatesttool.InvalidSymbolFault; import stockexceptiontestservice.scatesttool.StockOffer; diff --git a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java index f5e36db7cd..456cf07116 100644 --- a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java +++ b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.test.exceptions.impl; import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * diff --git a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java index 65751175fb..ed2a287bcc 100644 --- a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java +++ b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java @@ -25,7 +25,7 @@ import org.apache.tuscany.sca.test.exceptions.impl.jaxb.MarketClosedFault; import org.apache.tuscany.sca.test.exceptions.impl.jaxb.ObjectFactory; import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer; import org.apache.tuscany.sca.test.exceptions.impl.jaxb.TestNotDeclaredAtSourceFault; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * diff --git a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java index e84ae633e7..32ba65bd6b 100644 --- a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java +++ b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java @@ -24,8 +24,8 @@ import java.rmi.RemoteException; import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException; import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException; import org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; import stockexceptiontestservice.scatesttool.ScatesttoolFactory; import stockexceptiontestservice.scatesttool.StockOffer; diff --git a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java index ab65efbb58..4ee01fa303 100644 --- a/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java +++ b/java/sca/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java @@ -24,7 +24,7 @@ */ package org.apache.tuscany.sca.test.exceptions.sdohandgen; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; import stockexceptiontestservice.scatesttool.StockOffer; diff --git a/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java index 3371f63e4a..e65a1d4b64 100644 --- a/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java +++ b/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java @@ -23,7 +23,7 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.host.embedded.SCADomain; import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO; import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; import stockexceptiontestservice.scatesttool.InvalidSymbolFault; import stockexceptiontestservice.scatesttool.StockOffer; diff --git a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java index d6545b5a23..5e80b7bdde 100644 --- a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java +++ b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java @@ -18,9 +18,9 @@ */ package com.example; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(ExampleClient.class) @Scope("COMPOSITE") diff --git a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java index 987d2107b5..35f55b525a 100644 --- a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java +++ b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java @@ -18,9 +18,9 @@ */ package com.example; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; //@Service(ExampleClient.class) @Scope("COMPOSITE") diff --git a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java index 30ea559694..1e887995dd 100644 --- a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java +++ b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java @@ -18,7 +18,7 @@ */ package com.example; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface ExampleService { diff --git a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java index aa8591872e..2a305913c8 100644 --- a/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java +++ b/java/sca/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java @@ -18,7 +18,7 @@ */ package com.example; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface ExampleServiceMinimal { diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java index f923133ee9..53a6c70b57 100644 --- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java +++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.exceptions; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * Remote exception thrower diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java index 98cb71bdc0..26b9f0a383 100644 --- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java +++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java @@ -23,8 +23,8 @@ import org.apache.tuscany.sca.test.exceptions.Checked; import org.apache.tuscany.sca.test.exceptions.ExceptionHandler; import org.apache.tuscany.sca.test.exceptions.ExceptionThrower; import org.apache.tuscany.sca.test.exceptions.UnChecked; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; @Scope("COMPOSITE") public class ExceptionHandlerImpl implements ExceptionHandler { diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java index c4cb52f94c..cd62338841 100644 --- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java +++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.test.exceptions.impl; import org.apache.tuscany.sca.test.exceptions.Checked; import org.apache.tuscany.sca.test.exceptions.ExceptionRemoteThrower; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java index cf8740ba56..56b9fc6f5b 100644 --- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java +++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.test.exceptions.impl; import org.apache.tuscany.sca.test.exceptions.Checked; import org.apache.tuscany.sca.test.exceptions.ExceptionThrower; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java index bca32122f6..c5b54ff902 100644 --- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java +++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java @@ -24,8 +24,8 @@ import org.apache.tuscany.sca.test.exceptions.ExceptionHandler; import org.apache.tuscany.sca.test.exceptions.ExceptionRemoteThrower; import org.apache.tuscany.sca.test.exceptions.ExceptionThrower; import org.apache.tuscany.sca.test.exceptions.UnChecked; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; @Scope("COMPOSITE") public class RemoteExceptionHandlerImpl implements ExceptionHandler { diff --git a/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java index 523d238f2e..b716c0dd07 100644 --- a/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java +++ b/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java @@ -21,9 +21,9 @@ package org.apache.tuscany.sca.test.extended.impl; import org.apache.tuscany.sca.host.embedded.SCADomain; import org.apache.tuscany.sca.test.extended.BasicService; import org.apache.tuscany.sca.test.extended.MathService; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Service; @Service(BasicService.class) public class BasicServiceImpl implements BasicService { diff --git a/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java index ab4300a7dd..869f951342 100644 --- a/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java +++ b/java/sca/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.test.extended.impl; import org.apache.tuscany.sca.test.extended.MathService; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(MathService.class) public class MathServiceImpl implements MathService { diff --git a/java/sca/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/java/sca/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java index c480235d88..d0f20f98fc 100644 --- a/java/sca/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java +++ b/java/sca/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java @@ -24,7 +24,7 @@ import org.apache.tuscany.sca.host.embedded.SCADomain; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; public class ServiceLocateTestCase { diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java index 7bfcf5de11..5fc9ed51b3 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.OneWay; +import org.oasisopen.sca.annotation.OneWay; /* * itest for interface: local,method-overloading diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java index d4f7694e8f..6cd937af12 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(LocalClientComponent.class) public class LocalClientComponentImpl implements LocalClientComponent, LocalCallbackInterface { diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java index 4772303fab..05a9d09bdd 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.Callback; +import org.oasisopen.sca.annotation.Callback; /** * Local be-directional callBackService diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java index e100636b23..ab0b18191c 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; @Service(LocalServiceComponent.class) public class LocalServiceComponentImpl implements LocalServiceComponent { diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java index 703e1fd111..be3fa4c15a 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * only for callBack diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java index c877fb7b4c..9f34dfd274 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java @@ -37,7 +37,7 @@ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /* * different signatures diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java index 5773d1e83f..541b1f1508 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java @@ -19,9 +19,9 @@ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.AllowsPassByReference; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(RemoteClientComponent.class) public class RemoteClientComponentImpl implements RemoteClientComponent, RemoteCallbackInterface { diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java index 065e39a8a9..b29b298ab6 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; @Remotable @Callback(RemoteCallbackInterface.class) diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java index 3804d31902..00a0f5645b 100644 --- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java +++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.itest.interfaces; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; @Service(RemoteServiceComponent.class) public class RemoteServiceComponentImpl implements RemoteServiceComponent { diff --git a/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java b/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java index ffffb96686..f210545130 100644 --- a/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java +++ b/java/sca/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java @@ -20,7 +20,7 @@ package org.apache.tuscany.test.interop.client; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; import org.soapinterop.ComplexDocument; import org.soapinterop.DocTestPortType; import org.soapinterop.SimpleDocument1; diff --git a/java/sca/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java b/java/sca/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java index bb379c89cd..251f64bd6b 100644 --- a/java/sca/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java +++ b/java/sca/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java @@ -23,8 +23,8 @@ import java.util.Arrays; import java.util.List; import org.apache.tuscany.test.SCATestCase; -import org.osoa.sca.CompositeContext; -import org.osoa.sca.CurrentCompositeContext; +import org.oasisopen.sca.CompositeContext; +import org.oasisopen.sca.CurrentCompositeContext; import org.soapinterop.wsdl.interop.test.doc.lit.WSDLInteropTestDocLitPortType; import org.soapinterop.xsd.ArrayOfstring_literal; import org.soapinterop.xsd.SOAPStruct; diff --git a/java/sca/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java b/java/sca/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java index c34941f43e..9892828ca2 100644 --- a/java/sca/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java +++ b/java/sca/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java @@ -20,7 +20,7 @@ package org.apache.tuscany.test.interop.server; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; import org.soapinterop.ComplexDocument; import org.soapinterop.DocTestPortType; import org.soapinterop.SimpleDocument1; diff --git a/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java index 51ce5f4f24..68506b857b 100644 --- a/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java +++ b/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the OneWay service. diff --git a/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java index 487e5f2cbb..5f19aa1fa5 100644 --- a/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java +++ b/java/sca/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface MyService { diff --git a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java index 9d75685a8a..a4d5190af3 100644 --- a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java +++ b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * Remote Web service client with callback interface diff --git a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java index 9c2c657b55..b78feab413 100644 --- a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java +++ b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * The remote service that will be invoked by the client diff --git a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java index 5697d819c7..20b74ccc1a 100644 --- a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java +++ b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * The callback interface for {@link JMSService}. diff --git a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java index b15b40c8a6..e8357338ae 100644 --- a/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java +++ b/java/sca/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; /** * This class implements MyService and uses a callback. diff --git a/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java index 4d00d2df0d..b572b1012a 100644 --- a/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java +++ b/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the OneWay service. diff --git a/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java index 377f227ceb..9cec2d9b3e 100644 --- a/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java +++ b/java/sca/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface OneWayService { diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java index b1f62c1422..646cecc2b7 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java index 878fdb4fe4..25a7e36fce 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldReference { diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java index 82c57dfe75..f5596df894 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java index ba563b658f..735725e9c2 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsdelimited.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java index e5677169fe..c2c991f857 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsdelimited.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldReference { diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java index 623fd43871..2fb1c49685 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdelimited/helloworld/HelloWorldService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsdelimited.helloworld; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java index 948732adb4..e67f2ba8fa 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java index ed697f8a38..21b4d0461e 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldReference { diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java index 574188d466..43e623f192 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java index 39af400f6a..feee945ccd 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld; import javax.jws.soap.SOAPBinding; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java index 7a4f4df2e7..3444789d01 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class HelloWorldReferenceImpl implements HelloWorldService { diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java index bf19e9069b..f42a1e2de1 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java index dd15a83453..a58cb87714 100644 --- a/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java +++ b/java/sca/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; public class Person { diff --git a/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java index 0ad6440593..b589d5e8bc 100644 --- a/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java +++ b/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the OneWay service. diff --git a/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java index f26a3ce68b..1aff0d454e 100644 --- a/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java +++ b/java/sca/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface SelectorService { diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java index 46bf911def..0643fc8376 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface ExceptionService { diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java index cd3c09e17f..2c9e822ac1 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java index 86d4719646..65a4b32694 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java index abb29aec4c..33298eb555 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface HelloWorldService { diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java index b4d1cbccda..4140fa0b89 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(MsgClient.class) public class MsgClientImpl implements MsgClient { diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java index e8242467cc..2be4f2ad3e 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java index d376d74295..d5684ca56c 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.AllowsPassByReference; +import org.oasisopen.sca.annotation.Remotable; @Remotable diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java index 142343e349..e18de0456c 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.binding.jms; import javax.jms.Message; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(MsgService.class) public class MsgServiceImpl implements MsgService { diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java index 218cccf64c..6ec88aac6c 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the OneWay service. diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java index 9795089952..fc155d0324 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface OneWayObjectService { diff --git a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java index f16f853ba7..8fd6cc94bf 100644 --- a/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java +++ b/java/sca/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.binding.jms; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface OneWayService { diff --git a/java/sca/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java b/java/sca/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java index 3575d94f48..b661f0c518 100644 --- a/java/sca/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java +++ b/java/sca/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.itest.trninq; import org.ifxforum.xsd._1.DepAcctTrnInqRq_Type; import org.ifxforum.xsd._1.DepAcctTrnInqRs_Type; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/late-reference-resolution/src/main/java/calculator/AddService.java b/java/sca/itest/late-reference-resolution/src/main/java/calculator/AddService.java index d7dc4473ad..dd7ecb827d 100644 --- a/java/sca/itest/late-reference-resolution/src/main/java/calculator/AddService.java +++ b/java/sca/itest/late-reference-resolution/src/main/java/calculator/AddService.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The Add service interface diff --git a/java/sca/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java index da869e00fd..c927500cc7 100644 --- a/java/sca/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java b/java/sca/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java index 78ab9c6ee0..f03b9b94d4 100644 --- a/java/sca/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java +++ b/java/sca/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for the multiply service diff --git a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java index e91adb71eb..80c339abd6 100644 --- a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java +++ b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.itest.oneway; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * The service interface used when testing @OneWay interactions. diff --git a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java index 3920083484..d941693f46 100644 --- a/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java +++ b/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest.oneway.impl; import org.apache.tuscany.sca.itest.oneway.OneWayClient; import org.apache.tuscany.sca.itest.oneway.OneWayService; import org.junit.Assert; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * The client for the oneway itest. diff --git a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java index e5d5083a2d..a30d3611fb 100644 --- a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java +++ b/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java @@ -22,8 +22,8 @@ package org.apache.tuscany.sca.test.opoverload.impl; import java.util.ArrayList; import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class Implements the interface OverloadASourceTarget, and gives implementation for all methods which are diff --git a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java index e206a86768..9ec60eb78f 100644 --- a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java +++ b/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.test.opoverload.impl; import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class Implements the interface OverloadASourceTarget, and gives implementation for all methods which are diff --git a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java index 225dce0236..b70ddede4f 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java +++ b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java @@ -18,7 +18,7 @@ */ package supplychain.customer; -import org.osoa.sca.annotations.OneWay; +import org.oasisopen.sca.annotation.OneWay; /** * This is the business interface of the Customer service component. diff --git a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java index 2b8c973e2c..34b1b0e94f 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java @@ -18,9 +18,9 @@ */ package supplychain.customer; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.retailer.Retailer; diff --git a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java index cc5d44d279..aa91ef663c 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.retailer; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.warehouse.Warehouse; diff --git a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java index 2d1bb68e5b..32015b9b60 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.shipper; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.customer.Customer; diff --git a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java index c39a34cb96..c904f07693 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java @@ -18,9 +18,9 @@ */ package supplychain.warehouse; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.shipper.Shipper; diff --git a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java index 225dce0236..b70ddede4f 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java +++ b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java @@ -18,7 +18,7 @@ */ package supplychain.customer; -import org.osoa.sca.annotations.OneWay; +import org.oasisopen.sca.annotation.OneWay; /** * This is the business interface of the Customer service component. diff --git a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java index d0b0a13e6d..958d1cf111 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java @@ -18,9 +18,9 @@ */ package supplychain.customer; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.retailer.Retailer; diff --git a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java index d2bf71ed28..9f1e8b63e5 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.retailer; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.warehouse.Warehouse; diff --git a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java index 2556a0cfa0..5c8903fe5a 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.shipper; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.customer.Customer; diff --git a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java index e180c37e3f..7dd7adda6b 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java +++ b/java/sca/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java @@ -18,9 +18,9 @@ */ package supplychain.warehouse; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.shipper.Shipper; diff --git a/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java index cfecd989fe..37e750d7ec 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java +++ b/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java @@ -18,7 +18,7 @@ */ package callback.client; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable /* diff --git a/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java index 43bc26f2f5..9c145ff59f 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java +++ b/java/sca/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java @@ -18,7 +18,7 @@ */ package callback.client; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable /** diff --git a/java/sca/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/java/sca/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java index f78878ef47..b1bb8c2aa0 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java @@ -20,8 +20,8 @@ package callback.client; import junit.framework.Assert; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; import callback.service.CallbackService; diff --git a/java/sca/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/java/sca/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java index 5383e1e268..958b0bf266 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java +++ b/java/sca/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java @@ -18,8 +18,8 @@ */ package callback.service; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; import callback.client.CallbackCallback; diff --git a/java/sca/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/java/sca/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java index b2af2fa68d..88fd845acd 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java @@ -18,8 +18,8 @@ */ package callback.service; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; import callback.client.CallbackCallback; diff --git a/java/sca/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/java/sca/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java index c05a3f52a8..21753cc33b 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java @@ -23,7 +23,7 @@ import java.util.Hashtable; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -import org.osoa.sca.annotations.Callback; +import org.oasisopen.sca.annotation.Callback; import callback.client.CallbackCallback; diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java index c92f078e49..acef7fbf6a 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java +++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java @@ -18,9 +18,9 @@ */ package conversation.client; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; +import org.oasisopen.sca.annotation.Remotable; /** diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java index af269052c7..19b2fed53e 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java +++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java @@ -18,7 +18,7 @@ */ package conversation.client; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The client for the conversational itest. Is implemented by clients diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java index 3aedabc29c..ed1f12de44 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java @@ -18,14 +18,14 @@ */ package conversation.client; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import conversation.referenceclient.ConversationalReferenceClient; import conversation.service.ConversationalService; diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java index b12e094bc1..e0f8c51262 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java @@ -19,14 +19,14 @@ package conversation.client; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import conversation.referenceclient.ConversationalReferenceClient; import conversation.service.ConversationalService; diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java index 59e128b993..9b8049164a 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java +++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java @@ -18,8 +18,8 @@ */ package conversation.referenceclient; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Remotable; import conversation.service.ConversationalService; diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java index 4524c6bd3d..d6d6bcf4b1 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java @@ -18,9 +18,9 @@ */ package conversation.referenceclient; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.AllowsPassByReference; +import org.oasisopen.sca.annotation.Service; import conversation.service.ConversationalService; diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java index bcd24ef0b1..1966bc76a4 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java +++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java @@ -18,10 +18,10 @@ */ package conversation.service; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Conversational; +import org.oasisopen.sca.annotation.EndsConversation; +import org.oasisopen.sca.annotation.Remotable; import conversation.client.ConversationalCallback; diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java index ec30d641ac..96b23e771c 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java @@ -18,13 +18,13 @@ */ package conversation.service; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.ConversationAttributes; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import conversation.client.ConversationalCallback; diff --git a/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java b/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java index 34baca71d1..9147c0ffa2 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java @@ -20,12 +20,12 @@ package conversation.service; import java.util.HashMap; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import conversation.client.ConversationalCallback; diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/Greetings.java index 9285c0a8d5..c55cb68d03 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/Greetings.java +++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/Greetings.java @@ -19,7 +19,7 @@ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Greetings { diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java index 16d0eae990..0940f9baf4 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java +++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java @@ -19,7 +19,7 @@ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface HelloWorld { diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java index 3d0e045225..50d8c26388 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java +++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java @@ -19,10 +19,10 @@ package helloworld; -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.AllowsPassByReference; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(Greetings.class) @Scope("COMPOSITE") diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java index c055aee142..a7bcb2ba06 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java +++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java @@ -19,8 +19,8 @@ package helloworld; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; @Scope("COMPOSITE") public class JavaHelloWorldComponent implements HelloWorld { diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java index 661eb5a8cb..9b3907c752 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java @@ -27,7 +27,7 @@ import org.osgi.framework.ServiceEvent; import org.osgi.framework.ServiceListener; import org.osgi.framework.ServiceReference; import org.osgi.framework.BundleActivator; -import org.osoa.sca.annotations.AllowsPassByReference; +import org.oasisopen.sca.annotation.AllowsPassByReference; public class OSGiGreetingsImpl implements Greetings, ServiceListener, BundleActivator { diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java index fff67e1978..f48c91d518 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java +++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld.sdo; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for the helloworld service diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java index 98085449e6..e52565aedb 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java +++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java @@ -18,7 +18,7 @@ */ package helloworld.sdo; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java index 5089019671..6548b409fb 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java +++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java @@ -18,7 +18,7 @@ */ package helloworld.sdo.client; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for the helloworld client diff --git a/java/sca/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/java/sca/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java index 039a214856..99a3d0087c 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java +++ b/java/sca/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java @@ -19,7 +19,7 @@ package helloworld.ws; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface HelloWorld { diff --git a/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java index 2251bf5be6..305b3610d4 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java @@ -21,7 +21,7 @@ package stockquote; import java.util.Dictionary; import org.osgi.service.component.ComponentContext; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * Declarative Stock quote with configurable properties. diff --git a/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java index f2ae804ad1..4cd4fb36a5 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java @@ -27,7 +27,7 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java index 2762bc62be..ecbad11fa0 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java +++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java @@ -18,7 +18,7 @@ */ package supplychain.customer; -import org.osoa.sca.annotations.OneWay; +import org.oasisopen.sca.annotation.OneWay; /** * This is the business interface of the Customer service component. diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java index 80346311b1..03040d81d1 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java @@ -20,9 +20,9 @@ package supplychain.customer; import java.util.ArrayList; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.retailer.Retailer; diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java index 546971860e..8ef4a2d8d8 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java @@ -21,7 +21,7 @@ package supplychain.customer; import java.util.ArrayList; -import org.osoa.sca.annotations.AllowsPassByReference; +import org.oasisopen.sca.annotation.AllowsPassByReference; import supplychain.OSGiBundleImpl; import supplychain.retailer.Retailer; diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java index 5ba42780f2..f3ea404997 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java @@ -18,7 +18,7 @@ */ package supplychain.customer; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java index bc569d0ac0..eda77b0c5d 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java @@ -19,7 +19,7 @@ package supplychain.customer; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java index df52c6c760..b9adacca55 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java @@ -19,10 +19,10 @@ package supplychain.retailer; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.warehouse.Warehouse; diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java index d0cf43a960..3da2fb8e39 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java @@ -19,10 +19,10 @@ package supplychain.shipper; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.customer.Customer; diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java index 13bce67bb4..90f709bf95 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java @@ -18,7 +18,7 @@ */ package supplychain.shipper; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java index 071a131f40..d265f42c1b 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java @@ -18,7 +18,7 @@ */ package supplychain.shipper; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java index 9edf3567e5..9f636957ac 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java @@ -18,9 +18,9 @@ */ package supplychain.warehouse; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.shipper.Shipper; diff --git a/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java index 659f16be7f..e32028dd30 100644 --- a/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java +++ b/java/sca/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java @@ -18,9 +18,9 @@ */ package supplychain.warehouse; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.shipper.Shipper; diff --git a/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf index 7a06030e32..510b3cdcce 100644 --- a/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf +++ b/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf @@ -4,7 +4,7 @@ Bundle-Name: ConversationTest Bundle-SymbolicName: conversation.ConversationalClient Bundle-Version: 1.0.0 Bundle-Localization: plugin -Import-Package: org.osgi.framework, org.osoa.sca, org.osoa.sca.annotations, +Import-Package: org.osgi.framework, org.oasisopen.sca, org.oasisopen.sca.annotation, conversation.service, conversation.referenceclient Export-Package: conversation.client Bundle-Activator: conversation.client.ConversationalClientActivator diff --git a/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf index 5c39b53b0a..a8270363d2 100644 --- a/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf +++ b/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf @@ -4,7 +4,7 @@ Bundle-Name: ConversationTest Bundle-SymbolicName: conversation.ConversationalReferenceClient Bundle-Version: 1.0.0 Bundle-Localization: plugin -Import-Package: org.osgi.framework, org.osoa.sca, org.osoa.sca.annotations, +Import-Package: org.osgi.framework, org.oasisopen.sca, org.oasisopen.sca.annotation, conversation.service Export-Package: conversation.referenceclient Bundle-Activator: conversation.referenceclient.ConversationalReferenceClientActivator diff --git a/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf index b8bb809319..6062757a32 100644 --- a/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf +++ b/java/sca/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf @@ -4,7 +4,7 @@ Bundle-Name: ConversationTest Bundle-SymbolicName: conversation.ConversationalService Bundle-Version: 1.0.0 Bundle-Localization: plugin -Import-Package: org.osgi.framework, org.osoa.sca, org.osoa.sca.annotations, +Import-Package: org.osgi.framework, org.oasisopen.sca, org.oasisopen.sca.annotation, conversation.client Export-Package: conversation.service Bundle-Activator: conversation.service.ConversationalServiceActivator diff --git a/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf b/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf index 6a3c845cca..19b41cf4a4 100644 --- a/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf +++ b/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf @@ -5,7 +5,7 @@ Bundle-SymbolicName: ds.helloworld.sdo.HelloWorldClient Bundle-Version: 1.0.0 Bundle-Localization: plugin Import-Package: org.osgi.framework, org.osgi.service.component, - org.osoa.sca, org.osoa.sca.annotations, + org.oasisopen.sca, org.oasisopen.sca.annotation, commonj.sdo, commonj.sdo.helper, org.apache.tuscany.sdo.helper, org.apache.tuscany.sdo.impl, org.apache.tuscany.sdo.model, org.apache.tuscany.sdo.model.impl, org.eclipse.emf.ecore, org.eclipse.emf.ecore.util, org.eclipse.emf.ecore.impl, diff --git a/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf b/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf index 89871fa8f6..d730273c0e 100644 --- a/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf +++ b/java/sca/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf @@ -5,7 +5,7 @@ Bundle-SymbolicName: ds.helloworld.sdo.HelloWorldService Bundle-Version: 1.0.0 Bundle-Localization: plugin Import-Package: org.osgi.framework, org.osgi.service.component, - org.osoa.sca, org.osoa.sca.annotations, + org.oasisopen.sca, org.oasisopen.sca.annotation, commonj.sdo, commonj.sdo.helper, org.apache.tuscany.sdo.helper, org.apache.tuscany.sdo.impl, org.apache.tuscany.sdo.model, org.apache.tuscany.sdo.model.impl, org.eclipse.emf.ecore, org.eclipse.emf.ecore.util, org.eclipse.emf.ecore.impl diff --git a/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF index 8985947286..5966311f0e 100644 --- a/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF +++ b/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Import-Package: org.osgi.framework, junit.framework, org.junit, org.apache.tuscany.sca.host.embedded, - org.osoa.sca, - org.osoa.sca.annotations, + org.oasisopen.sca, + org.oasisopen.sca.annotation, org.apache.tuscany.sca.databinding.annotation DynamicImport-Package: * diff --git a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java index a3aa2531fc..b7da27733d 100644 --- a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java +++ b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java @@ -18,8 +18,8 @@ */ package supplychain.customer; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the Customer service component. diff --git a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java index 5f1342c40b..950606d044 100644 --- a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java @@ -18,9 +18,9 @@ */ package supplychain.customer; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.retailer.Retailer; diff --git a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java index f5708dec40..08e2f8df08 100644 --- a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.retailer; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.warehouse.Warehouse; diff --git a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java index afaf7aea02..6bdec3615f 100644 --- a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java +++ b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java @@ -19,9 +19,9 @@ package supplychain.shipper; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.customer.Customer; diff --git a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java index ca720085c5..cbb55c969f 100644 --- a/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java +++ b/java/sca/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java @@ -18,9 +18,9 @@ */ package supplychain.warehouse; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; import supplychain.shipper.Shipper; diff --git a/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf b/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf index f71d822bbe..645a94f6bf 100644 --- a/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf +++ b/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf @@ -5,8 +5,8 @@ Bundle-SymbolicName: supplychain.SupplyChain Bundle-Version: 1.0.0 Bundle-Localization: plugin Import-Package: org.osgi.framework, - org.osoa.sca, - org.osoa.sca.annotations, + org.oasisopen.sca, + org.oasisopen.sca.annotation, javax.xml.bind.annotation Export-Package: supplychain.customer, supplychain diff --git a/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf b/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf index 13a3c9b82a..4cbd41b627 100644 --- a/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf +++ b/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf @@ -13,8 +13,8 @@ Import-Package: org.osgi.framework, org.apache.tuscany.sca.contribution.service, org.apache.tuscany.sca.core.assembly, org.apache.tuscany.sca.assembly.builder, - org.osoa.sca, - org.osoa.sca.annotations, + org.oasisopen.sca, + org.oasisopen.sca.annotation, javax.xml.bind.annotation Export-Package: supplychain.client Bundle-Activator: supplychain.client.SupplyChainClient diff --git a/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java b/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java index 7345af7f7c..a7e60e7e09 100644 --- a/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java +++ b/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java @@ -18,8 +18,8 @@ */ package helloworld; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java index 268d90e910..18f74b083f 100644 --- a/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java b/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java index 6372570d1f..e9787bfac3 100644 --- a/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java +++ b/java/sca/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java @@ -20,9 +20,9 @@ package helloworld; import javax.security.auth.Subject; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java index 3e752144a0..bf4e1edaaa 100644 --- a/java/sca/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java b/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java index 55b798edbe..2150cb63c6 100644 --- a/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java +++ b/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java @@ -18,8 +18,8 @@ */ package helloworld; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java index 268d90e910..18f74b083f 100644 --- a/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java b/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java index 6372570d1f..e9787bfac3 100644 --- a/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java +++ b/java/sca/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java @@ -20,9 +20,9 @@ package helloworld; import javax.security.auth.Subject; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.RequestContext; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java index 0de3c70303..a75187f0d7 100644 --- a/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java +++ b/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldService.java index 268d90e910..18f74b083f 100644 --- a/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/policy-security/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/policy/src/main/java/calculator/AddService.java b/java/sca/itest/policy/src/main/java/calculator/AddService.java index 3e56bf3fad..198a38b657 100644 --- a/java/sca/itest/policy/src/main/java/calculator/AddService.java +++ b/java/sca/itest/policy/src/main/java/calculator/AddService.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.annotation.Service; /** * The Add service interface diff --git a/java/sca/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java index 28ce0ec78a..e1726250de 100644 --- a/java/sca/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Requires; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Requires; /** diff --git a/java/sca/itest/policy/src/main/java/calculator/DivideService.java b/java/sca/itest/policy/src/main/java/calculator/DivideService.java index f72b05cece..8f4c675370 100644 --- a/java/sca/itest/policy/src/main/java/calculator/DivideService.java +++ b/java/sca/itest/policy/src/main/java/calculator/DivideService.java @@ -18,8 +18,8 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.annotation.Service; /** * The divide service interface diff --git a/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java b/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java index d6545b5a23..5e80b7bdde 100644 --- a/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java +++ b/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java @@ -18,9 +18,9 @@ */ package com.example; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(ExampleClient.class) @Scope("COMPOSITE") diff --git a/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java b/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java index 30ea559694..1e887995dd 100644 --- a/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java +++ b/java/sca/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java @@ -18,7 +18,7 @@ */ package com.example; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface ExampleService { diff --git a/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java index 51d064ba81..7b44ef02e4 100644 --- a/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java +++ b/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java @@ -21,11 +21,11 @@ package mysca.test.myservice.impl; import java.util.logging.Logger; -import org.osoa.sca.annotations.ComponentName; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.ComponentName; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; /** * This class Implements the interface MyService and gives implementation for all methods which are declared in that diff --git a/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java index 38c26e70d6..e8c4341cf2 100644 --- a/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java +++ b/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java @@ -18,8 +18,8 @@ */ package mysca.test.myservice.impl; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This class Implements the interface MyService and gives implementation for all methods which are declared in that diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java index 6b714c0d67..c8d0d4cae4 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.itest; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; /** * This class Implements the interface ABCDComponent and gives implementation for all methods which are declared in that diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java index 586d4864a9..b727935bc1 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import java.util.Collection; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java index 5e3c985144..e402131ce2 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import java.util.Collection; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * This class Implements the interface ABComponent and gives implementation for all methods which are declared in that diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java index 5b93bd8b8a..fceda9d9ae 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import java.util.Collection; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * This class Implements the interface CDComponent and gives implementation for all methods which are declared in that diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java index 16029a6584..5f8f28e46a 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java @@ -21,9 +21,9 @@ package org.apache.tuscany.sca.itest; import java.util.Collection; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.Property; import test.jaxb.props.ReturnCodeProperties; diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java index 0a84e93828..7c700903d6 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.cdi; -import org.osoa.sca.annotations.Constructor; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Constructor; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; @Service(Bar.class) public class Foo1 implements Bar { diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java index 6344a8aa83..1d2e563095 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.cdi; -import org.osoa.sca.annotations.Constructor; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Constructor; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; @Service(Bar.class) public class Foo2 implements Bar { diff --git a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java index 11a0a758cd..54082e297a 100644 --- a/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java +++ b/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.cdi; -import org.osoa.sca.annotations.Constructor; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Constructor; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; @Service(Bar.class) public class Foo3 implements Bar { diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java index 87773d8361..6cad998042 100644 --- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java +++ b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java @@ -19,8 +19,8 @@ package mysca.test.myservice; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; @Service(MyService.class) public class MyServiceImpl implements MyService { diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java index a9afe052ba..f3c9280f96 100644 --- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java +++ b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java @@ -19,8 +19,8 @@ package mysca.test.myservice; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(MySimpleTotalService.class) public class MySimpleTotalServiceImpl implements MySimpleTotalService { diff --git a/java/sca/itest/recursive-ws/src/main/java/policy/Target.java b/java/sca/itest/recursive-ws/src/main/java/policy/Target.java index c77fcea868..2366f6542a 100644 --- a/java/sca/itest/recursive-ws/src/main/java/policy/Target.java +++ b/java/sca/itest/recursive-ws/src/main/java/policy/Target.java @@ -18,7 +18,7 @@ */ package policy; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Target { diff --git a/java/sca/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/java/sca/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java index 87e412829e..b2d59e925c 100644 --- a/java/sca/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java +++ b/java/sca/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java @@ -18,8 +18,8 @@ */ package policy; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(Target.class) public class TargetClientImpl implements Target { diff --git a/java/sca/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/java/sca/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java index e565055252..6f52dfb26e 100644 --- a/java/sca/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java +++ b/java/sca/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java @@ -18,7 +18,7 @@ */ package policy; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(Target.class) public class TargetServiceImpl implements Target { diff --git a/java/sca/itest/recursive-ws/src/main/java/recursive/Composer.java b/java/sca/itest/recursive-ws/src/main/java/recursive/Composer.java index e53f99d9c3..18486115ae 100644 --- a/java/sca/itest/recursive-ws/src/main/java/recursive/Composer.java +++ b/java/sca/itest/recursive-ws/src/main/java/recursive/Composer.java @@ -18,7 +18,7 @@ */ package recursive; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Composer { diff --git a/java/sca/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/java/sca/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java index 3d75b7b165..3c432bc26a 100644 --- a/java/sca/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java +++ b/java/sca/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java @@ -19,7 +19,7 @@ package recursive; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/java/sca/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java index 3e71246da2..7ff34c9787 100644 --- a/java/sca/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java +++ b/java/sca/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java @@ -28,7 +28,7 @@ import org.apache.tuscany.sca.policy.PolicySetAttachPoint; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.osoa.sca.annotations.EndsConversation; +import org.oasisopen.sca.annotation.EndsConversation; public class PolicyTestCase{ diff --git a/java/sca/itest/recursive/src/main/java/composite/SourceImpl.java b/java/sca/itest/recursive/src/main/java/composite/SourceImpl.java index b9a0c7ff74..8e2b347604 100644 --- a/java/sca/itest/recursive/src/main/java/composite/SourceImpl.java +++ b/java/sca/itest/recursive/src/main/java/composite/SourceImpl.java @@ -18,9 +18,9 @@ */ package composite; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(Source.class) diff --git a/java/sca/itest/recursive/src/main/java/composite/Target.java b/java/sca/itest/recursive/src/main/java/composite/Target.java index 9a8f68a7fa..703e72fc10 100644 --- a/java/sca/itest/recursive/src/main/java/composite/Target.java +++ b/java/sca/itest/recursive/src/main/java/composite/Target.java @@ -18,8 +18,8 @@ */ package composite; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.OneWay; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.OneWay; @Callback(SourceCallback.class) diff --git a/java/sca/itest/recursive/src/main/java/composite/TargetImpl.java b/java/sca/itest/recursive/src/main/java/composite/TargetImpl.java index 86686e9233..cd9a9746fa 100644 --- a/java/sca/itest/recursive/src/main/java/composite/TargetImpl.java +++ b/java/sca/itest/recursive/src/main/java/composite/TargetImpl.java @@ -18,9 +18,9 @@ */ package composite; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(Target.class) diff --git a/java/sca/itest/recursive/src/main/java/foo/A.java b/java/sca/itest/recursive/src/main/java/foo/A.java index e87cbde26d..65bf41920e 100644 --- a/java/sca/itest/recursive/src/main/java/foo/A.java +++ b/java/sca/itest/recursive/src/main/java/foo/A.java @@ -18,7 +18,7 @@ */ package foo; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(I.class) public class A implements I { diff --git a/java/sca/itest/recursive/src/main/java/foo/B.java b/java/sca/itest/recursive/src/main/java/foo/B.java index 9d060cab59..ecc04aff4c 100644 --- a/java/sca/itest/recursive/src/main/java/foo/B.java +++ b/java/sca/itest/recursive/src/main/java/foo/B.java @@ -18,8 +18,8 @@ */ package foo; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(I.class) public class B implements I { diff --git a/java/sca/itest/recursive/src/main/java/policy/Target.java b/java/sca/itest/recursive/src/main/java/policy/Target.java index c77fcea868..2366f6542a 100644 --- a/java/sca/itest/recursive/src/main/java/policy/Target.java +++ b/java/sca/itest/recursive/src/main/java/policy/Target.java @@ -18,7 +18,7 @@ */ package policy; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Target { diff --git a/java/sca/itest/recursive/src/main/java/policy/TargetClientImpl.java b/java/sca/itest/recursive/src/main/java/policy/TargetClientImpl.java index 87e412829e..b2d59e925c 100644 --- a/java/sca/itest/recursive/src/main/java/policy/TargetClientImpl.java +++ b/java/sca/itest/recursive/src/main/java/policy/TargetClientImpl.java @@ -18,8 +18,8 @@ */ package policy; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(Target.class) public class TargetClientImpl implements Target { diff --git a/java/sca/itest/recursive/src/main/java/policy/TargetServiceImpl.java b/java/sca/itest/recursive/src/main/java/policy/TargetServiceImpl.java index e565055252..6f52dfb26e 100644 --- a/java/sca/itest/recursive/src/main/java/policy/TargetServiceImpl.java +++ b/java/sca/itest/recursive/src/main/java/policy/TargetServiceImpl.java @@ -18,7 +18,7 @@ */ package policy; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(Target.class) public class TargetServiceImpl implements Target { diff --git a/java/sca/itest/recursive/src/main/java/sample/ComponentAImpl.java b/java/sca/itest/recursive/src/main/java/sample/ComponentAImpl.java index f513949105..458a7d28a3 100644 --- a/java/sca/itest/recursive/src/main/java/sample/ComponentAImpl.java +++ b/java/sca/itest/recursive/src/main/java/sample/ComponentAImpl.java @@ -19,8 +19,8 @@ package sample; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive/src/main/java/sample/ComponentCImpl.java b/java/sca/itest/recursive/src/main/java/sample/ComponentCImpl.java index 586a9ee6a7..f3b9fc014d 100644 --- a/java/sca/itest/recursive/src/main/java/sample/ComponentCImpl.java +++ b/java/sca/itest/recursive/src/main/java/sample/ComponentCImpl.java @@ -19,8 +19,8 @@ package sample; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive/src/main/java/sample/ComponentEImpl.java b/java/sca/itest/recursive/src/main/java/sample/ComponentEImpl.java index dbf2735aa7..445b622a72 100644 --- a/java/sca/itest/recursive/src/main/java/sample/ComponentEImpl.java +++ b/java/sca/itest/recursive/src/main/java/sample/ComponentEImpl.java @@ -19,8 +19,8 @@ package sample; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive/src/main/java/sample/ComponentFImpl.java b/java/sca/itest/recursive/src/main/java/sample/ComponentFImpl.java index 5e136e536c..e2de8f3dc5 100644 --- a/java/sca/itest/recursive/src/main/java/sample/ComponentFImpl.java +++ b/java/sca/itest/recursive/src/main/java/sample/ComponentFImpl.java @@ -19,7 +19,7 @@ package sample; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive/src/main/java/test/AggregatorImpl.java b/java/sca/itest/recursive/src/main/java/test/AggregatorImpl.java index f6ac6c8741..638219d431 100644 --- a/java/sca/itest/recursive/src/main/java/test/AggregatorImpl.java +++ b/java/sca/itest/recursive/src/main/java/test/AggregatorImpl.java @@ -21,8 +21,8 @@ package test; import java.util.List; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive/src/main/java/test/InnerSourceImpl.java b/java/sca/itest/recursive/src/main/java/test/InnerSourceImpl.java index c8dad5ae35..aae9aba587 100644 --- a/java/sca/itest/recursive/src/main/java/test/InnerSourceImpl.java +++ b/java/sca/itest/recursive/src/main/java/test/InnerSourceImpl.java @@ -19,7 +19,7 @@ package test; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive/src/main/java/test/OuterSourceImpl.java b/java/sca/itest/recursive/src/main/java/test/OuterSourceImpl.java index 11816e82cf..bd31498ccc 100644 --- a/java/sca/itest/recursive/src/main/java/test/OuterSourceImpl.java +++ b/java/sca/itest/recursive/src/main/java/test/OuterSourceImpl.java @@ -19,7 +19,7 @@ package test; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive/src/main/java/test/Source.java b/java/sca/itest/recursive/src/main/java/test/Source.java index 9b93740d9d..bcad89bf4d 100644 --- a/java/sca/itest/recursive/src/main/java/test/Source.java +++ b/java/sca/itest/recursive/src/main/java/test/Source.java @@ -19,7 +19,7 @@ package test; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/recursive/src/main/java/test1/composite/TargetOne.java b/java/sca/itest/recursive/src/main/java/test1/composite/TargetOne.java index a7c68f4ffd..831e3cbd7b 100644 --- a/java/sca/itest/recursive/src/main/java/test1/composite/TargetOne.java +++ b/java/sca/itest/recursive/src/main/java/test1/composite/TargetOne.java @@ -18,7 +18,7 @@ */ package test1.composite; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(Target.class) public class TargetOne implements Target { diff --git a/java/sca/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/java/sca/itest/recursive/src/main/java/test1/composite/TargetTwo.java index 7fff8e2e9b..8c32eca547 100644 --- a/java/sca/itest/recursive/src/main/java/test1/composite/TargetTwo.java +++ b/java/sca/itest/recursive/src/main/java/test1/composite/TargetTwo.java @@ -18,7 +18,7 @@ */ package test1.composite; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(Target.class) public class TargetTwo implements Target { diff --git a/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java b/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java index f042113f7a..fb9872378d 100644 --- a/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java +++ b/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java @@ -77,8 +77,8 @@ public class LocateServiceEmbeddedSCADomainTestCase extends TestCase { source = domain.getService(Source.class, "SourceComponentXXX"); // The source proxy can be created for the remote target but it will throw exception when a method is invoked source.clientMethod("ABC"); - fail("Expected to generate org.osoa.sca.ServiceRuntimeException but did not when invoking service with async"); - } catch (org.osoa.sca.ServiceRuntimeException e) { + fail("Expected to generate org.oasisopen.sca.ServiceRuntimeException but did not when invoking service with async"); + } catch (org.oasisopen.sca.ServiceRuntimeException e) { // expected. } } diff --git a/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java b/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java index 87eb948452..171f181438 100644 --- a/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java +++ b/java/sca/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java @@ -54,8 +54,8 @@ public class LocateServiceSCADomainTestCase extends TestCase { source = domain.getService(Source.class, "SourceComponentXXX"); // The source proxy can be created for the remote target but it will throw exception when a method is invoked source.clientMethod("ABC"); - fail("Expected to generate org.osoa.sca.ServiceRuntimeException but did not when invoking service with async"); - } catch (org.osoa.sca.ServiceRuntimeException e) { + fail("Expected to generate org.oasisopen.sca.ServiceRuntimeException but did not when invoking service with async"); + } catch (org.oasisopen.sca.ServiceRuntimeException e) { // expected. } } diff --git a/java/sca/itest/recursive/src/test/java/sample/CImpl.java b/java/sca/itest/recursive/src/test/java/sample/CImpl.java index 466284983e..98610e32a6 100644 --- a/java/sca/itest/recursive/src/test/java/sample/CImpl.java +++ b/java/sca/itest/recursive/src/test/java/sample/CImpl.java @@ -20,8 +20,8 @@ package sample; import junit.framework.Assert; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a simple service diff --git a/java/sca/itest/recursive/src/test/java/sample/XImpl.java b/java/sca/itest/recursive/src/test/java/sample/XImpl.java index e430807568..7f80dfccb2 100644 --- a/java/sca/itest/recursive/src/test/java/sample/XImpl.java +++ b/java/sca/itest/recursive/src/test/java/sample/XImpl.java @@ -18,7 +18,7 @@ */ package sample; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a simple service diff --git a/java/sca/itest/recursive/src/test/java/sample/YImpl.java b/java/sca/itest/recursive/src/test/java/sample/YImpl.java index 994c9eb95f..b8e3a58974 100644 --- a/java/sca/itest/recursive/src/test/java/sample/YImpl.java +++ b/java/sca/itest/recursive/src/test/java/sample/YImpl.java @@ -18,7 +18,7 @@ */ package sample; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * Implementation of a Simple Service diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java index ab275ece52..49c3deb84d 100644 --- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java +++ b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.itest.references; import java.util.Collection; import java.util.List; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Reference; public class AComponentImpl implements AComponent { diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java index 6b1065ab0d..211e6160f6 100644 --- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java +++ b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.references; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class BComponentImpl implements BComponent { diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java index 1cd7cb7fe5..47a1f9bde8 100644 --- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java +++ b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.references; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class BComponentWrongTargetImpl implements BComponent { diff --git a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java index 79c802bc97..d181ac96ca 100644 --- a/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java +++ b/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.references; -import org.osoa.sca.annotations.ComponentName; +import org.oasisopen.sca.annotation.ComponentName; public class DComponentImpl implements DComponent { @ComponentName diff --git a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java index f4ef805644..208ac3ba44 100644 --- a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java +++ b/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.scopes; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** * Test Composite scope diff --git a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java index 7e19a15cb1..ff116070b5 100644 --- a/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java +++ b/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.scopes; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; /** * Test request scope diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java index fa0f1c88d6..3c643436e9 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java @@ -18,9 +18,9 @@ */ package org.apache.tuscany.sca.itest.servicereference; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Conversational; /** * A very simple Conversational Service diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java index 85d5dd860c..4d75c68c2d 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.servicereference; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.annotation.Conversational; /** * This is the callback for the ConversationalService. diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java index 50c98d1afc..b129cbc4b7 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java @@ -20,14 +20,14 @@ package org.apache.tuscany.sca.itest.servicereference; import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils; import org.junit.Assert; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Context; +import org.oasisopen.sca.annotation.ConversationID; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * Simple conversational Service implementation diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java index cf0307eb8e..64c5e7e631 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java @@ -20,9 +20,9 @@ package org.apache.tuscany.sca.itest.servicereference; import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils; import org.junit.Assert; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This is a test client that is used to test Serializing and Deserializing diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java index deb8f75816..b233241514 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.servicereference; -import org.osoa.sca.annotations.Conversational; +import org.oasisopen.sca.annotation.Conversational; /** diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java index 60ecb7717a..9e55eea7ee 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java @@ -20,10 +20,10 @@ package org.apache.tuscany.sca.itest.servicereference; import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils; import org.junit.Assert; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ServiceReference; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * This is a test client that is used to test Serializing and Deserializing diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java index 8a1fe48436..804debf30c 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.itest.servicereference; -import org.osoa.sca.annotations.Callback; +import org.oasisopen.sca.annotation.Callback; /** diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java index 24d43f79e3..795f2d9c46 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java @@ -23,9 +23,9 @@ import java.util.Date; import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils; import org.junit.Assert; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; /** * Simple Stateless Service implementation diff --git a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java index 2749891bd4..bb8d40e788 100644 --- a/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java +++ b/java/sca/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java @@ -24,8 +24,8 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; +import org.oasisopen.sca.CallableReference; +import org.oasisopen.sca.ServiceReference; /** * Utility methods that are used by the ServiceReference Serialization tests diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java index ced30864ff..26e58dc530 100644 --- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java +++ b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.services; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface AComponent { diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java index 14b70dff04..01df89a8fa 100644 --- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java +++ b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.services; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(BComponent.class) public class BComponentImpl implements BComponent { diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java index 39806a8101..07397e4502 100644 --- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java +++ b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.services; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CComponent { diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java index 36189f94bb..59ffce8205 100644 --- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java +++ b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.services; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(interfaces = {DComponent.class, D1Component.class}) public class DComponentImpl implements DComponent, D1Component { diff --git a/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java index 977daf9f6a..da779b2c54 100644 --- a/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java +++ b/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java @@ -29,7 +29,7 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; public class ServicesTestCase { private static Node node; diff --git a/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java index 81c47a78d1..833cc50f71 100644 --- a/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java +++ b/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java @@ -18,7 +18,7 @@ */ package bigbank.stockquote; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the StockQuote service. diff --git a/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java index d4b3fe9035..d6db2bd182 100644 --- a/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java +++ b/java/sca/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java @@ -18,7 +18,7 @@ */ package bigbank.stockquote; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the StockQuote service. diff --git a/java/sca/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/java/sca/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java index 0206849a53..000b135f01 100644 --- a/java/sca/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java +++ b/java/sca/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java @@ -18,12 +18,12 @@ */ package spring.annotations; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Service; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.ComponentName; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.ComponentName; import calculator.AddService; import calculator.CalculatorService; diff --git a/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java index 3957e49bf3..5869d344f6 100644 --- a/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java +++ b/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.spring; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * Interface for the "hello world" service - predictably simple with a single operation diff --git a/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java index d75d19295d..90d26dd89f 100644 --- a/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java +++ b/java/sca/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest.spring; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * A simple proxy Java class which implements the HelloWorld interface but which uses diff --git a/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java b/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java index 3e1cb29f33..776d23407a 100644 --- a/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java +++ b/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java @@ -35,11 +35,11 @@ import javax.jms.Session; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQSession; import org.apache.activemq.broker.BrokerService; -import org.osoa.sca.ServiceRuntimeException; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ServiceRuntimeException; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java b/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java index 156b34227d..6010d9abad 100644 --- a/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java +++ b/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java @@ -28,11 +28,11 @@ import java.util.logging.Logger; import javax.sql.XAConnection; import org.apache.derby.jdbc.EmbeddedXADataSource; -import org.osoa.sca.ServiceRuntimeException; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ServiceRuntimeException; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java b/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java index 341a7e53e3..45a9a26c3d 100644 --- a/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java +++ b/java/sca/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java @@ -19,8 +19,8 @@ package org.apache.tuscany.sca.itest.transaction; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/itest/validation/src/main/java/binding/ejb/account/Customer.java b/java/sca/itest/validation/src/main/java/binding/ejb/account/Customer.java index acb74c38ae..ece64ae4b0 100644 --- a/java/sca/itest/validation/src/main/java/binding/ejb/account/Customer.java +++ b/java/sca/itest/validation/src/main/java/binding/ejb/account/Customer.java @@ -18,7 +18,7 @@ */ package binding.ejb.account; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Customer { diff --git a/java/sca/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java b/java/sca/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java index 52ddfa9aba..1a859b04d2 100644 --- a/java/sca/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java +++ b/java/sca/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java @@ -18,9 +18,9 @@ */ package binding.ejb.account; -import org.osoa.sca.ServiceRuntimeException; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.ServiceRuntimeException; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; import binding.ejb.calculator.AddService; diff --git a/java/sca/itest/validation/src/main/java/binding/jms/HelloWorldService.java b/java/sca/itest/validation/src/main/java/binding/jms/HelloWorldService.java index 33bfe1d0ea..81d7d2e585 100644 --- a/java/sca/itest/validation/src/main/java/binding/jms/HelloWorldService.java +++ b/java/sca/itest/validation/src/main/java/binding/jms/HelloWorldService.java @@ -18,7 +18,7 @@ */ package binding.jms; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface HelloWorldService { diff --git a/java/sca/itest/validation/src/main/java/calculator/warning/AddService.java b/java/sca/itest/validation/src/main/java/calculator/warning/AddService.java index 35ba2cbfac..4df26ffd7b 100644 --- a/java/sca/itest/validation/src/main/java/calculator/warning/AddService.java +++ b/java/sca/itest/validation/src/main/java/calculator/warning/AddService.java @@ -18,7 +18,7 @@ */ package calculator.warning; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The Add service interface diff --git a/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java b/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java index ef305370cc..32080df91b 100644 --- a/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java +++ b/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java @@ -21,7 +21,7 @@ package calculator.warning; import java.util.logging.Level; import java.util.logging.Logger; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * An implementation of the Add service diff --git a/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java b/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java index aacde27842..201726c451 100644 --- a/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java +++ b/java/sca/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java @@ -21,8 +21,8 @@ package calculator.warning; import java.util.logging.Level; import java.util.logging.Logger; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; /** * An implementation of the Add service diff --git a/java/sca/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java b/java/sca/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java index 77aafe83de..3f93b8e8a5 100644 --- a/java/sca/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java +++ b/java/sca/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator.warning; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java b/java/sca/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java index 429daf5f2d..599c3f7bb4 100644 --- a/java/sca/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java +++ b/java/sca/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator.warning; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * An implementation of the Property service diff --git a/java/sca/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java b/java/sca/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java index d5e9fcf020..823408908f 100644 --- a/java/sca/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java +++ b/java/sca/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java @@ -21,7 +21,7 @@ package calculator.warning; import java.util.logging.Level; import java.util.logging.Logger; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of the subtract service. diff --git a/java/sca/itest/validation/src/main/java/impl/java/AddServiceImpl.java b/java/sca/itest/validation/src/main/java/impl/java/AddServiceImpl.java index 83f2685d54..bdde8a4721 100644 --- a/java/sca/itest/validation/src/main/java/impl/java/AddServiceImpl.java +++ b/java/sca/itest/validation/src/main/java/impl/java/AddServiceImpl.java @@ -21,7 +21,7 @@ package impl.java; import java.util.logging.Level; import java.util.logging.Logger; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * An implementation of the Add service diff --git a/java/sca/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java b/java/sca/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java index 0183e2a259..138f1a4565 100644 --- a/java/sca/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java +++ b/java/sca/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package impl.java; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/itest/validation/src/main/java/impl/spring/HelloWorld.java b/java/sca/itest/validation/src/main/java/impl/spring/HelloWorld.java index ef0b491617..0cdd72942e 100644 --- a/java/sca/itest/validation/src/main/java/impl/spring/HelloWorld.java +++ b/java/sca/itest/validation/src/main/java/impl/spring/HelloWorld.java @@ -19,8 +19,8 @@ package impl.spring; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * Interface for the "hello world" service - predictably simple with a single operation diff --git a/java/sca/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java b/java/sca/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java index 2e3458f0d3..97d13c8190 100644 --- a/java/sca/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java +++ b/java/sca/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java @@ -19,7 +19,7 @@ package impl.spring; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * A simple proxy Java class which implements the HelloWorld interface but which uses diff --git a/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java b/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java index fa1a621f12..038e2c720f 100644 --- a/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java +++ b/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java @@ -18,7 +18,7 @@ */ package interfacejava.xml; -import org.osoa.sca.annotations.OneWay; +import org.oasisopen.sca.annotation.OneWay; /** * The Calculator service interface. */ diff --git a/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java b/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java index ebf7a79589..4b67ebae97 100644 --- a/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java +++ b/java/sca/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package interfacejava.xml; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import calculator.warning.AddService; import calculator.warning.DivideService; diff --git a/java/sca/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/java/sca/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java index bcd6637a03..a13ea84260 100644 --- a/java/sca/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java +++ b/java/sca/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java @@ -60,7 +60,7 @@ public class XSDValidationTestCase extends TestCase { public void testCalculator() throws Exception { - assertEquals("org.osoa.sca.ServiceRuntimeException: Unexpected element found. It should appear inside a or element.", startUpException.getMessage()); + assertEquals("org.oasisopen.sca.ServiceRuntimeException: Unexpected element found. It should appear inside a or element.", startUpException.getMessage()); } diff --git a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java index 09d5b0278e..f5a4337254 100644 --- a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java +++ b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the client interface for the wires tests diff --git a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java index 9cb845d4b2..82f0e26d58 100644 --- a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java +++ b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.itest; import org.junit.Assert; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * This is the client implementation for the wires tests diff --git a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java index c19a0b4f74..67df1e3a52 100644 --- a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java +++ b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * Sample Wire Service diff --git a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java index b7ccdbf8d1..f0308252ba 100644 --- a/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java +++ b/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.itest; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * Sample WireService Implementation diff --git a/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java b/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java index dc949b5191..dfb7f0a474 100644 --- a/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java +++ b/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java @@ -18,7 +18,7 @@ */ package voidtest; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java b/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java index 4777f793e0..9bb945b71a 100644 --- a/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java +++ b/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java @@ -18,8 +18,8 @@ */ package voidtest; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java b/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java index 1cdd094c50..9ea0a98f95 100644 --- a/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java +++ b/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java @@ -21,9 +21,9 @@ package voidtest; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNull; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(TestClient.class) @Scope("COMPOSITE") diff --git a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java index 842ae0a692..c5b297cf61 100644 --- a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java +++ b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java index d2d898e9c4..1d03f42830 100644 --- a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java +++ b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java @@ -18,8 +18,8 @@ */ package helloworld; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; /** * This client program shows how to create an SCA runtime, start it, diff --git a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java index d4fbd434fe..fc0e2d6122 100644 --- a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java @@ -18,8 +18,8 @@ */ package helloworld; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java index a46f763960..7f8285fa09 100644 --- a/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java +++ b/java/sca/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java @@ -18,8 +18,8 @@ */ package helloworld; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java index 265b11f7dd..f3a5873d53 100644 --- a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java +++ b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java @@ -18,8 +18,8 @@ */ package bigbank.account.services.accountdata; -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.AllowsPassByReference; +import org.oasisopen.sca.annotation.Remotable; @Remotable @AllowsPassByReference diff --git a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java index f8c9c28f26..f74817a0ff 100644 --- a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java +++ b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java @@ -20,7 +20,7 @@ package bigbank.account.services.accountdata; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; import com.bigbank.account.AccountFactory; import com.bigbank.account.AccountLog; diff --git a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java index f16d20689d..47204b66ed 100644 --- a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java +++ b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java @@ -21,7 +21,7 @@ package bigbank.account.services.accountdata; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java index cba6f2ee6c..7e18f52518 100644 --- a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java +++ b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java @@ -21,7 +21,7 @@ package bigbank.account.services.accountdata; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java index 9f15be0236..231aa0f9f3 100644 --- a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java +++ b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java @@ -21,7 +21,7 @@ package bigbank.account.services.accountdata; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java index f174e1af07..254fa34af3 100644 --- a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java +++ b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java @@ -21,7 +21,7 @@ package bigbank.account.services.accountdata; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java index 4a5b7bceef..c0e39baa82 100644 --- a/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java +++ b/java/sca/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java @@ -21,7 +21,7 @@ package bigbank.account.services.accountdata; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java index c9076ebba6..5723aed35d 100644 --- a/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java +++ b/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldService.java index 268d90e910..18f74b083f 100644 --- a/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java index d706517b76..6f26a02c3e 100644 --- a/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java +++ b/java/sca/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** * This client program shows how to create an SCA runtime, start it, diff --git a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java index 9d147dc013..77ba127636 100644 --- a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java +++ b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component2aImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java index 7556e02b36..c2a2420181 100644 --- a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java +++ b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component2bImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java index e7031ff41c..4eb1ba333d 100644 --- a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java +++ b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component3aImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java index 7a049ed7b0..dbaf1ac0a5 100644 --- a/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java +++ b/java/sca/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component3bImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java index 5886ebc6ff..e2c884ec74 100644 --- a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java +++ b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java @@ -20,8 +20,8 @@ package bigbank.account.services.accountdata; import javax.jws.WebService; import javax.xml.ws.ResponseWrapper; -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.AllowsPassByReference; +import org.oasisopen.sca.annotation.Remotable; @Remotable @AllowsPassByReference diff --git a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java index df658428fd..c23a281b6f 100644 --- a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java @@ -18,7 +18,7 @@ */ package bigbank.account.services.accountdata; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; import com.bigbank.account.AccountFactory; import com.bigbank.account.AccountLog; diff --git a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java index d39df8c00e..591e9d04d3 100644 --- a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java @@ -19,7 +19,7 @@ package bigbank.account.services.accountdata; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java index d4a06780c3..196dd2a5ba 100644 --- a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java @@ -19,7 +19,7 @@ package bigbank.account.services.accountdata; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java index 6dc46c60b5..00b70807a9 100644 --- a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java @@ -19,7 +19,7 @@ package bigbank.account.services.accountdata; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java index 8471000152..f74be92d8a 100644 --- a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java @@ -19,7 +19,7 @@ package bigbank.account.services.accountdata; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java index 859c61a724..1acfea21a3 100644 --- a/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java @@ -19,7 +19,7 @@ package bigbank.account.services.accountdata; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; import com.bigbank.account.AccountLog; import com.bigbank.account.AccountReport; diff --git a/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java index ca7c25f3fa..78882aa1d0 100644 --- a/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java b/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java index 8b234599aa..6892c99e13 100644 --- a/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java b/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java index 03984f7252..062275833e 100644 --- a/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java +++ b/java/sca/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; /** * This client program shows how to create an SCA runtime, start it, diff --git a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java index 45bb697437..74e2ae5d0d 100644 --- a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component2aImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java index 9342c8e6ee..84bacd658d 100644 --- a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component2bImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java index 6c5ac96b67..eed10cde7c 100644 --- a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component3aImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java index ebaf33f568..3a79f52575 100644 --- a/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.itest; import helloworld.HelloWorldService; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; public class Component3bImpl implements HelloWorldService { diff --git a/java/sca/itest/wsdlless/src/main/java/service/SomeService.java b/java/sca/itest/wsdlless/src/main/java/service/SomeService.java index f6aaacb23a..2283f8095f 100644 --- a/java/sca/itest/wsdlless/src/main/java/service/SomeService.java +++ b/java/sca/itest/wsdlless/src/main/java/service/SomeService.java @@ -19,7 +19,7 @@ package service; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface SomeService { diff --git a/java/sca/itest/wsdlless/src/main/java/service/SomeServiceImpl.java b/java/sca/itest/wsdlless/src/main/java/service/SomeServiceImpl.java index 39a2131024..728799c131 100644 --- a/java/sca/itest/wsdlless/src/main/java/service/SomeServiceImpl.java +++ b/java/sca/itest/wsdlless/src/main/java/service/SomeServiceImpl.java @@ -18,7 +18,7 @@ */ package service; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(SomeService.class) public class SomeServiceImpl implements SomeService { 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 implements PullTransformer { 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 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.

    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 void visitConstructor(Constructor 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 void visitClass(Class 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 void visitClass(Class 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> 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 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.

    For example, given: * * 

    -     *  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)
      *
    * *

    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 void visitClass(Class 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 constructorAnnotationType - = org.osoa.sca.annotations.Constructor.class; + = org.oasisopen.sca.annotation.Constructor.class; private Class 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/oasisopen/sca/CallableReference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/CallableReference.java new file mode 100644 index 0000000000..cdfaded693 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/CallableReference.java @@ -0,0 +1,54 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca; + +/** + * Common superclass for references that can be passed between components. + * + * @version $Rev$ $Date$ + * @param the Java interface associated with this reference + */ +public interface CallableReference { + /** + * Returns a type-safe reference to the target of this reference. + * The instance returned is guaranteed to implement the business interface for this reference + * but may not be a proxy as defined by java.lang.reflect.Proxy. + * + * @return a proxy to the target that implements the business interface associated with this reference + */ + B getService(); + + /** + * Returns the Java class for the business interface associated with this reference. + * + * @return the Class for the business interface associated with this reference + */ + Class getBusinessInterface(); + + /** + * Returns true if this reference is conversational. + * + * @return true if this reference is conversational + */ + boolean isConversational(); + + /** + * Returns the conversation associated with this reference. + * Returns null if no conversation is currently active. + * + * @return the conversation associated with this reference; may be null + */ + Conversation getConversation(); + + /** + * Returns the callback ID. + * + * @return the callback ID + */ + Object getCallbackID(); +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java new file mode 100644 index 0000000000..7e1a2e6b2e --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java @@ -0,0 +1,122 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca; + +import java.util.Collection; + +/** + * Interface providing programmatic access to a component's SCA context as an alternative to injection. + * It provides access to reference and property values for the component and provides a mechanism for + * obtaining a reference to a service that can be passed to other components. + *

    + * SCA components obtain an instance of this interface through injection. Non-SCA client code may also + * obtain an instance through runtime-specific mechanisms. + * + * @version $Rev$ $Date$ + */ +public interface ComponentContext { + /** + * Returns the absolute URI of the component within the SCA Domain. + * + * @return the absolute URI of the component + */ + String getURI(); + + /** + * Cast a type-safe reference to a CallableReference. + * Converts a type-safe reference to an equivalent CallableReference; if the target refers to a service + * then a ServiceReference will be returned, if the target refers to a callback then a CallableReference + * will be returned. + * + * @param target a reference proxy provided by the SCA runtime + * @param the Java type of the business interface for the reference + * @param the type of reference to be returned + * @return a CallableReference equivalent for the proxy + * @throws IllegalArgumentException if the supplied instance is not a reference supplied by the SCA runtime + */ + > R cast(B target) throws IllegalArgumentException; + + /** + * Returns a proxy for a reference defined by this component. + * + * @param businessInterface the interface that will be used to invoke the service + * @param referenceName the name of the reference + * @param the Java type of the business interface for the reference + * @return an object that implements the business interface + */ + B getService(Class businessInterface, String referenceName); + + /** + * Returns a ServiceReference for a reference defined by this component. + * + * @param businessInterface the interface that will be used to invoke the service + * @param referenceName the name of the reference + * @param the Java type of the business interface for the reference + * @return a ServiceReference for the designated reference + */ + ServiceReference getServiceReference(Class businessInterface, String referenceName); + + /** + * Returns the value of an SCA property defined by this component. + * + * @param type the Java type to be returned for the property + * @param propertyName the name of the property whose value should be returned + * @param the Java type of the property + * @return the property value + */ + B getProperty(Class type, String propertyName); + + /** + * Returns a ServiceReference that can be used to invoke this component over the default service. + * + * @param businessInterface the interface that will be used to invoke the service + * @param the Java type of the business interface for the reference + * @return a ServiceReference that will invoke this component + */ + ServiceReference createSelfReference(Class businessInterface); + + /** + * Returns a ServiceReference that can be used to invoke this component over the designated service. + * + * @param businessInterface the interface that will be used to invoke the service + * @param serviceName the name of the service to invoke + * @param the Java type of the business interface for the reference + * @return a ServiceReference that will invoke this component + */ + ServiceReference createSelfReference(Class businessInterface, String serviceName); + + /** + * Returns the context for the current SCA service request, or null if there is no current request + * or if the context is unavailable. + * + * @return the SCA request context; may be null + */ + RequestContext getRequestContext(); + + + /* ******************** Contribution for issue TUSCANY-2281 ******************** */ + + /** + * Returns a Collection of typed service proxies for a business interface type and a reference name. + * @param businessInterface the interface that will be used to invoke the service + * @param referenceName the name of the reference + * @param the Java type of the business interface for the reference + * @return a Collection of objects that implements the business interface + */ + Collection getServices(Class businessInterface, String referenceName); + + + /** + * Returns a Collection of typed service reference for a business interface type and a reference name. + * @param businessInterface the interface that will be used to invoke the service + * @param referenceName the name of the reference + * @param the Java type of the business interface for the reference + * @return a Collection of objects that implements the business interface + */ + Collection> getServiceReferences(Class businessInterface, String referenceName); +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java new file mode 100644 index 0000000000..5135c23dde --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.oasisopen.sca; + +/** + * @version $Rev$ $Date$ + */ +public interface Constants { + /** + * Namespace for intents. + */ + String SCA_NS = "http://www.osoa.org/xmlns/sca/1.0"; + + /** + * Prefix form of the namespace that can be prepended to intent declarations. + */ + String SCA_PREFIX = '{' + SCA_NS + '}'; +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Conversation.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Conversation.java new file mode 100644 index 0000000000..d4e4034eed --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/Conversation.java @@ -0,0 +1,30 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca; + +/** + * Interface representing a Conversation providing access to the conversation id and and a mechanism + * to terminate the conversation. + * + * @version $Rev$ $Date$ + */ +public interface Conversation { + /** + * Returns the identifier for this conversation. + * If a user-defined identity had been supplied for this reference then its value will be returned; + * otherwise the identity generated by the system when the conversation was initiated will be returned. + * + * @return the identifier for this conversation + */ + Object getConversationID(); + + /** + * End this conversation. + */ + void end(); +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ConversationEndedException.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ConversationEndedException.java new file mode 100644 index 0000000000..72944d6dfc --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ConversationEndedException.java @@ -0,0 +1,56 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca; + +/** + * Exception thrown to indicate the conversation being used for a stateful interaction has been ended. + * + * @version $Rev$ $Date$ + */ +public class ConversationEndedException extends ServiceRuntimeException { + private static final long serialVersionUID = 3734864942222558406L; + + /** + * Override constructor from ServiceRuntimeException. + * + * @see ServiceRuntimeException + */ + public ConversationEndedException() { + } + + /** + * Override constructor from ServiceRuntimeException. + * + * @param message passed to ServiceRuntimeException + * @see ServiceRuntimeException + */ + public ConversationEndedException(String message) { + super(message); + } + + /** + * Override constructor from ServiceRuntimeException. + * + * @param message passed to ServiceRuntimeException + * @param cause passed to ServiceRuntimeException + * @see ServiceRuntimeException + */ + public ConversationEndedException(String message, Throwable cause) { + super(message, cause); + } + + /** + * Override constructor from ServiceRuntimeException. + * + * @param cause passed to ServiceRuntimeException + * @see ServiceRuntimeException + */ + public ConversationEndedException(Throwable cause) { + super(cause); + } +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/NoRegisteredCallbackException.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/NoRegisteredCallbackException.java new file mode 100644 index 0000000000..fcf88f75c1 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/NoRegisteredCallbackException.java @@ -0,0 +1,57 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca; + +/** + * Exception thrown to indicate that no callback has been registered + * when interacting with a service. + * + * @version $Rev$ $Date$ + */ +public class NoRegisteredCallbackException extends ServiceRuntimeException { + private static final long serialVersionUID = 3734864942222558406L; + + /** + * Override constructor from ServiceRuntimeException. + * + * @see ServiceRuntimeException + */ + public NoRegisteredCallbackException() { + } + + /** + * Override constructor from ServiceRuntimeException. + * + * @param message passed to ServiceRuntimeException + * @see ServiceRuntimeException + */ + public NoRegisteredCallbackException(String message) { + super(message); + } + + /** + * Override constructor from ServiceRuntimeException. + * + * @param message passed to ServiceRuntimeException + * @param cause passed to ServiceRuntimeException + * @see ServiceRuntimeException + */ + public NoRegisteredCallbackException(String message, Throwable cause) { + super(message, cause); + } + + /** + * Override constructor from ServiceRuntimeException. + * + * @param cause passed to ServiceRuntimeException + * @see ServiceRuntimeException + */ + public NoRegisteredCallbackException(Throwable cause) { + super(cause); + } +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java new file mode 100644 index 0000000000..5c8fe61073 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java @@ -0,0 +1,55 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca; + +import javax.security.auth.Subject; + +/** + * Interface that provides information on the current request. + * + * @version $Rev$ $Date$ + */ +public interface RequestContext { + /** + * Returns the JAAS Subject of the current request. + * + * @return the Subject of the current request + */ + Subject getSecuritySubject(); + + /** + * Returns the name of the service that was invoked. + * + * @return the name of the service that was invoked + */ + String getServiceName(); + + /** + * Returns a CallableReference for the service that was invoked by the caller. + * + * @param the Java type of the business interface for the reference + * @return a CallableReference for the service that was invoked by the caller + */ + CallableReference getServiceReference(); + + /** + * Returns a type-safe reference to the callback provided by the caller. + * + * @param the Java type of the business interface for the callback + * @return a type-safe reference to the callback provided by the caller + */ + CB getCallback(); + + /** + * Returns a CallableReference to the callback provided by the caller. + * + * @param the Java type of the business interface for the callback + * @return a CallableReference to the callback provided by the caller + */ + CallableReference getCallbackReference(); +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java new file mode 100644 index 0000000000..55d875a5f3 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java @@ -0,0 +1,54 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca; + + +/** + * A ServiceReference represents a client's perspective of a reference to another service. + * + * @version $Rev$ $Date$ + * @param the Java interface associated with this reference + */ +public interface ServiceReference extends CallableReference { + /** + * Returns the id supplied by the user that will be associated with conversations initiated through this reference. + * + * @return the id to associated with any conversation initiated through this reference + */ + Object getConversationID(); + + /** + * Set the id to associate with any conversation started through this reference. + * If the value supplied is null then the id will be generated by the implementation. + * + * @param conversationId the user-defined id to associated with a conversation + * @throws IllegalStateException if a conversation is currently associated with this reference + */ + void setConversationID(Object conversationId) throws IllegalStateException; + + /** + * Sets the callback ID. + * + * @param callbackID the callback ID + */ + void setCallbackID(Object callbackID); + + /** + * Returns the callback object. + * + * @return the callback object + */ + Object getCallback(); + + /** + * Sets the callback object. + * + * @param callback the callback object + */ + void setCallback(Object callback); +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java new file mode 100644 index 0000000000..d11c1904c5 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java @@ -0,0 +1,58 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca; + + +/** + * Base for Exceptions that may be raised by an SCA runtime and which typical + * application code is not expected to be able to handle. + * + * @version $Rev$ $Date$ + */ +public class ServiceRuntimeException extends RuntimeException { + private static final long serialVersionUID = -3876058842262557092L; + + /** + * Override constructor from RuntimeException. + * + * @see RuntimeException + */ + public ServiceRuntimeException() { + } + + /** + * Override constructor from RuntimeException. + * + * @param message passed to RuntimeException + * @see RuntimeException + */ + public ServiceRuntimeException(String message) { + super(message); + } + + /** + * Override constructor from RuntimeException. + * + * @param message passed to RuntimeException + * @param cause passed to RuntimeException + * @see RuntimeException + */ + public ServiceRuntimeException(String message, Throwable cause) { + super(message, cause); + } + + /** + * Override constructor from RuntimeException. + * + * @param cause passed to RuntimeException + * @see RuntimeException + */ + public ServiceRuntimeException(Throwable cause) { + super(cause); + } +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java new file mode 100644 index 0000000000..5d8e4af6ff --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java @@ -0,0 +1,54 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca; + +/** + * Exception used to indicate that a runtime exception occurred during the invocation of and external service. + * + * @version $Rev$ $Date$ + */ +public class ServiceUnavailableException extends ServiceRuntimeException { + + private static final long serialVersionUID = -5869397223249401047L; + + /** + * Constructs a new ServiceUnavailableException. + */ + public ServiceUnavailableException() { + super((Throwable) null); + } + + /** + * Constructs a new ServiceUnavailableException with the specified detail message. + * + * @param message The detail message (which is saved to later retrieval by the getMessage() method). + */ + public ServiceUnavailableException(String message) { + super(message); + } + + /** + * Constructs a new ServiceUnavailableException with the specified cause. + * + * @param cause The cause (which is saved to later retrieval by the getCause() method). + */ + public ServiceUnavailableException(Throwable cause) { + super(cause); + } + + /** + * Constructs a new ServiceUnavailableException with the specified detail message and cause. + * + * @param message The message (which is saved to later retrieval by the getMessage() method). + * @param cause The cause (which is saved to later retrieval by the getCause() method). + */ + public ServiceUnavailableException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java new file mode 100644 index 0000000000..dbc08a7655 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java @@ -0,0 +1,28 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation on a method that indicates that its parameters may safely + * be passed by reference. The annotation may also be placed on an interface + * or class to indicate that all declared methods support this optimization. + * + * @version $Rev$ $Date$ + */ +@Target({TYPE, METHOD}) +@Retention(RUNTIME) +public @interface AllowsPassByReference { +} + diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java new file mode 100644 index 0000000000..cfc0af0318 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java @@ -0,0 +1,58 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +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.oasisopen.sca.Constants.SCA_PREFIX; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation denoting the intent that service operations require authentication. + *

    + * Applied to the injection site (field, method or constructor parameter) for a reference, + * it indicates that all invocations through that reference require authentication. + *

    + * Applied to a interface method on a service contract, it indicates that all invocations + * of that service operation require authentication; applied to the type of a service contract, + * it indicates that all service operations on that interface require authentication. + *

    + * Applied to a method on an implementation class, it indicates that all invocations that + * are dispatched to that implementation method (through any service) require authentication. + * Applied to a interface implemented by an implementation class, it indicates that all + * invocations that are dispatched to the implementation method for that interface operation + * require authentication. + *

    + * Applied to an implementation class, it indicates that all invocations of that implementation + * and that all invocations made by that implementation require authentication. + * + * @version $Rev$ $Date$ + */ +@Inherited +@Target({TYPE, FIELD, METHOD, PARAMETER}) +@Retention(RUNTIME) +@Intent(Authentication.AUTHENTICATION) +public @interface Authentication { + String AUTHENTICATION = SCA_PREFIX + "authentication"; + String AUTHENTICATION_MESSAGE = AUTHENTICATION + "message"; + String AUTHENTICATION_TRANSPORT = AUTHENTICATION + "transport"; + + /** + * List of authentication qualifiers (such as "message" or "transport"). + * + * @return authentication qualifiers + */ + @Qualifier + String[] value() default ""; +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java new file mode 100644 index 0000000000..b8d71dac05 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java @@ -0,0 +1,39 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +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.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * When placed on a service interface, this annotation specifies the interface + * to be used for callbacks. + *

    + * When placed on a method or field, this annotation denotes the injection + * site to be used for a callback reference. + *

    + * There is a error in the 1.00 draft spec in the declaration of this interface. + * The form defined here is a proposed correction for that error. + * + * @version $Rev$ $Date$ + */ +@Target({TYPE, METHOD, FIELD}) +@Retention(RUNTIME) +public @interface Callback { + /** + * The Class of the associated callback interface. + * + * @return the associated callback interface + */ + Class value() default Void.class; +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java new file mode 100644 index 0000000000..8fc3cd4013 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java @@ -0,0 +1,25 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation used to indicate a field or method that is used to inject the component's name. + * + * @version $Rev$ $Date$ + */ +@Target({METHOD, FIELD}) +@Retention(RUNTIME) +public @interface ComponentName { +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java new file mode 100644 index 0000000000..5c594bc7d3 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java @@ -0,0 +1,58 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +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.oasisopen.sca.Constants.SCA_PREFIX; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation denoting the intent that service operations require confidentiality. + *

    + * Applied to the injection site (field, method or constructor parameter) for a reference, + * it indicates that all invocations through that reference require confidentiality. + *

    + * Applied to a interface method on a service contract, it indicates that all invocations + * of that service operation require confidentiality; applied to the type of a service contract, + * it indicates that all service operations on that interface require confidentiality. + *

    + * Applied to a method on an implementation class, it indicates that all invocations that + * are dispatched to that implementation method (through any service) require confidentiality. + * Applied to a interface implemented by an implementation class, it indicates that all + * invocations that are dispatched to the implementation method for that interface operation + * require confidentiality. + *

    + * Applied to an implementation class, it indicates that all invocations of that implementation + * and that all invocations made by that implementation require confidentiality. + * + * @version $Rev$ $Date$ + */ +@Inherited +@Target({TYPE, FIELD, METHOD, PARAMETER}) +@Retention(RUNTIME) +@Intent(Confidentiality.CONFIDENTIALITY) +public @interface Confidentiality { + String CONFIDENTIALITY = SCA_PREFIX + "confidentiality"; + String CONFIDENTIALITY_MESSAGE = CONFIDENTIALITY + ".message"; + String CONFIDENTIALITY_TRANSPORT = CONFIDENTIALITY + ".transport"; + + /** + * List of confidentiality qualifiers (such as "message" or "transport"). + * + * @return confidentiality qualifiers + */ + @Qualifier + String[] value() default ""; +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java new file mode 100644 index 0000000000..a5728e51d4 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java @@ -0,0 +1,25 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Used to indicate the constructor the runtime is to use when instantiating a component implementation instance + * + * @version $Rev$ $Date$ + */ +@Target(CONSTRUCTOR) +@Retention(RUNTIME) +public @interface Constructor { + String[] value() default ""; +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java new file mode 100644 index 0000000000..e7f7aef069 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java @@ -0,0 +1,28 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation used to indicate a field or setter method that is used to inject an SCA context. + * The type of context injected is determined by the type of the field or the parameter + * to the setter method and is typically a ComponentContext or RequestContext. + * + * @version $Rev$ $Date$ + */ +@Target({METHOD, FIELD}) +@Retention(RUNTIME) +public @interface Context { +} + diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationAttributes.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationAttributes.java new file mode 100644 index 0000000000..498cc3eea3 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationAttributes.java @@ -0,0 +1,46 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation used to indicate the characteristics of a conversation. + * + * @version $Rev$ $Date$ + */ +@Target(ElementType.TYPE) +@Retention(RUNTIME) +public @interface ConversationAttributes { + /** + * The maximum time that can pass between operations in a single conversation. If this time is exceeded the + * container may end the conversation. + * + * @return the maximum time that can pass between operations in a single conversation + */ + String maxIdleTime() default ""; + + /** + * The maximum time that a conversation may remain active. If this time is exceeded the container may end the + * conversation. + * + * @return the maximum time that a conversation may remain active + */ + String maxAge() default ""; + + /** + * If true, indicates that only the user that initiated the conversation has the authority to continue it. + * + * @return true if only the user that initiated the conversation has the authority to continue it + */ + boolean singlePrincipal() default false; +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationID.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationID.java new file mode 100644 index 0000000000..2cc62afdbf --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ConversationID.java @@ -0,0 +1,25 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation used to indicate a field or method that is used to inject the conversation ID. + * + * @version $Rev$ $Date$ + */ +@Target({METHOD, FIELD}) +@Retention(RUNTIME) +public @interface ConversationID { +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Conversational.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Conversational.java new file mode 100644 index 0000000000..6a406f2acc --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Conversational.java @@ -0,0 +1,27 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Used on a Java interface to denote a conversational service contract. + *

    + * The draft spec erroneously defines the targets for this as {TYPE, METHOD, FIELD} + * but this annotation is only applicable to interfaces. + * + * @version $Rev$ $Date$ + */ +@Target({TYPE}) +@Retention(RUNTIME) +public @interface Conversational { +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java new file mode 100644 index 0000000000..2ad6fdc892 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java @@ -0,0 +1,25 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation used to indicate a method that will be called by the container when the + * scope defined for the local service ends. + * + * @version $Rev$ $Date$ + */ +@Target(METHOD) +@Retention(RUNTIME) +public @interface Destroy { +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java new file mode 100644 index 0000000000..d53e9e4fc4 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java @@ -0,0 +1,25 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation used to indicate an instance should be eagerly initialized. + * + * @version $Rev$ $Date$ + */ +@Target({TYPE}) +@Retention(RUNTIME) +public @interface EagerInit { + +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EndsConversation.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EndsConversation.java new file mode 100644 index 0000000000..4f58c50802 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EndsConversation.java @@ -0,0 +1,24 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation used to indicate a method ends a conversation. + * + * @version $Rev$ $Date$ + */ +@Target({METHOD}) +@Retention(RUNTIME) +public @interface EndsConversation { +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java new file mode 100644 index 0000000000..3fe9bf585f --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java @@ -0,0 +1,26 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation used to indicate a method that will be called by the container when the scope defined for the local + * service begins. + * + * @version $Rev$ $Date$ + */ +@Target(METHOD) +@Retention(RUNTIME) +public @interface Init { + +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java new file mode 100644 index 0000000000..0c196f1ce5 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java @@ -0,0 +1,58 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +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.oasisopen.sca.Constants.SCA_PREFIX; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation denoting the intent that service operations require integrity. + *

    + * Applied to the injection site (field, method or constructor parameter) for a reference, + * it indicates that all invocations through that reference require integrity. + *

    + * Applied to a interface method on a service contract, it indicates that all invocations + * of that service operation require integrity; applied to the type of a service contract, + * it indicates that all service operations on that interface require integrity. + *

    + * Applied to a method on an implementation class, it indicates that all invocations that + * are dispatched to that implementation method (through any service) require integrity. + * Applied to a interface implemented by an implementation class, it indicates that all + * invocations that are dispatched to the implementation method for that interface operation + * require integrity. + *

    + * Applied to an implementation class, it indicates that all invocations of that implementation + * and that all invocations made by that implementation require integrity. + * + * @version $Rev$ $Date$ + */ +@Inherited +@Target({TYPE, FIELD, METHOD, PARAMETER}) +@Retention(RUNTIME) +@Intent(Integrity.INTEGRITY) +public @interface Integrity { + String INTEGRITY = SCA_PREFIX + "integrity"; + String INTEGRITY_MESSAGE = INTEGRITY + "message"; + String INTEGRITY_TRANSPORT = INTEGRITY + "transport"; + + /** + * List of integrity qualifiers (such as "message" or "transport"). + * + * @return integrity qualifiers + */ + @Qualifier + String[] value() default ""; +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java new file mode 100644 index 0000000000..c3e9914f23 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java @@ -0,0 +1,48 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation that can be applied to annotations that describe SCA intents. + * Adding this annotation allows SCA runtimes to automatically detect user-defined intents. + *

    + * Applications must specify a value, a pairing of targetNamespace and localPort, or both. + * If both value and pairing are supplied they must define the name qualified name. + * + * @version $Rev$ $Date$ + */ +@Target({ANNOTATION_TYPE}) +@Retention(RUNTIME) +public @interface Intent { + /** + * The qualified name of the intent, in the form defined by {@link javax.xml.namespace.QName#toString}. + * + * @return the qualified name of the intent + */ + String value() default ""; + + /** + * The XML namespace for the intent. + * + * @return the XML namespace for the intent + */ + String targetNamespace() default ""; + + /** + * The name of the intent within its namespace. + * + * @return name of the intent within its namespace + */ + String localPart() default ""; +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java new file mode 100644 index 0000000000..458d05cc92 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java @@ -0,0 +1,25 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation on a method that indicates that the method is non-blocking and communication + * with the service provider may use buffer the requests and send them at some later time. + * + * @version $Rev$ $Date$ + */ +@Target({METHOD}) +@Retention(RUNTIME) +public @interface OneWay { +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java new file mode 100644 index 0000000000..150d8dabc8 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java @@ -0,0 +1,35 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +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 java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation that allows application of SCA Policy Sets. + *

    + * Each policy set is specified using its XML QName in the form defined by {@link javax.xml.namespace.QName#toString()}. + * + * @version $Rev$ $Date$ + */ +@Target({TYPE, FIELD, METHOD, PARAMETER}) +@Retention(RUNTIME) +public @interface PolicySets { + /** + * Returns the policy sets to be applied. + * + * @return the policy sets to be applied + */ + String[] value() default ""; +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java new file mode 100644 index 0000000000..0ab54ef6e4 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java @@ -0,0 +1,41 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +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.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation used to indicate a constructor parameter, field or method that is + * used to inject a configuration property value. + * + * @version $Rev$ $Date$ + */ +@Target({METHOD, FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface Property { + /** + * The name of the property. If not specified then the name will be derived + * from the annotated field or method. + * + * @return the name of the property + */ + String name() default ""; + + /** + * Indicates whether a value for the property must be provided. + * + * @return true if a value must be provided + */ + boolean required() default false; +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java new file mode 100644 index 0000000000..a5fd102859 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java @@ -0,0 +1,25 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation that can be applied to an attribute of an @Intent annotation to indicate the + * attribute provides qualifiers for the intent. + * + * @version $Rev$ $Date$ + */ +@Target(METHOD) +@Retention(RUNTIME) +public @interface Qualifier { +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java new file mode 100644 index 0000000000..9a7154fcf3 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java @@ -0,0 +1,40 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +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.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation used to indicate a constructor parameter, field or method that is used to inject a reference. + * + * @version $Rev$ $Date$ + */ +@Target({METHOD, FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface Reference { + /** + * The name of the reference. If not specified then the name will be derived from the annotated field or method. + * + * @return the name of the reference + */ + String name() default ""; + + /** + * Indicates if a reference must be specified. + * + * @return true if a reference must be specified + */ + boolean required() default true; +} + diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java new file mode 100644 index 0000000000..77ff4e26f9 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java @@ -0,0 +1,26 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation used to indicate a Java interface as remotable. + * Remotable interfaces use pass-by-value semantics, can be published as entry points + * and used for external services. + * + * @version $Rev$ $Date$ + */ +@Target(TYPE) +@Retention(RUNTIME) +public @interface Remotable { +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java new file mode 100644 index 0000000000..e44775398e --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java @@ -0,0 +1,46 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +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 java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation that allows the attachment of any intent to a Java Class or interface or to members of that + * class such as methods, fields or constructor parameters. + *

    + * Intents are specified as XML QNames in the representation defined by + * {@link javax.xml.namespace.QName#toString()}. Intents may be qualified with one or more + * suffixes separated by a "." such as: + *

      + *
    • {http://www.osoa.org/xmlns/sca/1.0}confidentiality
      • + *
    • {http://www.osoa.org/xmlns/sca/1.0}confidentiality.message
      • + *
    + * This annotation supports general purpose intents specified as strings. Users may also define + * specific intents using the {@link @org.oasisopen.sca.annotation.Intent} annotation. + * + * @version $Rev$ $Date$ + */ +@Inherited +@Retention(RUNTIME) +@Target({TYPE, METHOD, FIELD, PARAMETER}) +public @interface Requires { + /** + * Returns the attached intents. + * + * @return the attached intents + */ + String[] value() default ""; +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java new file mode 100644 index 0000000000..d7cfaab3f5 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java @@ -0,0 +1,38 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation used to indicate a scoped service. + *

    + * The spec refers to but does not describe an eager() attribute; this is an error in the draft. + * + * @version $Rev$ $Date$ + */ +@Target(TYPE) +@Retention(RUNTIME) +public @interface Scope { + /** + * The name of the scope. Values currently defined by the specification are: + *

      + *
    • STATELESS (default)
      • + *
    • REQUEST
      • + *
    • CONVERSATION
      • + *
    • COMPOSITE
      • + *
    + * + * @return the name of the scope + */ + String value() default "STATELESS"; +} diff --git a/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java new file mode 100644 index 0000000000..36c5bff5e9 --- /dev/null +++ b/java/sca/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java @@ -0,0 +1,37 @@ +/* + * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, + * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase + * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. + * + * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications + */ +package org.oasisopen.sca.annotation; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation used to indicate the service interfaces exposed by a Java class. + * + * @version $Rev$ $Date$ + */ +@Target({TYPE}) +@Retention(RUNTIME) +public @interface Service { + /** + * Array of interfaces that should be exposed as services. + * + * @return a list of interfaces that should be exposed as services + */ + Class[] interfaces() default {}; + + /** + * Shortcut allowing a single interface to be exposed. + * + * @return a single service interfaces to be exposed + */ + Class value() default Void.class; +} 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/osoa/sca/CallableReference.java deleted file mode 100644 index 7f6756bcbd..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca; - -/** - * Common superclass for references that can be passed between components. - * - * @version $Rev$ $Date$ - * @param the Java interface associated with this reference - */ -public interface CallableReference { - /** - * Returns a type-safe reference to the target of this reference. - * The instance returned is guaranteed to implement the business interface for this reference - * but may not be a proxy as defined by java.lang.reflect.Proxy. - * - * @return a proxy to the target that implements the business interface associated with this reference - */ - B getService(); - - /** - * Returns the Java class for the business interface associated with this reference. - * - * @return the Class for the business interface associated with this reference - */ - Class getBusinessInterface(); - - /** - * Returns true if this reference is conversational. - * - * @return true if this reference is conversational - */ - boolean isConversational(); - - /** - * Returns the conversation associated with this reference. - * Returns null if no conversation is currently active. - * - * @return the conversation associated with this reference; may be null - */ - Conversation getConversation(); - - /** - * Returns the callback ID. - * - * @return the callback ID - */ - Object getCallbackID(); -} 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/osoa/sca/ComponentContext.java deleted file mode 100644 index e25917e0f8..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca; - -import java.util.Collection; - -/** - * Interface providing programmatic access to a component's SCA context as an alternative to injection. - * It provides access to reference and property values for the component and provides a mechanism for - * obtaining a reference to a service that can be passed to other components. - *

    - * SCA components obtain an instance of this interface through injection. Non-SCA client code may also - * obtain an instance through runtime-specific mechanisms. - * - * @version $Rev$ $Date$ - */ -public interface ComponentContext { - /** - * Returns the absolute URI of the component within the SCA Domain. - * - * @return the absolute URI of the component - */ - String getURI(); - - /** - * Cast a type-safe reference to a CallableReference. - * Converts a type-safe reference to an equivalent CallableReference; if the target refers to a service - * then a ServiceReference will be returned, if the target refers to a callback then a CallableReference - * will be returned. - * - * @param target a reference proxy provided by the SCA runtime - * @param the Java type of the business interface for the reference - * @param the type of reference to be returned - * @return a CallableReference equivalent for the proxy - * @throws IllegalArgumentException if the supplied instance is not a reference supplied by the SCA runtime - */ - > R cast(B target) throws IllegalArgumentException; - - /** - * Returns a proxy for a reference defined by this component. - * - * @param businessInterface the interface that will be used to invoke the service - * @param referenceName the name of the reference - * @param the Java type of the business interface for the reference - * @return an object that implements the business interface - */ - B getService(Class businessInterface, String referenceName); - - /** - * Returns a ServiceReference for a reference defined by this component. - * - * @param businessInterface the interface that will be used to invoke the service - * @param referenceName the name of the reference - * @param the Java type of the business interface for the reference - * @return a ServiceReference for the designated reference - */ - ServiceReference getServiceReference(Class businessInterface, String referenceName); - - /** - * Returns the value of an SCA property defined by this component. - * - * @param type the Java type to be returned for the property - * @param propertyName the name of the property whose value should be returned - * @param the Java type of the property - * @return the property value - */ - B getProperty(Class type, String propertyName); - - /** - * Returns a ServiceReference that can be used to invoke this component over the default service. - * - * @param businessInterface the interface that will be used to invoke the service - * @param the Java type of the business interface for the reference - * @return a ServiceReference that will invoke this component - */ - ServiceReference createSelfReference(Class businessInterface); - - /** - * Returns a ServiceReference that can be used to invoke this component over the designated service. - * - * @param businessInterface the interface that will be used to invoke the service - * @param serviceName the name of the service to invoke - * @param the Java type of the business interface for the reference - * @return a ServiceReference that will invoke this component - */ - ServiceReference createSelfReference(Class businessInterface, String serviceName); - - /** - * Returns the context for the current SCA service request, or null if there is no current request - * or if the context is unavailable. - * - * @return the SCA request context; may be null - */ - RequestContext getRequestContext(); - - - /* ******************** Contribution for issue TUSCANY-2281 ******************** */ - - /** - * Returns a Collection of typed service proxies for a business interface type and a reference name. - * @param businessInterface the interface that will be used to invoke the service - * @param referenceName the name of the reference - * @param the Java type of the business interface for the reference - * @return a Collection of objects that implements the business interface - */ - Collection getServices(Class businessInterface, String referenceName); - - - /** - * Returns a Collection of typed service reference for a business interface type and a reference name. - * @param businessInterface the interface that will be used to invoke the service - * @param referenceName the name of the reference - * @param the Java type of the business interface for the reference - * @return a Collection of objects that implements the business interface - */ - Collection> getServiceReferences(Class businessInterface, String referenceName); -} 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/osoa/sca/Constants.java deleted file mode 100644 index b1b2af8048..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/Constants.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.osoa.sca; - -/** - * @version $Rev$ $Date$ - */ -public interface Constants { - /** - * Namespace for intents. - */ - String SCA_NS = "http://www.osoa.org/xmlns/sca/1.0"; - - /** - * Prefix form of the namespace that can be prepended to intent declarations. - */ - String SCA_PREFIX = '{' + SCA_NS + '}'; -} 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/osoa/sca/Conversation.java deleted file mode 100644 index 12733a7bd2..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca; - -/** - * Interface representing a Conversation providing access to the conversation id and and a mechanism - * to terminate the conversation. - * - * @version $Rev$ $Date$ - */ -public interface Conversation { - /** - * Returns the identifier for this conversation. - * If a user-defined identity had been supplied for this reference then its value will be returned; - * otherwise the identity generated by the system when the conversation was initiated will be returned. - * - * @return the identifier for this conversation - */ - Object getConversationID(); - - /** - * End this conversation. - */ - void end(); -} 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/osoa/sca/ConversationEndedException.java deleted file mode 100644 index 2e3b71fd1c..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca; - -/** - * Exception thrown to indicate the conversation being used for a stateful interaction has been ended. - * - * @version $Rev$ $Date$ - */ -public class ConversationEndedException extends ServiceRuntimeException { - private static final long serialVersionUID = 3734864942222558406L; - - /** - * Override constructor from ServiceRuntimeException. - * - * @see ServiceRuntimeException - */ - public ConversationEndedException() { - } - - /** - * Override constructor from ServiceRuntimeException. - * - * @param message passed to ServiceRuntimeException - * @see ServiceRuntimeException - */ - public ConversationEndedException(String message) { - super(message); - } - - /** - * Override constructor from ServiceRuntimeException. - * - * @param message passed to ServiceRuntimeException - * @param cause passed to ServiceRuntimeException - * @see ServiceRuntimeException - */ - public ConversationEndedException(String message, Throwable cause) { - super(message, cause); - } - - /** - * Override constructor from ServiceRuntimeException. - * - * @param cause passed to ServiceRuntimeException - * @see ServiceRuntimeException - */ - public ConversationEndedException(Throwable cause) { - super(cause); - } -} 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/osoa/sca/NoRegisteredCallbackException.java deleted file mode 100644 index 0a0c2afff9..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca; - -/** - * Exception thrown to indicate that no callback has been registered - * when interacting with a service. - * - * @version $Rev$ $Date$ - */ -public class NoRegisteredCallbackException extends ServiceRuntimeException { - private static final long serialVersionUID = 3734864942222558406L; - - /** - * Override constructor from ServiceRuntimeException. - * - * @see ServiceRuntimeException - */ - public NoRegisteredCallbackException() { - } - - /** - * Override constructor from ServiceRuntimeException. - * - * @param message passed to ServiceRuntimeException - * @see ServiceRuntimeException - */ - public NoRegisteredCallbackException(String message) { - super(message); - } - - /** - * Override constructor from ServiceRuntimeException. - * - * @param message passed to ServiceRuntimeException - * @param cause passed to ServiceRuntimeException - * @see ServiceRuntimeException - */ - public NoRegisteredCallbackException(String message, Throwable cause) { - super(message, cause); - } - - /** - * Override constructor from ServiceRuntimeException. - * - * @param cause passed to ServiceRuntimeException - * @see ServiceRuntimeException - */ - public NoRegisteredCallbackException(Throwable cause) { - super(cause); - } -} 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/osoa/sca/RequestContext.java deleted file mode 100644 index cdcfa9a791..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca; - -import javax.security.auth.Subject; - -/** - * Interface that provides information on the current request. - * - * @version $Rev$ $Date$ - */ -public interface RequestContext { - /** - * Returns the JAAS Subject of the current request. - * - * @return the Subject of the current request - */ - Subject getSecuritySubject(); - - /** - * Returns the name of the service that was invoked. - * - * @return the name of the service that was invoked - */ - String getServiceName(); - - /** - * Returns a CallableReference for the service that was invoked by the caller. - * - * @param the Java type of the business interface for the reference - * @return a CallableReference for the service that was invoked by the caller - */ - CallableReference getServiceReference(); - - /** - * Returns a type-safe reference to the callback provided by the caller. - * - * @param the Java type of the business interface for the callback - * @return a type-safe reference to the callback provided by the caller - */ - CB getCallback(); - - /** - * Returns a CallableReference to the callback provided by the caller. - * - * @param the Java type of the business interface for the callback - * @return a CallableReference to the callback provided by the caller - */ - CallableReference getCallbackReference(); -} 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/osoa/sca/ServiceReference.java deleted file mode 100644 index 8da6bcd1f3..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca; - - -/** - * A ServiceReference represents a client's perspective of a reference to another service. - * - * @version $Rev$ $Date$ - * @param the Java interface associated with this reference - */ -public interface ServiceReference extends CallableReference { - /** - * Returns the id supplied by the user that will be associated with conversations initiated through this reference. - * - * @return the id to associated with any conversation initiated through this reference - */ - Object getConversationID(); - - /** - * Set the id to associate with any conversation started through this reference. - * If the value supplied is null then the id will be generated by the implementation. - * - * @param conversationId the user-defined id to associated with a conversation - * @throws IllegalStateException if a conversation is currently associated with this reference - */ - void setConversationID(Object conversationId) throws IllegalStateException; - - /** - * Sets the callback ID. - * - * @param callbackID the callback ID - */ - void setCallbackID(Object callbackID); - - /** - * Returns the callback object. - * - * @return the callback object - */ - Object getCallback(); - - /** - * Sets the callback object. - * - * @param callback the callback object - */ - void setCallback(Object callback); -} 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/osoa/sca/ServiceRuntimeException.java deleted file mode 100644 index 70f5f904a4..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca; - - -/** - * Base for Exceptions that may be raised by an SCA runtime and which typical - * application code is not expected to be able to handle. - * - * @version $Rev$ $Date$ - */ -public class ServiceRuntimeException extends RuntimeException { - private static final long serialVersionUID = -3876058842262557092L; - - /** - * Override constructor from RuntimeException. - * - * @see RuntimeException - */ - public ServiceRuntimeException() { - } - - /** - * Override constructor from RuntimeException. - * - * @param message passed to RuntimeException - * @see RuntimeException - */ - public ServiceRuntimeException(String message) { - super(message); - } - - /** - * Override constructor from RuntimeException. - * - * @param message passed to RuntimeException - * @param cause passed to RuntimeException - * @see RuntimeException - */ - public ServiceRuntimeException(String message, Throwable cause) { - super(message, cause); - } - - /** - * Override constructor from RuntimeException. - * - * @param cause passed to RuntimeException - * @see RuntimeException - */ - public ServiceRuntimeException(Throwable cause) { - super(cause); - } -} 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/osoa/sca/ServiceUnavailableException.java deleted file mode 100644 index dd6b1c3242..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca; - -/** - * Exception used to indicate that a runtime exception occurred during the invocation of and external service. - * - * @version $Rev$ $Date$ - */ -public class ServiceUnavailableException extends ServiceRuntimeException { - - private static final long serialVersionUID = -5869397223249401047L; - - /** - * Constructs a new ServiceUnavailableException. - */ - public ServiceUnavailableException() { - super((Throwable) null); - } - - /** - * Constructs a new ServiceUnavailableException with the specified detail message. - * - * @param message The detail message (which is saved to later retrieval by the getMessage() method). - */ - public ServiceUnavailableException(String message) { - super(message); - } - - /** - * Constructs a new ServiceUnavailableException with the specified cause. - * - * @param cause The cause (which is saved to later retrieval by the getCause() method). - */ - public ServiceUnavailableException(Throwable cause) { - super(cause); - } - - /** - * Constructs a new ServiceUnavailableException with the specified detail message and cause. - * - * @param message The message (which is saved to later retrieval by the getMessage() method). - * @param cause The cause (which is saved to later retrieval by the getCause() method). - */ - public ServiceUnavailableException(String message, Throwable cause) { - super(message, cause); - } - -} 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/osoa/sca/annotations/AllowsPassByReference.java deleted file mode 100644 index 556dd4e68e..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation on a method that indicates that its parameters may safely - * be passed by reference. The annotation may also be placed on an interface - * or class to indicate that all declared methods support this optimization. - * - * @version $Rev$ $Date$ - */ -@Target({TYPE, METHOD}) -@Retention(RUNTIME) -public @interface AllowsPassByReference { -} - 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/osoa/sca/annotations/Authentication.java deleted file mode 100644 index f7fca41212..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -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 java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation denoting the intent that service operations require authentication. - *

    - * Applied to the injection site (field, method or constructor parameter) for a reference, - * it indicates that all invocations through that reference require authentication. - *

    - * Applied to a interface method on a service contract, it indicates that all invocations - * of that service operation require authentication; applied to the type of a service contract, - * it indicates that all service operations on that interface require authentication. - *

    - * Applied to a method on an implementation class, it indicates that all invocations that - * are dispatched to that implementation method (through any service) require authentication. - * Applied to a interface implemented by an implementation class, it indicates that all - * invocations that are dispatched to the implementation method for that interface operation - * require authentication. - *

    - * Applied to an implementation class, it indicates that all invocations of that implementation - * and that all invocations made by that implementation require authentication. - * - * @version $Rev$ $Date$ - */ -@Inherited -@Target({TYPE, FIELD, METHOD, PARAMETER}) -@Retention(RUNTIME) -@Intent(Authentication.AUTHENTICATION) -public @interface Authentication { - String AUTHENTICATION = SCA_PREFIX + "authentication"; - String AUTHENTICATION_MESSAGE = AUTHENTICATION + "message"; - String AUTHENTICATION_TRANSPORT = AUTHENTICATION + "transport"; - - /** - * List of authentication qualifiers (such as "message" or "transport"). - * - * @return authentication qualifiers - */ - @Qualifier - String[] value() default ""; -} 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/osoa/sca/annotations/Callback.java deleted file mode 100644 index 0ee613fdcb..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * When placed on a service interface, this annotation specifies the interface - * to be used for callbacks. - *

    - * When placed on a method or field, this annotation denotes the injection - * site to be used for a callback reference. - *

    - * There is a error in the 1.00 draft spec in the declaration of this interface. - * The form defined here is a proposed correction for that error. - * - * @version $Rev$ $Date$ - */ -@Target({TYPE, METHOD, FIELD}) -@Retention(RUNTIME) -public @interface Callback { - /** - * The Class of the associated callback interface. - * - * @return the associated callback interface - */ - Class value() default Void.class; -} 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/osoa/sca/annotations/ComponentName.java deleted file mode 100644 index bc73d22c9d..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation used to indicate a field or method that is used to inject the component's name. - * - * @version $Rev$ $Date$ - */ -@Target({METHOD, FIELD}) -@Retention(RUNTIME) -public @interface ComponentName { -} 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/osoa/sca/annotations/Confidentiality.java deleted file mode 100644 index 25ade6f091..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -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 java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation denoting the intent that service operations require confidentiality. - *

    - * Applied to the injection site (field, method or constructor parameter) for a reference, - * it indicates that all invocations through that reference require confidentiality. - *

    - * Applied to a interface method on a service contract, it indicates that all invocations - * of that service operation require confidentiality; applied to the type of a service contract, - * it indicates that all service operations on that interface require confidentiality. - *

    - * Applied to a method on an implementation class, it indicates that all invocations that - * are dispatched to that implementation method (through any service) require confidentiality. - * Applied to a interface implemented by an implementation class, it indicates that all - * invocations that are dispatched to the implementation method for that interface operation - * require confidentiality. - *

    - * Applied to an implementation class, it indicates that all invocations of that implementation - * and that all invocations made by that implementation require confidentiality. - * - * @version $Rev$ $Date$ - */ -@Inherited -@Target({TYPE, FIELD, METHOD, PARAMETER}) -@Retention(RUNTIME) -@Intent(Confidentiality.CONFIDENTIALITY) -public @interface Confidentiality { - String CONFIDENTIALITY = SCA_PREFIX + "confidentiality"; - String CONFIDENTIALITY_MESSAGE = CONFIDENTIALITY + ".message"; - String CONFIDENTIALITY_TRANSPORT = CONFIDENTIALITY + ".transport"; - - /** - * List of confidentiality qualifiers (such as "message" or "transport"). - * - * @return confidentiality qualifiers - */ - @Qualifier - String[] value() default ""; -} 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/osoa/sca/annotations/Constructor.java deleted file mode 100644 index bc09c8ccdd..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Used to indicate the constructor the runtime is to use when instantiating a component implementation instance - * - * @version $Rev$ $Date$ - */ -@Target(CONSTRUCTOR) -@Retention(RUNTIME) -public @interface Constructor { - String[] value() default ""; -} 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/osoa/sca/annotations/Context.java deleted file mode 100644 index baacb2f520..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation used to indicate a field or setter method that is used to inject an SCA context. - * The type of context injected is determined by the type of the field or the parameter - * to the setter method and is typically a ComponentContext or RequestContext. - * - * @version $Rev$ $Date$ - */ -@Target({METHOD, FIELD}) -@Retention(RUNTIME) -public @interface Context { -} - 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/osoa/sca/annotations/ConversationAttributes.java deleted file mode 100644 index e9fcfee2d3..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation used to indicate the characteristics of a conversation. - * - * @version $Rev$ $Date$ - */ -@Target(ElementType.TYPE) -@Retention(RUNTIME) -public @interface ConversationAttributes { - /** - * The maximum time that can pass between operations in a single conversation. If this time is exceeded the - * container may end the conversation. - * - * @return the maximum time that can pass between operations in a single conversation - */ - String maxIdleTime() default ""; - - /** - * The maximum time that a conversation may remain active. If this time is exceeded the container may end the - * conversation. - * - * @return the maximum time that a conversation may remain active - */ - String maxAge() default ""; - - /** - * If true, indicates that only the user that initiated the conversation has the authority to continue it. - * - * @return true if only the user that initiated the conversation has the authority to continue it - */ - boolean singlePrincipal() default false; -} 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/osoa/sca/annotations/ConversationID.java deleted file mode 100644 index b2f6f17129..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation used to indicate a field or method that is used to inject the conversation ID. - * - * @version $Rev$ $Date$ - */ -@Target({METHOD, FIELD}) -@Retention(RUNTIME) -public @interface ConversationID { -} 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/osoa/sca/annotations/Conversational.java deleted file mode 100644 index f0350f8ff5..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Used on a Java interface to denote a conversational service contract. - *

    - * The draft spec erroneously defines the targets for this as {TYPE, METHOD, FIELD} - * but this annotation is only applicable to interfaces. - * - * @version $Rev$ $Date$ - */ -@Target({TYPE}) -@Retention(RUNTIME) -public @interface Conversational { -} 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/osoa/sca/annotations/Destroy.java deleted file mode 100644 index d65558653b..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation used to indicate a method that will be called by the container when the - * scope defined for the local service ends. - * - * @version $Rev$ $Date$ - */ -@Target(METHOD) -@Retention(RUNTIME) -public @interface Destroy { -} 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/osoa/sca/annotations/EagerInit.java deleted file mode 100644 index 21bf986705..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation used to indicate an instance should be eagerly initialized. - * - * @version $Rev$ $Date$ - */ -@Target({TYPE}) -@Retention(RUNTIME) -public @interface EagerInit { - -} 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/osoa/sca/annotations/EndsConversation.java deleted file mode 100644 index c65ff5838f..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation used to indicate a method ends a conversation. - * - * @version $Rev$ $Date$ - */ -@Target({METHOD}) -@Retention(RUNTIME) -public @interface EndsConversation { -} 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/osoa/sca/annotations/Init.java deleted file mode 100644 index d610e21d64..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation used to indicate a method that will be called by the container when the scope defined for the local - * service begins. - * - * @version $Rev$ $Date$ - */ -@Target(METHOD) -@Retention(RUNTIME) -public @interface Init { - -} 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/osoa/sca/annotations/Integrity.java deleted file mode 100644 index a8cf28475b..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -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 java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation denoting the intent that service operations require integrity. - *

    - * Applied to the injection site (field, method or constructor parameter) for a reference, - * it indicates that all invocations through that reference require integrity. - *

    - * Applied to a interface method on a service contract, it indicates that all invocations - * of that service operation require integrity; applied to the type of a service contract, - * it indicates that all service operations on that interface require integrity. - *

    - * Applied to a method on an implementation class, it indicates that all invocations that - * are dispatched to that implementation method (through any service) require integrity. - * Applied to a interface implemented by an implementation class, it indicates that all - * invocations that are dispatched to the implementation method for that interface operation - * require integrity. - *

    - * Applied to an implementation class, it indicates that all invocations of that implementation - * and that all invocations made by that implementation require integrity. - * - * @version $Rev$ $Date$ - */ -@Inherited -@Target({TYPE, FIELD, METHOD, PARAMETER}) -@Retention(RUNTIME) -@Intent(Integrity.INTEGRITY) -public @interface Integrity { - String INTEGRITY = SCA_PREFIX + "integrity"; - String INTEGRITY_MESSAGE = INTEGRITY + "message"; - String INTEGRITY_TRANSPORT = INTEGRITY + "transport"; - - /** - * List of integrity qualifiers (such as "message" or "transport"). - * - * @return integrity qualifiers - */ - @Qualifier - String[] value() default ""; -} 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/osoa/sca/annotations/Intent.java deleted file mode 100644 index fc925aa402..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation that can be applied to annotations that describe SCA intents. - * Adding this annotation allows SCA runtimes to automatically detect user-defined intents. - *

    - * Applications must specify a value, a pairing of targetNamespace and localPort, or both. - * If both value and pairing are supplied they must define the name qualified name. - * - * @version $Rev$ $Date$ - */ -@Target({ANNOTATION_TYPE}) -@Retention(RUNTIME) -public @interface Intent { - /** - * The qualified name of the intent, in the form defined by {@link javax.xml.namespace.QName#toString}. - * - * @return the qualified name of the intent - */ - String value() default ""; - - /** - * The XML namespace for the intent. - * - * @return the XML namespace for the intent - */ - String targetNamespace() default ""; - - /** - * The name of the intent within its namespace. - * - * @return name of the intent within its namespace - */ - String localPart() default ""; -} 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/osoa/sca/annotations/OneWay.java deleted file mode 100644 index eaf9e3207c..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation on a method that indicates that the method is non-blocking and communication - * with the service provider may use buffer the requests and send them at some later time. - * - * @version $Rev$ $Date$ - */ -@Target({METHOD}) -@Retention(RUNTIME) -public @interface OneWay { -} 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/osoa/sca/annotations/PolicySets.java deleted file mode 100644 index b22a6a840c..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -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 java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation that allows application of SCA Policy Sets. - *

    - * Each policy set is specified using its XML QName in the form defined by {@link javax.xml.namespace.QName#toString()}. - * - * @version $Rev$ $Date$ - */ -@Target({TYPE, FIELD, METHOD, PARAMETER}) -@Retention(RUNTIME) -public @interface PolicySets { - /** - * Returns the policy sets to be applied. - * - * @return the policy sets to be applied - */ - String[] value() default ""; -} 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/osoa/sca/annotations/Property.java deleted file mode 100644 index 71af35634d..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -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.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation used to indicate a constructor parameter, field or method that is - * used to inject a configuration property value. - * - * @version $Rev$ $Date$ - */ -@Target({METHOD, FIELD, PARAMETER}) -@Retention(RUNTIME) -public @interface Property { - /** - * The name of the property. If not specified then the name will be derived - * from the annotated field or method. - * - * @return the name of the property - */ - String name() default ""; - - /** - * Indicates whether a value for the property must be provided. - * - * @return true if a value must be provided - */ - boolean required() default false; -} 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/osoa/sca/annotations/Qualifier.java deleted file mode 100644 index 44388bea74..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation that can be applied to an attribute of an @Intent annotation to indicate the - * attribute provides qualifiers for the intent. - * - * @version $Rev$ $Date$ - */ -@Target(METHOD) -@Retention(RUNTIME) -public @interface Qualifier { -} 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/osoa/sca/annotations/Reference.java deleted file mode 100644 index 4d71b3f357..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -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.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation used to indicate a constructor parameter, field or method that is used to inject a reference. - * - * @version $Rev$ $Date$ - */ -@Target({METHOD, FIELD, PARAMETER}) -@Retention(RUNTIME) -public @interface Reference { - /** - * The name of the reference. If not specified then the name will be derived from the annotated field or method. - * - * @return the name of the reference - */ - String name() default ""; - - /** - * Indicates if a reference must be specified. - * - * @return true if a reference must be specified - */ - boolean required() default true; -} - 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/osoa/sca/annotations/Remotable.java deleted file mode 100644 index 53d58b7dc1..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation used to indicate a Java interface as remotable. - * Remotable interfaces use pass-by-value semantics, can be published as entry points - * and used for external services. - * - * @version $Rev$ $Date$ - */ -@Target(TYPE) -@Retention(RUNTIME) -public @interface Remotable { -} 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/osoa/sca/annotations/Requires.java deleted file mode 100644 index 3af699de07..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -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 java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation that allows the attachment of any intent to a Java Class or interface or to members of that - * class such as methods, fields or constructor parameters. - *

    - * Intents are specified as XML QNames in the representation defined by - * {@link javax.xml.namespace.QName#toString()}. Intents may be qualified with one or more - * suffixes separated by a "." such as: - *

      - *
    • {http://www.osoa.org/xmlns/sca/1.0}confidentiality
      • - *
    • {http://www.osoa.org/xmlns/sca/1.0}confidentiality.message
      • - *
    - * This annotation supports general purpose intents specified as strings. Users may also define - * specific intents using the {@link @org.osoa.sca.annotations.Intent} annotation. - * - * @version $Rev$ $Date$ - */ -@Inherited -@Retention(RUNTIME) -@Target({TYPE, METHOD, FIELD, PARAMETER}) -public @interface Requires { - /** - * Returns the attached intents. - * - * @return the attached intents - */ - String[] value() default ""; -} 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/osoa/sca/annotations/Scope.java deleted file mode 100644 index cd88df1128..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation used to indicate a scoped service. - *

    - * The spec refers to but does not describe an eager() attribute; this is an error in the draft. - * - * @version $Rev$ $Date$ - */ -@Target(TYPE) -@Retention(RUNTIME) -public @interface Scope { - /** - * The name of the scope. Values currently defined by the specification are: - *

      - *
    • STATELESS (default)
      • - *
    • REQUEST
      • - *
    • CONVERSATION
      • - *
    • COMPOSITE
      • - *
    - * - * @return the name of the scope - */ - String value() default "STATELESS"; -} 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/osoa/sca/annotations/Service.java deleted file mode 100644 index 62f4abdbee..0000000000 --- a/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies, - * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase - * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved. - * - * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - */ -package org.osoa.sca.annotations; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Annotation used to indicate the service interfaces exposed by a Java class. - * - * @version $Rev$ $Date$ - */ -@Target({TYPE}) -@Retention(RUNTIME) -public @interface Service { - /** - * Array of interfaces that should be exposed as services. - * - * @return a list of interfaces that should be exposed as services - */ - Class[] interfaces() default {}; - - /** - * Shortcut allowing a single interface to be exposed. - * - * @return a single service interfaces to be exposed - */ - Class value() default Void.class; -} diff --git a/java/sca/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/java/sca/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java index ba68dfe908..01b89101a8 100644 --- a/java/sca/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java +++ b/java/sca/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java @@ -18,8 +18,8 @@ */ package echo; -import org.osoa.sca.annotations.Constructor; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Constructor; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/java/sca/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java index ba68dfe908..01b89101a8 100644 --- a/java/sca/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java +++ b/java/sca/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java @@ -18,8 +18,8 @@ */ package echo; -import org.osoa.sca.annotations.Constructor; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Constructor; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java b/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java index d5bc8fbb50..3f069ede78 100644 --- a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java +++ b/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java @@ -18,7 +18,7 @@ */ package notification.broker; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java b/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java index cd3befe076..b9a5b98126 100644 --- a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java +++ b/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java @@ -18,10 +18,10 @@ */ package notification.broker; -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.AllowsPassByReference; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java b/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java index 8caefaf1d2..6406572d10 100644 --- a/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java +++ b/java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java @@ -18,9 +18,9 @@ */ package notification.broker; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(TestCaseProducer.class) @Scope("COMPOSITE") diff --git a/java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java b/java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java index 0efd1195bc..424728692f 100644 --- a/java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java +++ b/java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java @@ -18,7 +18,7 @@ */ package notification.consumer; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java b/java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java index f6c27a2f55..852ddaa919 100644 --- a/java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java +++ b/java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java @@ -18,10 +18,10 @@ */ package notification.consumer; -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.AllowsPassByReference; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * @version $Rev$ $Date$ diff --git a/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java b/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java index 39f06d5dde..548d45b12d 100644 --- a/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java +++ b/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java @@ -18,7 +18,7 @@ */ package notification.producer; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java b/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java index 7d49b00607..e670ccb95c 100644 --- a/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java +++ b/java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java @@ -18,9 +18,9 @@ */ package notification.producer; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; @Service(TestCaseProducer.class) @Scope("COMPOSITE") diff --git a/java/sca/samples/binding-ws-calculator/src/main/java/calculator/AddService.java b/java/sca/samples/binding-ws-calculator/src/main/java/calculator/AddService.java index d7dc4473ad..dd7ecb827d 100644 --- a/java/sca/samples/binding-ws-calculator/src/main/java/calculator/AddService.java +++ b/java/sca/samples/binding-ws-calculator/src/main/java/calculator/AddService.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The Add service interface diff --git a/java/sca/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClient.java b/java/sca/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClient.java index 50b81ace2a..0f275ea46e 100644 --- a/java/sca/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClient.java +++ b/java/sca/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClient.java @@ -19,10 +19,10 @@ package calculator; -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/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java index 3d861f2018..17fad7de6b 100644 --- a/java/sca/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java b/java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java index d310dad4b1..0bac3da45c 100644 --- a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java +++ b/java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java @@ -21,7 +21,7 @@ package calculator; import java.rmi.Remote; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The Calculator service interface. diff --git a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java index f28f0ca179..675350860e 100644 --- a/java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * An implementation of the Calculator service. diff --git a/java/sca/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java b/java/sca/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java index 3ddcef61df..b0a46b6dd0 100644 --- a/java/sca/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java +++ b/java/sca/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The Calculator service interface. diff --git a/java/sca/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java index f28f0ca179..675350860e 100644 --- a/java/sca/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * An implementation of the Calculator service. diff --git a/java/sca/samples/calculator-distributed/src/main/java/calculator/AddService.java b/java/sca/samples/calculator-distributed/src/main/java/calculator/AddService.java index d7dc4473ad..dd7ecb827d 100644 --- a/java/sca/samples/calculator-distributed/src/main/java/calculator/AddService.java +++ b/java/sca/samples/calculator-distributed/src/main/java/calculator/AddService.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The Add service interface diff --git a/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java index da869e00fd..c927500cc7 100644 --- a/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/java/sca/samples/calculator-distributed/src/main/java/calculator/SubtractService.java index 78ab9c6ee0..f03b9b94d4 100644 --- a/java/sca/samples/calculator-distributed/src/main/java/calculator/SubtractService.java +++ b/java/sca/samples/calculator-distributed/src/main/java/calculator/SubtractService.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for the multiply service diff --git a/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java b/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java index 3ff6c8969a..87021505b3 100644 --- a/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java +++ b/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java @@ -22,7 +22,7 @@ package node; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.launcher.NodeLauncher; -import org.osoa.sca.ServiceRuntimeException; +import org.oasisopen.sca.ServiceRuntimeException; import calculator.CalculatorService; diff --git a/java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java b/java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java index c193b2ce66..84c98d7f70 100644 --- a/java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java +++ b/java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java @@ -19,10 +19,10 @@ package calculator; -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/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java index 3d861f2018..17fad7de6b 100644 --- a/java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java index ae4ed12b7b..d3fa7a8f41 100644 --- a/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java b/java/sca/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java index 2bb8f96dcf..d56aa86e09 100644 --- a/java/sca/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java +++ b/java/sca/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java @@ -19,10 +19,10 @@ package calculator; -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/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java index 3d861f2018..17fad7de6b 100644 --- a/java/sca/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java b/java/sca/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java index a007a28f21..94dc747734 100644 --- a/java/sca/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java +++ b/java/sca/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java @@ -22,9 +22,9 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.SCANodeFactory; -import org.osoa.sca.annotations.EagerInit; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.EagerInit; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; /** * This shows how to test the Calculator composition. diff --git a/java/sca/samples/calculator-osgi/META-INF/MANIFEST.MF b/java/sca/samples/calculator-osgi/META-INF/MANIFEST.MF index bb6c2d4d35..40e2f360ca 100644 --- a/java/sca/samples/calculator-osgi/META-INF/MANIFEST.MF +++ b/java/sca/samples/calculator-osgi/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: Apache Tuscany SCA Calculator RCP Sample Import-Package: org.apache.tuscany.sca.node;version="1.4", org.osgi.framework;version="1.4", - org.osoa.sca.annotations;version="1.4" + org.oasisopen.sca.annotation;version="1.4" Bundle-SymbolicName: sample-calculator-osgi Bundle-DocURL: http://www.apache.org/ diff --git a/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java b/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java index adbd18a9e4..afd5ea48fc 100644 --- a/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java +++ b/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java @@ -19,10 +19,10 @@ package calculator; -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/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java index ba897fa301..39f55ca31f 100644 --- a/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * An implementation of the Calculator service. diff --git a/java/sca/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java b/java/sca/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java index adbd18a9e4..afd5ea48fc 100644 --- a/java/sca/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java +++ b/java/sca/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java @@ -19,10 +19,10 @@ package calculator; -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/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java index ba897fa301..39f55ca31f 100644 --- a/java/sca/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * An implementation of the Calculator service. diff --git a/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java index d310dad4b1..0bac3da45c 100644 --- a/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java +++ b/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java @@ -21,7 +21,7 @@ package calculator; import java.rmi.Remote; import java.rmi.RemoteException; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The Calculator service interface. diff --git a/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java index f28f0ca179..675350860e 100644 --- a/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * An implementation of the Calculator service. diff --git a/java/sca/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/java/sca/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java index 3ddcef61df..b0a46b6dd0 100644 --- a/java/sca/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java +++ b/java/sca/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The Calculator service interface. diff --git a/java/sca/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java index f28f0ca179..675350860e 100644 --- a/java/sca/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * An implementation of the Calculator service. diff --git a/java/sca/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java index ba897fa301..39f55ca31f 100644 --- a/java/sca/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * An implementation of the Calculator service. diff --git a/java/sca/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java index bf3b0303ec..0f03d6e7a1 100644 --- a/java/sca/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * An implementation of the Calculator service. diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java b/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java index c3c789e745..c7e6383559 100644 --- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java +++ b/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for the add service diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java b/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java index 46ec182124..c79c7b0395 100644 --- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java +++ b/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of the Add service diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java index bf3b0303ec..0f03d6e7a1 100644 --- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * An implementation of the Calculator service. diff --git a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java b/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java index c8653806aa..8f6af2f224 100644 --- a/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java +++ b/java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for the subtract service diff --git a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java b/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java index c3c789e745..c7e6383559 100644 --- a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java +++ b/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for the add service diff --git a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java b/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java index a7049729f7..0af6d681ce 100644 --- a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java +++ b/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * An implementation of the Add service diff --git a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java index bf3b0303ec..0f03d6e7a1 100644 --- a/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** * An implementation of the Calculator service. diff --git a/java/sca/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java index 3d861f2018..17fad7de6b 100644 --- a/java/sca/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java index da1f89548f..27a424b1cc 100644 --- a/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java +++ b/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java @@ -28,8 +28,8 @@ import org.apache.tuscany.sca.node.NodeFactory; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.osoa.sca.annotations.EagerInit; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.EagerInit; +import org.oasisopen.sca.annotation.Scope; /** * This shows how to test the Calculator service component. diff --git a/java/sca/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java index 3d861f2018..17fad7de6b 100644 --- a/java/sca/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java +++ b/java/sca/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java @@ -18,7 +18,7 @@ */ package calculator; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Reference; /** diff --git a/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClient.java b/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClient.java index e515b55788..329edbe1c8 100644 --- a/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClient.java +++ b/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClient.java @@ -18,7 +18,7 @@ */ package myapp; -import org.osoa.sca.annotations.OneWay; +import org.oasisopen.sca.annotation.OneWay; /** * The client interface diff --git a/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java b/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java index ece769236c..4f3a3bb63b 100644 --- a/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java +++ b/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java @@ -24,9 +24,9 @@ import myserver.MyServiceCallback; import org.apache.tuscany.sca.node.SCAClient; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.SCANodeFactory; -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; /** * Remote Web service client with callback interface diff --git a/java/sca/samples/callback-ws-client/src/main/java/myserver/MyService.java b/java/sca/samples/callback-ws-client/src/main/java/myserver/MyService.java index 1850eae1bc..9bc056318b 100644 --- a/java/sca/samples/callback-ws-client/src/main/java/myserver/MyService.java +++ b/java/sca/samples/callback-ws-client/src/main/java/myserver/MyService.java @@ -18,9 +18,9 @@ */ package myserver; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * The remote service that will be invoked by the client diff --git a/java/sca/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java b/java/sca/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java index bf5f87a4f9..caef8fcc98 100644 --- a/java/sca/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java +++ b/java/sca/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java @@ -18,7 +18,7 @@ */ package myserver; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The callback interface for {@link MyService}. diff --git a/java/sca/samples/callback-ws-service/src/main/java/myserver/MyService.java b/java/sca/samples/callback-ws-service/src/main/java/myserver/MyService.java index 1850eae1bc..9bc056318b 100644 --- a/java/sca/samples/callback-ws-service/src/main/java/myserver/MyService.java +++ b/java/sca/samples/callback-ws-service/src/main/java/myserver/MyService.java @@ -18,9 +18,9 @@ */ package myserver; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; /** * The remote service that will be invoked by the client diff --git a/java/sca/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java b/java/sca/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java index bf5f87a4f9..caef8fcc98 100644 --- a/java/sca/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java +++ b/java/sca/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java @@ -18,7 +18,7 @@ */ package myserver; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The callback interface for {@link MyService}. diff --git a/java/sca/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java b/java/sca/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java index 25469def5c..98833338f0 100644 --- a/java/sca/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java +++ b/java/sca/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java @@ -18,9 +18,9 @@ */ package myserver; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; /** * This class implements MyService and uses a callback. diff --git a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java b/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java index 775663cdff..12533ff610 100644 --- a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java +++ b/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java @@ -19,8 +19,8 @@ package callbacks; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface OrderCallback { diff --git a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderService.java b/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderService.java index 9f6d90577c..d0161b1498 100644 --- a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderService.java +++ b/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderService.java @@ -19,9 +19,9 @@ package callbacks; -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(OrderCallback.class) diff --git a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java b/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java index 3393ae5dca..757fe3ae41 100644 --- a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java +++ b/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java @@ -19,8 +19,8 @@ package callbacks; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; @Service(OrderServiceClient.class) public class OrderServiceClient implements OrderCallback { diff --git a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java b/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java index dd963bc1b0..9de7307391 100644 --- a/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java +++ b/java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java @@ -19,8 +19,8 @@ package callbacks; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; @Service(OrderService.class) public class OrderServiceImpl implements OrderService { diff --git a/java/sca/samples/chat-webapp/src/main/java/sample/ChatService.java b/java/sca/samples/chat-webapp/src/main/java/sample/ChatService.java index ca90b8f579..bf34675b8a 100644 --- a/java/sca/samples/chat-webapp/src/main/java/sample/ChatService.java +++ b/java/sca/samples/chat-webapp/src/main/java/sample/ChatService.java @@ -16,7 +16,7 @@ */ package sample; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface ChatService { diff --git a/java/sca/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java b/java/sca/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java index 7d0bfb3307..f0725dd60c 100644 --- a/java/sca/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java +++ b/java/sca/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java @@ -19,7 +19,7 @@ package sample; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Scope; @Scope("COMPOSITE") public class ChatServiceImpl implements ChatService { diff --git a/java/sca/samples/chat2-webapp/src/main/java/sample/ChatCallback.java b/java/sca/samples/chat2-webapp/src/main/java/sample/ChatCallback.java index 7d668052b2..261eb12124 100644 --- a/java/sca/samples/chat2-webapp/src/main/java/sample/ChatCallback.java +++ b/java/sca/samples/chat2-webapp/src/main/java/sample/ChatCallback.java @@ -19,7 +19,7 @@ package sample; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface ChatCallback { diff --git a/java/sca/samples/chat2-webapp/src/main/java/sample/ChatService.java b/java/sca/samples/chat2-webapp/src/main/java/sample/ChatService.java index cc9d00ca4a..a5aff8f316 100644 --- a/java/sca/samples/chat2-webapp/src/main/java/sample/ChatService.java +++ b/java/sca/samples/chat2-webapp/src/main/java/sample/ChatService.java @@ -18,9 +18,9 @@ package sample; import javax.jws.Oneway; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Remotable; +import org.oasisopen.sca.annotation.Scope; @Remotable @Scope("COMPOSITE") diff --git a/java/sca/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java b/java/sca/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java index d714ff82ed..fd22fb70e8 100644 --- a/java/sca/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java +++ b/java/sca/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java @@ -19,7 +19,7 @@ package sample; -import org.osoa.sca.annotations.Callback; +import org.oasisopen.sca.annotation.Callback; public class ChatServiceImpl implements ChatService { diff --git a/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java b/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java index 7915cc6e77..b3c965f1f7 100644 --- a/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java +++ b/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java @@ -19,7 +19,7 @@ package customer; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CustomerService { diff --git a/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java b/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java index 0cba7d8bc1..2bd49e2cf1 100644 --- a/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java +++ b/java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java @@ -29,8 +29,8 @@ import javax.persistence.EntityTransaction; import javax.persistence.Persistence; import javax.persistence.Query; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; public class CustomerServiceImpl implements CustomerService { EntityManagerFactory emf = null; diff --git a/java/sca/samples/customer-dojo/src/main/java/customer/CustomerService.java b/java/sca/samples/customer-dojo/src/main/java/customer/CustomerService.java index 7915cc6e77..b3c965f1f7 100644 --- a/java/sca/samples/customer-dojo/src/main/java/customer/CustomerService.java +++ b/java/sca/samples/customer-dojo/src/main/java/customer/CustomerService.java @@ -19,7 +19,7 @@ package customer; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CustomerService { diff --git a/java/sca/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java b/java/sca/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java index 0cba7d8bc1..2bd49e2cf1 100644 --- a/java/sca/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java +++ b/java/sca/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java @@ -29,8 +29,8 @@ import javax.persistence.EntityTransaction; import javax.persistence.Persistence; import javax.persistence.Query; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; +import org.oasisopen.sca.annotation.Destroy; +import org.oasisopen.sca.annotation.Init; public class CustomerServiceImpl implements CustomerService { EntityManagerFactory emf = null; diff --git a/java/sca/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/java/sca/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java index 5679614164..29a5e5c9ad 100644 --- a/java/sca/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java +++ b/java/sca/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java @@ -18,9 +18,9 @@ */ package dbecho; -import org.osoa.sca.annotations.Constructor; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Constructor; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; /** * @version $Rev$ $Date$ diff --git a/java/sca/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/java/sca/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java index ff8968837d..e98cd55bcf 100644 --- a/java/sca/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java +++ b/java/sca/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java @@ -20,9 +20,9 @@ package dbecho; import javax.xml.stream.XMLStreamReader; -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Constructor; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.AllowsPassByReference; +import org.oasisopen.sca.annotation.Constructor; +import org.oasisopen.sca.annotation.Reference; import org.w3c.dom.Node; /** diff --git a/java/sca/samples/databinding-echo/src/main/java/dbecho/Echo.java b/java/sca/samples/databinding-echo/src/main/java/dbecho/Echo.java index 25ecc90454..b47a9c1b85 100644 --- a/java/sca/samples/databinding-echo/src/main/java/dbecho/Echo.java +++ b/java/sca/samples/databinding-echo/src/main/java/dbecho/Echo.java @@ -19,7 +19,7 @@ package dbecho; import org.apache.tuscany.sca.databinding.annotation.DataBinding; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/java/sca/samples/databinding-echo/src/main/java/dbecho/Interface1.java index 70b450e358..9fff3bb4b9 100644 --- a/java/sca/samples/databinding-echo/src/main/java/dbecho/Interface1.java +++ b/java/sca/samples/databinding-echo/src/main/java/dbecho/Interface1.java @@ -19,7 +19,7 @@ package dbecho; import org.apache.tuscany.sca.databinding.annotation.DataBinding; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * @version $Rev$ $Date$ diff --git a/java/sca/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/java/sca/samples/databinding-echo/src/main/java/dbecho/Interface2.java index b62f1f425d..61ed7951e4 100644 --- a/java/sca/samples/databinding-echo/src/main/java/dbecho/Interface2.java +++ b/java/sca/samples/databinding-echo/src/main/java/dbecho/Interface2.java @@ -21,7 +21,7 @@ package dbecho; import javax.xml.stream.XMLStreamReader; import org.apache.tuscany.sca.databinding.annotation.DataBinding; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; import org.w3c.dom.Node; /** diff --git a/java/sca/samples/domain-management/src/test/java/services/Cart.java b/java/sca/samples/domain-management/src/test/java/services/Cart.java index 9e6226d963..3fb5439bc3 100644 --- a/java/sca/samples/domain-management/src/test/java/services/Cart.java +++ b/java/sca/samples/domain-management/src/test/java/services/Cart.java @@ -20,7 +20,7 @@ package services; import org.apache.tuscany.sca.data.collection.Collection; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Cart extends Collection { diff --git a/java/sca/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java b/java/sca/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java index c32853b3a9..f053ec9f48 100644 --- a/java/sca/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java +++ b/java/sca/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java @@ -21,8 +21,8 @@ package services; import org.apache.tuscany.sca.data.collection.Entry; import org.apache.tuscany.sca.data.collection.NotFoundException; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Scope; @Scope("COMPOSITE") public class ShoppingCartClientImpl implements Cart { diff --git a/java/sca/samples/domain-management/src/test/java/services/ShoppingCartImpl.java b/java/sca/samples/domain-management/src/test/java/services/ShoppingCartImpl.java index 30abfe77a0..9ef59df7a8 100644 --- a/java/sca/samples/domain-management/src/test/java/services/ShoppingCartImpl.java +++ b/java/sca/samples/domain-management/src/test/java/services/ShoppingCartImpl.java @@ -27,8 +27,8 @@ import java.util.UUID; import org.apache.tuscany.sca.data.collection.Entry; import org.apache.tuscany.sca.data.collection.NotFoundException; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; @Scope("COMPOSITE") public class ShoppingCartImpl implements Cart { diff --git a/java/sca/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java b/java/sca/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java index d4adf03851..2c90c0db8c 100644 --- a/java/sca/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java +++ b/java/sca/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java @@ -34,8 +34,8 @@ import org.apache.abdera.model.Person; import org.apache.abdera.parser.Parser; import org.apache.tuscany.sca.binding.atom.collection.Collection; import org.apache.tuscany.sca.binding.atom.collection.NotFoundException; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; import com.sun.syndication.feed.synd.SyndFeed; import com.sun.syndication.feed.synd.SyndFeedImpl; diff --git a/java/sca/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java b/java/sca/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java index f7ead126a7..354ef2d369 100644 --- a/java/sca/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java +++ b/java/sca/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java @@ -24,7 +24,7 @@ import java.util.Date; import java.util.List; import org.apache.abdera.model.Entry; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * Implementation of a Feed Sort service component. diff --git a/java/sca/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/java/sca/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java index 70e05b3bb3..999e9d5520 100644 --- a/java/sca/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java +++ b/java/sca/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java @@ -34,8 +34,8 @@ import org.apache.abdera.model.Person; import org.apache.abdera.parser.Parser; import org.apache.tuscany.sca.binding.atom.collection.Collection; import org.apache.tuscany.sca.binding.atom.collection.NotFoundException; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; import com.sun.syndication.feed.synd.SyndFeed; import com.sun.syndication.io.SyndFeedOutput; diff --git a/java/sca/samples/feed-aggregator/src/main/java/feed/SortImpl.java b/java/sca/samples/feed-aggregator/src/main/java/feed/SortImpl.java index f7ead126a7..354ef2d369 100644 --- a/java/sca/samples/feed-aggregator/src/main/java/feed/SortImpl.java +++ b/java/sca/samples/feed-aggregator/src/main/java/feed/SortImpl.java @@ -24,7 +24,7 @@ import java.util.Date; import java.util.List; import org.apache.abdera.model.Entry; -import org.osoa.sca.annotations.Property; +import org.oasisopen.sca.annotation.Property; /** * Implementation of a Feed Sort service component. diff --git a/java/sca/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java b/java/sca/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java index 386426df73..e2b7c698ac 100644 --- a/java/sca/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java +++ b/java/sca/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java @@ -19,7 +19,7 @@ package sample; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Helloworld { diff --git a/java/sca/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java b/java/sca/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java index 7dd39b82a4..04918244f0 100644 --- a/java/sca/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java +++ b/java/sca/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java @@ -18,7 +18,7 @@ */ package sample; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Helloworld { diff --git a/java/sca/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/java/sca/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java index e205f4da9b..b4997ba907 100644 --- a/java/sca/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java +++ b/java/sca/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java @@ -20,7 +20,7 @@ package helloworldjsonrpc; import java.util.Date; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service component. diff --git a/java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java b/java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java index 2af978b9ce..17f997f60d 100644 --- a/java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for the helloworld service diff --git a/java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java b/java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java index 280388f443..47756f46aa 100644 --- a/java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java +++ b/java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/java/sca/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java index 35fd00fabd..2234e21439 100644 --- a/java/sca/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java +++ b/java/sca/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java @@ -18,7 +18,7 @@ */ package helloworldjsonrpc; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service component. diff --git a/java/sca/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/java/sca/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java index be83d3b407..2664e75188 100644 --- a/java/sca/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java +++ b/java/sca/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java @@ -1,6 +1,6 @@ package sample; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(HelloworldService.class) public class HelloworldServiceImpl implements HelloworldService { diff --git a/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java index 4cdcc1fd0b..2186c00e57 100644 --- a/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java +++ b/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java b/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java index c0259c6e07..ca7c90f23e 100644 --- a/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * The interface for the helloworld service diff --git a/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java index 4cdcc1fd0b..2186c00e57 100644 --- a/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java +++ b/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; /** * This class implements the HelloWorld service. diff --git a/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java b/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java index 4b019b21bf..a0081be22d 100644 --- a/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java +++ b/java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java @@ -18,7 +18,7 @@ */ package helloworld; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.Remotable; /** * This is the business interface of the HelloWorld greetings service. diff --git a/java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java index be83d3b407..2664e75188 100644 --- a/java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java +++ b/java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java @@ -1,6 +1,6 @@ package sample; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Service; @Service(HelloworldService.class) public class HelloworldServiceImpl implements HelloworldService { diff --git a/java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java index 0cdcc32e70..6b8af48161 100644 --- a/java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java +++ b/java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java @@ -26,8 +26,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.annotation.Reference; /** */ @@ -43,7 +43,7 @@ public class HelloworldServlet extends HttpServlet { // The helloworldService reference will only be injected from the @Reference // annotation in containers supporting SCA "deep" integration. In other // environments in can be looked up from the ComponentContext. - ComponentContext cc = (ComponentContext)config.getServletContext().getAttribute("org.osoa.sca.ComponentContext"); + ComponentContext cc = (ComponentContext)config.getServletContext().getAttribute("org.oasisopen.sca.ComponentContext"); service = cc.getService(HelloworldService.class, "service"); } } diff --git a/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java b/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java index 661f703dc8..2ee8e97e51 100644 --- a/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java +++ b/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java @@ -19,8 +19,8 @@ package sample; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; +import org.oasisopen.sca.annotation.OneWay; +import org.oasisopen.sca.annotation.Remotable; @Remotable public interface HelloworldCallback { diff --git a/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java b/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java index d2c1fc2def..9c1e645776 100644 --- a/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java +++ b/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java @@ -1,8 +1,8 @@ package sample; -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(HelloworldCallback.class) diff --git a/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java b/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java index 8b52e42754..5601bcd990 100644 --- a/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java +++ b/java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java @@ -1,7 +1,7 @@ package sample; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; +import org.oasisopen.sca.annotation.Callback; +import org.oasisopen.sca.annotation.Service; @Service(HelloworldService.class) public class HelloworldServiceImpl implements HelloworldService { diff --git a/java/sca/samples/helloworld-web-callback/src/main/webapp/hello.html b/java/sca/samples/helloworld-web-callback/src/main/webapp/hello.html index 6d4c17626b..a52cd5d59e 100644 --- a/java/sca/samples/helloworld-web-callback/src/main/webapp/hello.html +++ b/java/sca/samples/helloworld-web-callback/src/main/webapp/hello.html @@ -20,7 +20,7 @@ Apache Tuscany Helloworld Web2.0 Callbacks Sample - + +