summaryrefslogtreecommitdiffstats
path: root/java/sca/samples
diff options
context:
space:
mode:
Diffstat (limited to 'java/sca/samples')
-rw-r--r--java/sca/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java4
-rw-r--r--java/sca/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java4
-rw-r--r--java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java2
-rw-r--r--java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java8
-rw-r--r--java/sca/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java6
-rw-r--r--java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java2
-rw-r--r--java/sca/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java8
-rw-r--r--java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java2
-rw-r--r--java/sca/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java6
-rw-r--r--java/sca/samples/binding-ws-calculator/src/main/java/calculator/AddService.java2
-rw-r--r--java/sca/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClient.java8
-rw-r--r--java/sca/samples/binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java2
-rw-r--r--java/sca/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java2
-rw-r--r--java/sca/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-distributed/src/main/java/calculator/AddService.java2
-rw-r--r--java/sca/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-distributed/src/main/java/calculator/SubtractService.java2
-rw-r--r--java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java2
-rw-r--r--java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorClient.java8
-rw-r--r--java/sca/samples/calculator-equinox/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java8
-rw-r--r--java/sca/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java6
-rw-r--r--java/sca/samples/calculator-osgi/META-INF/MANIFEST.MF2
-rw-r--r--java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java8
-rw-r--r--java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java8
-rw-r--r--java/sca/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java2
-rw-r--r--java/sca/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java2
-rw-r--r--java/sca/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java2
-rw-r--r--java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java2
-rw-r--r--java/sca/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java2
-rw-r--r--java/sca/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java2
-rw-r--r--java/sca/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java4
-rw-r--r--java/sca/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/callback-ws-client/src/main/java/myapp/MyClient.java2
-rw-r--r--java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java6
-rw-r--r--java/sca/samples/callback-ws-client/src/main/java/myserver/MyService.java6
-rw-r--r--java/sca/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java2
-rw-r--r--java/sca/samples/callback-ws-service/src/main/java/myserver/MyService.java6
-rw-r--r--java/sca/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java2
-rw-r--r--java/sca/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java6
-rw-r--r--java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java4
-rw-r--r--java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderService.java6
-rw-r--r--java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java4
-rw-r--r--java/sca/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java4
-rw-r--r--java/sca/samples/chat-webapp/src/main/java/sample/ChatService.java2
-rw-r--r--java/sca/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java2
-rw-r--r--java/sca/samples/chat2-webapp/src/main/java/sample/ChatCallback.java2
-rw-r--r--java/sca/samples/chat2-webapp/src/main/java/sample/ChatService.java6
-rw-r--r--java/sca/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java2
-rw-r--r--java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java2
-rw-r--r--java/sca/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java4
-rw-r--r--java/sca/samples/customer-dojo/src/main/java/customer/CustomerService.java2
-rw-r--r--java/sca/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java4
-rw-r--r--java/sca/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java6
-rw-r--r--java/sca/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java6
-rw-r--r--java/sca/samples/databinding-echo/src/main/java/dbecho/Echo.java2
-rw-r--r--java/sca/samples/databinding-echo/src/main/java/dbecho/Interface1.java2
-rw-r--r--java/sca/samples/databinding-echo/src/main/java/dbecho/Interface2.java2
-rw-r--r--java/sca/samples/domain-management/src/test/java/services/Cart.java2
-rw-r--r--java/sca/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java4
-rw-r--r--java/sca/samples/domain-management/src/test/java/services/ShoppingCartImpl.java4
-rw-r--r--java/sca/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java4
-rw-r--r--java/sca/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java2
-rw-r--r--java/sca/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java4
-rw-r--r--java/sca/samples/feed-aggregator/src/main/java/feed/SortImpl.java2
-rw-r--r--java/sca/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java2
-rw-r--r--java/sca/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java2
-rw-r--r--java/sca/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java2
-rw-r--r--java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java2
-rw-r--r--java/sca/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java2
-rw-r--r--java/sca/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java2
-rw-r--r--java/sca/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java2
-rw-r--r--java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java2
-rw-r--r--java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java2
-rw-r--r--java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java2
-rw-r--r--java/sca/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java2
-rw-r--r--java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java2
-rw-r--r--java/sca/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java6
-rw-r--r--java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java4
-rw-r--r--java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java6
-rw-r--r--java/sca/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java4
-rw-r--r--java/sca/samples/helloworld-web-callback/src/main/webapp/hello.html2
-rw-r--r--java/sca/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java2
-rw-r--r--java/sca/samples/helloworld-web/src/main/webapp/hello.html2
-rw-r--r--java/sca/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java2
-rw-r--r--java/sca/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java2
-rw-r--r--java/sca/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java2
-rw-r--r--java/sca/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java2
-rw-r--r--java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java6
-rw-r--r--java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java6
-rw-r--r--java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java6
-rw-r--r--java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java8
-rw-r--r--java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java8
-rw-r--r--java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java2
-rw-r--r--java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java2
-rw-r--r--java/sca/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java2
-rw-r--r--java/sca/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java2
-rw-r--r--java/sca/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java2
-rw-r--r--java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java2
-rw-r--r--java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java2
-rw-r--r--java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java2
-rw-r--r--java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java2
-rw-r--r--java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java2
-rw-r--r--java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java2
-rw-r--r--java/sca/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java2
-rw-r--r--java/sca/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java2
-rw-r--r--java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java2
-rw-r--r--java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java2
-rw-r--r--java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java2
-rw-r--r--java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddService.java2
-rw-r--r--java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java2
-rw-r--r--java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/implementation-composite/src/main/java/composite/SourceImpl.java6
-rw-r--r--java/sca/samples/implementation-composite/src/main/java/composite/Target.java4
-rw-r--r--java/sca/samples/implementation-composite/src/main/java/composite/TargetImpl.java6
-rw-r--r--java/sca/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java10
-rw-r--r--java/sca/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java2
-rw-r--r--java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java6
-rw-r--r--java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java6
-rw-r--r--java/sca/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java2
-rw-r--r--java/sca/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java2
-rw-r--r--java/sca/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java4
-rw-r--r--java/sca/samples/loanapplication/src/main/java/loanapplication/LoanService.java8
-rw-r--r--java/sca/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java6
-rw-r--r--java/sca/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java2
-rw-r--r--java/sca/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java6
-rw-r--r--java/sca/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java6
-rw-r--r--java/sca/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java6
-rw-r--r--java/sca/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java6
-rw-r--r--java/sca/samples/photo-gallery/src/main/java/services/Album.java2
-rw-r--r--java/sca/samples/photo-gallery/src/main/java/services/AlbumImpl.java4
-rw-r--r--java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java4
-rw-r--r--java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java2
-rw-r--r--java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java2
-rw-r--r--java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java2
-rw-r--r--java/sca/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java2
-rw-r--r--java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java2
-rw-r--r--java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java2
-rw-r--r--java/sca/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java2
-rw-r--r--java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java2
-rw-r--r--java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java2
-rw-r--r--java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java2
-rw-r--r--java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java2
-rw-r--r--java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java4
-rw-r--r--java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java4
-rw-r--r--java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java2
-rw-r--r--java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java2
-rw-r--r--java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java2
-rw-r--r--java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java2
-rw-r--r--java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java2
-rw-r--r--java/sca/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java4
-rw-r--r--java/sca/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java2
-rw-r--r--java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java6
-rw-r--r--java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java6
-rw-r--r--java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java2
-rw-r--r--java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java6
-rw-r--r--java/sca/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java6
-rw-r--r--java/sca/samples/simple-callback/src/main/java/simplecallback/MyService.java4
-rw-r--r--java/sca/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java6
-rw-r--r--java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java2
-rw-r--r--java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java2
-rw-r--r--java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java4
-rw-r--r--java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java4
-rw-r--r--java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java2
-rw-r--r--java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java2
-rw-r--r--java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java2
-rw-r--r--java/sca/samples/store-distributed/src/main/java/services/Cart.java2
-rw-r--r--java/sca/samples/store-distributed/src/main/java/services/Catalog.java2
-rw-r--r--java/sca/samples/store-distributed/src/main/java/services/CurrencyConverter.java2
-rw-r--r--java/sca/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java6
-rw-r--r--java/sca/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java4
-rw-r--r--java/sca/samples/store-distributed/src/main/java/services/Total.java2
-rw-r--r--java/sca/samples/store/src/main/java/services/Cart.java2
-rw-r--r--java/sca/samples/store/src/main/java/services/Catalog.java2
-rw-r--r--java/sca/samples/store/src/main/java/services/CurrencyConverter.java2
-rw-r--r--java/sca/samples/store/src/main/java/services/FruitsCatalogImpl.java6
-rw-r--r--java/sca/samples/store/src/main/java/services/ShoppingCartImpl.java4
-rw-r--r--java/sca/samples/store/src/main/java/services/Total.java2
-rw-r--r--java/sca/samples/supplychain/src/main/java/supplychain/Customer.java2
-rw-r--r--java/sca/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java2
-rw-r--r--java/sca/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java2
-rw-r--r--java/sca/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java2
-rw-r--r--java/sca/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java2
-rw-r--r--java/sca/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java6
-rw-r--r--java/sca/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java4
-rw-r--r--java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java2
-rw-r--r--java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java8
201 files changed, 331 insertions, 331 deletions
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<String, Item> {
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 @@
<head>
<title>Apache Tuscany Helloworld Web2.0 Callbacks Sample</title>
- <script type="text/javascript" src="org.osoa.sca.componentContext.js"></script>
+ <script type="text/javascript" src="org.oasisopen.sca.componentContext.js"></script>
<script language="JavaScript">
diff --git a/java/sca/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java b/java/sca/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
index be83d3b407..2664e75188 100644
--- a/java/sca/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
+++ b/java/sca/samples/helloworld-web/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-web/src/main/webapp/hello.html b/java/sca/samples/helloworld-web/src/main/webapp/hello.html
index 83ac0ae576..f7f8b2d4a9 100644
--- a/java/sca/samples/helloworld-web/src/main/webapp/hello.html
+++ b/java/sca/samples/helloworld-web/src/main/webapp/hello.html
@@ -20,7 +20,7 @@
<head>
<title>Apache Tuscany Helloworld Web Sample</title>
- <script type="text/javascript" src="org.osoa.sca.componentContext.js"></script>
+ <script type="text/javascript" src="org.oasisopen.sca.componentContext.js"></script>
<script language="JavaScript">
diff --git a/java/sca/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..a75187f0d7 100644
--- a/java/sca/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/samples/helloworld-ws-deep-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/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java b/java/sca/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..18f74b083f 100644
--- a/java/sca/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/samples/helloworld-ws-deep-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/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..2186c00e57 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/samples/helloworld-ws-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-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java b/java/sca/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..8255364e99 100644
--- a/java/sca/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/samples/helloworld-ws-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-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
index f8d66876fa..7839c2366b 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
+++ b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
@@ -19,9 +19,9 @@
package helloworld;
import org.apache.tuscany.sca.host.embedded.SCADomain;
-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;
/**
* The HelloWorld client implementation
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
index 13a31b6391..137894c469 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
+++ b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
@@ -19,9 +19,9 @@
package helloworld;
import org.apache.tuscany.sca.host.embedded.SCADomain;
-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;
/**
* The HelloWorld client implementation
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
index 6d1722095b..663aa4c852 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
+++ b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
@@ -19,9 +19,9 @@
package helloworld;
import org.apache.tuscany.sca.host.embedded.SCADomain;
-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;
/**
* The HelloWorld client implementation
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
index 3def5194a5..d246225c76 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
+++ b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
@@ -19,10 +19,10 @@
package helloworld;
import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.EagerInit;
+import org.oasisopen.sca.annotation.Scope;
/**
* The HelloWorld client implementation
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
index 7c1853566f..5113a98530 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
+++ b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
@@ -19,10 +19,10 @@
package helloworld;
import org.apache.tuscany.sca.host.embedded.SCADomain;
-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;
/**
* The HelloWorld client implementation
diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..8255364e99 100644
--- a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/samples/helloworld-ws-reference-lean/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-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java b/java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
index c0259c6e07..ca7c90f23e 100644
--- a/java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/samples/helloworld-ws-reference-secure/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-ws-reference/src/main/java/helloworld/HelloWorldService.java b/java/sca/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
index db0c947cf7..8255364e99 100644
--- a/java/sca/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/samples/helloworld-ws-reference/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-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java b/java/sca/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
index eb82418516..3123223cd3 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
+++ b/java/sca/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
@@ -25,7 +25,7 @@
*/
package helloworld;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/*
* HelloWorld java interface
diff --git a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 3d6576aca0..ed99edb2a2 100644
--- a/java/sca/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
@@ -20,7 +20,7 @@ package helloworld;
import java.util.List;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
@Service(HelloWorld.class)
public class HelloWorldImpl implements HelloWorld {
diff --git a/java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
index c950f7df04..c42a4d59c3 100644
--- a/java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/samples/helloworld-ws-sdo/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-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
index 367c5b4a12..0c3025f0c9 100644
--- a/java/sca/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/samples/helloworld-ws-sdo/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-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..2186c00e57 100644
--- a/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/samples/helloworld-ws-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-ws-service-jms/src/main/java/helloworld/HelloWorldService.java b/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
index 4b019b21bf..a0081be22d 100644
--- a/java/sca/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/samples/helloworld-ws-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-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..2186c00e57 100644
--- a/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/samples/helloworld-ws-service-secure/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-ws-service-secure/src/main/java/helloworld/HelloWorldService.java b/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
index 4b019b21bf..a0081be22d 100644
--- a/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/samples/helloworld-ws-service-secure/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-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..a75187f0d7 100644
--- a/java/sca/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/samples/helloworld-ws-service-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/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java b/java/sca/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..18f74b083f 100644
--- a/java/sca/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/samples/helloworld-ws-service-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/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java b/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..a75187f0d7 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
+++ b/java/sca/samples/helloworld-ws-service/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-ws-service/src/main/java/helloworld/HelloWorldService.java b/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
index 7245513b2a..513c2e3129 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
+++ b/java/sca/samples/helloworld-ws-service/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-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java b/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java
index e4ae074437..0e084bf459 100644
--- a/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java
+++ b/java/sca/samples/helloworld-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java
@@ -18,7 +18,7 @@
*/
package org.example.orderservice;
-// import org.osoa.sca.annotations.Service;
+// import org.oasisopen.sca.annotation.Service;
import java.util.Random;
import javax.jws.WebMethod;
diff --git a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddService.java b/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddService.java
index 1550799832..19e43317eb 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddService.java
+++ b/java/sca/samples/host-webapp-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 interface for the add service
diff --git a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java b/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java
index ece31fd459..e96b0faa96 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/java/sca/samples/host-webapp-calculator/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/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..39f55ca31f 100644
--- a/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/java/sca/samples/host-webapp-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;
/**
* An implementation of the Calculator service.
diff --git a/java/sca/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/java/sca/samples/implementation-composite/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..8e2b347604 100644
--- a/java/sca/samples/implementation-composite/src/main/java/composite/SourceImpl.java
+++ b/java/sca/samples/implementation-composite/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/samples/implementation-composite/src/main/java/composite/Target.java b/java/sca/samples/implementation-composite/src/main/java/composite/Target.java
index 9a8f68a7fa..703e72fc10 100644
--- a/java/sca/samples/implementation-composite/src/main/java/composite/Target.java
+++ b/java/sca/samples/implementation-composite/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/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/java/sca/samples/implementation-composite/src/main/java/composite/TargetImpl.java
index 86686e9233..cd9a9746fa 100644
--- a/java/sca/samples/implementation-composite/src/main/java/composite/TargetImpl.java
+++ b/java/sca/samples/implementation-composite/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/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java b/java/sca/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
index b7d035af7d..fe173a1ab1 100644
--- a/java/sca/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/java/sca/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
@@ -19,11 +19,11 @@
package calculator;
-import org.osoa.sca.ServiceRuntimeException;
-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.ServiceRuntimeException;
+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/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/java/sca/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..17fad7de6b 100644
--- a/java/sca/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/java/sca/samples/implementation-java-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/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java b/java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
index 2aaae596be..17d7933d9e 100644
--- a/java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
+++ b/java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
@@ -18,9 +18,9 @@
*/
package notification;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+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/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java b/java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
index a0bb02e846..e16b509993 100644
--- a/java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
+++ b/java/sca/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
@@ -18,9 +18,9 @@
*/
package notification;
-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/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java b/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
index 87333c61f6..0654cb93e5 100644
--- a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
+++ b/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
@@ -25,7 +25,7 @@ import java.lang.reflect.Method;
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 an invoker for POJO component implementations.
diff --git a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java b/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
index 73a0d22493..30a9885ea9 100644
--- a/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
+++ b/java/sca/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
@@ -25,7 +25,7 @@ import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.provider.ImplementationProvider;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.osoa.sca.ServiceRuntimeException;
+import org.oasisopen.sca.ServiceRuntimeException;
import pojo.POJOImplementation;
diff --git a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java b/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
index b06d9465a2..023199b14b 100644
--- a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
+++ b/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
@@ -19,8 +19,8 @@
package loanapplication;
-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 LoanClientImpl implements LoanClient {
diff --git a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanService.java b/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanService.java
index 9dfd8b42fe..8d16b04caf 100644
--- a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanService.java
+++ b/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanService.java
@@ -18,10 +18,10 @@
*/
package loanapplication;
-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;
@Conversational
@Remotable
diff --git a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java b/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
index 76a53323bd..a88dc0b56b 100644
--- a/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
+++ b/java/sca/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
@@ -18,9 +18,9 @@
*/
package loanapplication;
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.AllowsPassByReference;
+import org.oasisopen.sca.annotation.ConversationID;
+import org.oasisopen.sca.annotation.Scope;
@Scope("CONVERSATION")
@AllowsPassByReference
diff --git a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java b/java/sca/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
index 225dce0236..b70ddede4f 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
+++ b/java/sca/samples/osgi-supplychain/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/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/java/sca/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 023d716651..cad0749218 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/java/sca/samples/osgi-supplychain/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/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/java/sca/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index d0d29f94f8..4c2c8d7604 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/java/sca/samples/osgi-supplychain/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/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/java/sca/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 4206ce7dc8..8f1276c4e7 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/java/sca/samples/osgi-supplychain/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/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/java/sca/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 72eec76cc2..3c0bc6aa83 100644
--- a/java/sca/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/java/sca/samples/osgi-supplychain/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/samples/photo-gallery/src/main/java/services/Album.java b/java/sca/samples/photo-gallery/src/main/java/services/Album.java
index 5257d0e703..d614b6a504 100644
--- a/java/sca/samples/photo-gallery/src/main/java/services/Album.java
+++ b/java/sca/samples/photo-gallery/src/main/java/services/Album.java
@@ -19,7 +19,7 @@
package services;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Album {
diff --git a/java/sca/samples/photo-gallery/src/main/java/services/AlbumImpl.java b/java/sca/samples/photo-gallery/src/main/java/services/AlbumImpl.java
index dd2b086e29..3cdc56e641 100644
--- a/java/sca/samples/photo-gallery/src/main/java/services/AlbumImpl.java
+++ b/java/sca/samples/photo-gallery/src/main/java/services/AlbumImpl.java
@@ -25,8 +25,8 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Property;
public class AlbumImpl implements Album {
private String gallery;
diff --git a/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java b/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
index ac4e6f52f4..8ede831ea0 100644
--- a/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
+++ b/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
@@ -33,8 +33,8 @@ import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import org.apache.jackrabbit.core.TransientRepository;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Property;
import services.Album;
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
index 8a42136b5d..81396b056a 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
+++ b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
@@ -19,7 +19,7 @@
package xquery.quote;
import org.example.avail.AvailQuote;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
@Service(AvailQuoteProviderService.class)
public class AvailQuoteProviderImpl implements AvailQuoteProviderService {
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
index 41d78683cc..fb097c46f8 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
+++ b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
@@ -20,7 +20,7 @@ package xquery.quote;
import net.sf.saxon.om.NodeInfo;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface AvailQuoteProviderNodeInfo {
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
index f744a59744..c54febcd14 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
+++ b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
@@ -19,7 +19,7 @@
package xquery.quote;
import org.example.avail.AvailQuote;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface AvailQuoteProviderService {
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
index 374c0825e9..ebe0cd51ae 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
+++ b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
@@ -19,7 +19,7 @@
package xquery.quote;
import org.example.quote.Quote;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface ExternalReferencesQuoteJoin {
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
index fbe38b8269..92341ea26f 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
+++ b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
@@ -19,7 +19,7 @@
package xquery.quote;
import org.example.price.PriceQuote;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface PriceQuoteProvider {
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
index 06c3945a6e..5669738c98 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
+++ b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
@@ -20,7 +20,7 @@ package xquery.quote;
import net.sf.saxon.om.NodeInfo;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface PriceQuoteProviderNodeInfo {
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
index 1ecdf120c2..1a71abab81 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
+++ b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
@@ -22,7 +22,7 @@ import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
import org.example.quote.Quote;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface PropertiesQuoteJoin {
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
index 85508eaa46..5aea04bfb1 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
+++ b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
@@ -18,7 +18,7 @@
*/
package xquery.quote;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface QuoteCalculator {
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
index 425867055b..103d19e59d 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
+++ b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
@@ -24,7 +24,7 @@ import javax.xml.ws.ResponseWrapper;
import org.example.avail.AvailQuote;
import org.example.price.PriceQuote;
import org.example.quote.Quote;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface QuoteJoin {
diff --git a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
index 20fe73fd92..26bcfe9707 100644
--- a/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
+++ b/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
@@ -21,7 +21,7 @@ package xquery.quote;
import org.example.avail.AvailQuote;
import org.example.price.PriceQuote;
import org.example.quote.Quote;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class QuoteJoinLocalImpl implements QuoteJoinLocal {
private QuoteJoin quoteJoin;
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java b/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
index ce41006fa6..6252697ffe 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
@@ -21,7 +21,7 @@ package bigbank.account;
import java.util.ArrayList;
import java.util.List;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
import bigbank.account.checking.CheckingAccountDetails;
import bigbank.account.checking.CheckingAccountService;
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java b/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
index 2b52909bc1..8596181d7f 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
+++ b/java/sca/samples/simple-bigbank-spring/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;
@Service
@Remotable
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
index 386f7bb90d..2b086ec467 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
+++ b/java/sca/samples/simple-bigbank-spring/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;
import bigbank.account.AccountReport;
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java b/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
index 8a012c12f9..070cfe12db 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
+++ b/java/sca/samples/simple-bigbank-spring/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;
@Remotable
public interface SavingsAccountService {
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java b/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
index 980ec1c335..7682b729c3 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
+++ b/java/sca/samples/simple-bigbank-spring/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;
@Service(SavingsAccountService.class)
public class SavingsAccountServiceImpl implements SavingsAccountService {
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java b/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
index 1ee386ba90..f86fda7c0f 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
+++ b/java/sca/samples/simple-bigbank-spring/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;
@Remotable
public interface StockAccountService {
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java b/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
index 61aea6869e..488146ebeb 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
+++ b/java/sca/samples/simple-bigbank-spring/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;
@Service(StockAccountService.class)
public class StockAccountServiceImpl implements StockAccountService {
diff --git a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index 2d97b57066..be86627882 100644
--- a/java/sca/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/java/sca/samples/simple-bigbank-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/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/java/sca/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
index fa85f309c0..7a3c184cb2 100644
--- a/java/sca/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/java/sca/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
@@ -21,8 +21,8 @@ package bigbank.account;
import java.util.ArrayList;
import java.util.List;
-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 bigbank.accountdata.AccountDataService;
import bigbank.accountdata.CheckingAccount;
diff --git a/java/sca/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java b/java/sca/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
index 7961279352..4770c214ab 100644
--- a/java/sca/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/java/sca/samples/simple-bigbank/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;
/**
diff --git a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java b/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
index ad7c6d8fef..7ecb51036f 100644
--- a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
+++ b/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
@@ -18,9 +18,9 @@
*/
package simplecallback;
-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/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java b/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
index 48acc0e94f..7a72f50964 100644
--- a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
+++ b/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
@@ -18,9 +18,9 @@
*/
package simplecallback;
-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;
/**
* This service that will be invoked in a non-blocking fashion
diff --git a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java b/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
index 66cfb2bc8a..dd26439619 100644
--- a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
+++ b/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
@@ -18,7 +18,7 @@
*/
package simplecallback;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The callback interface for {@link MyService}.
diff --git a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java b/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
index 08057d2fcc..6a31d90458 100644
--- a/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
+++ b/java/sca/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
@@ -18,9 +18,9 @@
*/
package simplecallback;
-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/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/java/sca/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
index 3e2a1df5a5..18e159edc3 100644
--- a/java/sca/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
+++ b/java/sca/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
@@ -18,9 +18,9 @@
*/
package simplecallback;
-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/samples/simple-callback/src/main/java/simplecallback/MyService.java b/java/sca/samples/simple-callback/src/main/java/simplecallback/MyService.java
index e78ad6f68f..a065408954 100644
--- a/java/sca/samples/simple-callback/src/main/java/simplecallback/MyService.java
+++ b/java/sca/samples/simple-callback/src/main/java/simplecallback/MyService.java
@@ -18,8 +18,8 @@
*/
package simplecallback;
-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/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/java/sca/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
index fc5e31d14e..dc5493babe 100644
--- a/java/sca/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
+++ b/java/sca/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
@@ -18,9 +18,9 @@
*/
package simplecallback;
-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/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java b/java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
index d65d4c8e4a..b33d9a3644 100644
--- a/java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
+++ b/java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
@@ -24,7 +24,7 @@ import java.lang.reflect.Method;
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;
public class JavaInvoker implements Invoker {
diff --git a/java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java b/java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
index 198befa928..92c92eb309 100644
--- a/java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
+++ b/java/sca/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
@@ -24,7 +24,7 @@ import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.spi.InvokerFactory;
-import org.osoa.sca.ServiceRuntimeException;
+import org.oasisopen.sca.ServiceRuntimeException;
public class JavaInvokerFactory implements InvokerFactory {
diff --git a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java b/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
index 2a529dddeb..665dbbf9ac 100644
--- a/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
+++ b/java/sca/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
@@ -18,8 +18,8 @@
*/
package bigbank.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/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java b/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
index a8b958010a..4d8b03fc7d 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
+++ b/java/sca/samples/spring-bigbank-checkaccount/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: 636465 $$ $$Date: 2008-03-13 00:49:26 +0530 (Thu, 13 Mar 2008) $$
diff --git a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java b/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
index a18a4920b8..3ed3086dbd 100644
--- a/java/sca/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
+++ b/java/sca/samples/spring-bigbank-checkaccount/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/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 81c47a78d1..833cc50f71 100644
--- a/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/java/sca/samples/spring-bigbank-stockquote/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/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java b/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
index d4b3fe9035..d6db2bd182 100644
--- a/java/sca/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/java/sca/samples/spring-bigbank-stockquote/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/samples/store-distributed/src/main/java/services/Cart.java b/java/sca/samples/store-distributed/src/main/java/services/Cart.java
index 9e6226d963..3fb5439bc3 100644
--- a/java/sca/samples/store-distributed/src/main/java/services/Cart.java
+++ b/java/sca/samples/store-distributed/src/main/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<String, Item> {
diff --git a/java/sca/samples/store-distributed/src/main/java/services/Catalog.java b/java/sca/samples/store-distributed/src/main/java/services/Catalog.java
index 2c3b19f579..b5e504fe11 100644
--- a/java/sca/samples/store-distributed/src/main/java/services/Catalog.java
+++ b/java/sca/samples/store-distributed/src/main/java/services/Catalog.java
@@ -19,7 +19,7 @@
package services;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Catalog {
diff --git a/java/sca/samples/store-distributed/src/main/java/services/CurrencyConverter.java b/java/sca/samples/store-distributed/src/main/java/services/CurrencyConverter.java
index e104a0423a..a064f3dd69 100644
--- a/java/sca/samples/store-distributed/src/main/java/services/CurrencyConverter.java
+++ b/java/sca/samples/store-distributed/src/main/java/services/CurrencyConverter.java
@@ -19,7 +19,7 @@
package services;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface CurrencyConverter {
diff --git a/java/sca/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java b/java/sca/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
index 377b3d7e59..d132a24b00 100644
--- a/java/sca/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
+++ b/java/sca/samples/store-distributed/src/main/java/services/FruitsCatalogImpl.java
@@ -22,9 +22,9 @@ package services;
import java.util.ArrayList;
import java.util.List;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
public class FruitsCatalogImpl implements Catalog {
diff --git a/java/sca/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java b/java/sca/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
index 9889921a96..698614212d 100644
--- a/java/sca/samples/store-distributed/src/main/java/services/ShoppingCartImpl.java
+++ b/java/sca/samples/store-distributed/src/main/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, Total {
diff --git a/java/sca/samples/store-distributed/src/main/java/services/Total.java b/java/sca/samples/store-distributed/src/main/java/services/Total.java
index 8f464e526f..b77cc1c7ac 100644
--- a/java/sca/samples/store-distributed/src/main/java/services/Total.java
+++ b/java/sca/samples/store-distributed/src/main/java/services/Total.java
@@ -19,7 +19,7 @@
package services;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Total {
diff --git a/java/sca/samples/store/src/main/java/services/Cart.java b/java/sca/samples/store/src/main/java/services/Cart.java
index 9e6226d963..3fb5439bc3 100644
--- a/java/sca/samples/store/src/main/java/services/Cart.java
+++ b/java/sca/samples/store/src/main/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<String, Item> {
diff --git a/java/sca/samples/store/src/main/java/services/Catalog.java b/java/sca/samples/store/src/main/java/services/Catalog.java
index 2c3b19f579..b5e504fe11 100644
--- a/java/sca/samples/store/src/main/java/services/Catalog.java
+++ b/java/sca/samples/store/src/main/java/services/Catalog.java
@@ -19,7 +19,7 @@
package services;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Catalog {
diff --git a/java/sca/samples/store/src/main/java/services/CurrencyConverter.java b/java/sca/samples/store/src/main/java/services/CurrencyConverter.java
index e104a0423a..a064f3dd69 100644
--- a/java/sca/samples/store/src/main/java/services/CurrencyConverter.java
+++ b/java/sca/samples/store/src/main/java/services/CurrencyConverter.java
@@ -19,7 +19,7 @@
package services;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface CurrencyConverter {
diff --git a/java/sca/samples/store/src/main/java/services/FruitsCatalogImpl.java b/java/sca/samples/store/src/main/java/services/FruitsCatalogImpl.java
index 377b3d7e59..d132a24b00 100644
--- a/java/sca/samples/store/src/main/java/services/FruitsCatalogImpl.java
+++ b/java/sca/samples/store/src/main/java/services/FruitsCatalogImpl.java
@@ -22,9 +22,9 @@ package services;
import java.util.ArrayList;
import java.util.List;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
public class FruitsCatalogImpl implements Catalog {
diff --git a/java/sca/samples/store/src/main/java/services/ShoppingCartImpl.java b/java/sca/samples/store/src/main/java/services/ShoppingCartImpl.java
index 9889921a96..698614212d 100644
--- a/java/sca/samples/store/src/main/java/services/ShoppingCartImpl.java
+++ b/java/sca/samples/store/src/main/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, Total {
diff --git a/java/sca/samples/store/src/main/java/services/Total.java b/java/sca/samples/store/src/main/java/services/Total.java
index 8f464e526f..b77cc1c7ac 100644
--- a/java/sca/samples/store/src/main/java/services/Total.java
+++ b/java/sca/samples/store/src/main/java/services/Total.java
@@ -19,7 +19,7 @@
package services;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Total {
diff --git a/java/sca/samples/supplychain/src/main/java/supplychain/Customer.java b/java/sca/samples/supplychain/src/main/java/supplychain/Customer.java
index 8088001898..6c19a1108e 100644
--- a/java/sca/samples/supplychain/src/main/java/supplychain/Customer.java
+++ b/java/sca/samples/supplychain/src/main/java/supplychain/Customer.java
@@ -18,7 +18,7 @@
*/
package supplychain;
-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/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/java/sca/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
index 7a1e8553ec..0323cebe11 100644
--- a/java/sca/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
+++ b/java/sca/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
@@ -18,7 +18,7 @@
*/
package supplychain;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
/**
* This class implements the Customer service component.
diff --git a/java/sca/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/java/sca/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
index f622052cf8..809e2b7b89 100644
--- a/java/sca/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ b/java/sca/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
@@ -18,7 +18,7 @@
*/
package supplychain;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
/**
* This class implements the Customer service component.
diff --git a/java/sca/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/java/sca/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
index 4ae52a12a2..59513eca5d 100644
--- a/java/sca/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ b/java/sca/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
@@ -18,7 +18,7 @@
*/
package supplychain;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
/**
* This class implements the Warehouse service component.
diff --git a/java/sca/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/java/sca/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
index b5e256a1e0..ff4f5e62eb 100644
--- a/java/sca/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ b/java/sca/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
@@ -18,7 +18,7 @@
*/
package supplychain;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
/**
* This class implements the Warehouse service component.
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java b/java/sca/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
index cf27332e60..8865d5fe82 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
+++ b/java/sca/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
@@ -19,9 +19,9 @@
package location;
-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;
import com.example.uszip.USZipSoap;
import com.example.uszip.GetInfoByAreaCodeResponse.GetInfoByAreaCodeResult;
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java b/java/sca/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
index cf50a6cd9e..5ad5f11344 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
+++ b/java/sca/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
@@ -19,8 +19,8 @@
package weather;
-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 com.example.weather.WeatherForecastSoap;
import com.example.weather.WeatherForecasts;
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java b/java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
index ec0f05dd6c..53c112b8a3 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
+++ b/java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
@@ -19,7 +19,7 @@
package zipcode;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* @version $Rev$ $Date$
diff --git a/java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java b/java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
index 284e5a3aa3..7c68a77cf2 100644
--- a/java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
+++ b/java/sca/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
@@ -24,10 +24,10 @@ import java.io.StringWriter;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
-import org.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.ServiceRuntimeException;
+import org.oasisopen.sca.annotation.AllowsPassByReference;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.example.uszip.GetInfoByZIPResponse;
import com.example.uszip.USZipSoap;