TUSCANY-2790 - Updated package names from org.osoa.sca to org.oasisopen.sca and from org.osoa.sca.annotations to org.oasisopen.sca.annotation to reflect the new package names in the OASIS Open SCA specifications.

To do this, I:
   * Renamed the org.osoa.sca package to org.oasisopen.sca using Eclipse refactoring
   * Renamed the org.osoa.sca.annotations package to org.oasisopen.sca.annotation using Eclipse refactoring
   * Did a global search and replace for all remaining instances of the old org.osoa package names and replaced with the new org.oasisopen version

Hopefully, I have not missed too many instances of the old package name

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@738490 13f79535-47bb-0310-9956-ffa450edef68

32 files changed, 48 insertions, 48 deletions

diff --git a/java/sca/tutorials/store/assets/services/Cart.java b/java/sca/tutorials/store/assets/services/Cart.java
index 9e6226d963..3fb5439bc3 100644
--- a/java/sca/tutorials/store/assets/services/Cart.java
+++ b/java/sca/tutorials/store/assets/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/tutorials/store/assets/services/Catalog.java b/java/sca/tutorials/store/assets/services/Catalog.java
index 2c3b19f579..b5e504fe11 100644
--- a/java/sca/tutorials/store/assets/services/Catalog.java
+++ b/java/sca/tutorials/store/assets/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/tutorials/store/assets/services/CurrencyConverter.java b/java/sca/tutorials/store/assets/services/CurrencyConverter.java
index e104a0423a..a064f3dd69 100644
--- a/java/sca/tutorials/store/assets/services/CurrencyConverter.java
+++ b/java/sca/tutorials/store/assets/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/tutorials/store/assets/services/FruitsCatalogImpl.java b/java/sca/tutorials/store/assets/services/FruitsCatalogImpl.java
index 377b3d7e59..d132a24b00 100644
--- a/java/sca/tutorials/store/assets/services/FruitsCatalogImpl.java
+++ b/java/sca/tutorials/store/assets/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/tutorials/store/assets/services/ShoppingCartImpl.java b/java/sca/tutorials/store/assets/services/ShoppingCartImpl.java
index 9889921a96..698614212d 100644
--- a/java/sca/tutorials/store/assets/services/ShoppingCartImpl.java
+++ b/java/sca/tutorials/store/assets/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/tutorials/store/assets/services/Total.java b/java/sca/tutorials/store/assets/services/Total.java
index 8f464e526f..b77cc1c7ac 100644
--- a/java/sca/tutorials/store/assets/services/Total.java
+++ b/java/sca/tutorials/store/assets/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/tutorials/store/assets/services/VegetablesCatalogImpl.java b/java/sca/tutorials/store/assets/services/VegetablesCatalogImpl.java
index 8bfbc757db..0e1155dfcb 100644
--- a/java/sca/tutorials/store/assets/services/VegetablesCatalogImpl.java
+++ b/java/sca/tutorials/store/assets/services/VegetablesCatalogImpl.java
@@ -22,7 +22,7 @@ package services;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.osoa.sca.annotations.Init;
+import org.oasisopen.sca.annotation.Init;
 
 public class VegetablesCatalogImpl implements Catalog {
     private List<Item> catalog = new ArrayList<Item>();
diff --git a/java/sca/tutorials/store/assets/services/db/ShoppingCartTableImpl.java b/java/sca/tutorials/store/assets/services/db/ShoppingCartTableImpl.java
index cfc52c563c..1414889b81 100644
--- a/java/sca/tutorials/store/assets/services/db/ShoppingCartTableImpl.java
+++ b/java/sca/tutorials/store/assets/services/db/ShoppingCartTableImpl.java
@@ -30,10 +30,10 @@ import java.util.UUID;
 
 import org.apache.tuscany.sca.data.collection.Entry;
 import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
+import org.oasisopen.sca.ServiceRuntimeException;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Property;
 
 import services.Cart;
 import services.Item;
diff --git a/java/sca/tutorials/store/assets/services/map/FruitsCatalogImpl.java b/java/sca/tutorials/store/assets/services/map/FruitsCatalogImpl.java
index b160ba7be0..1acd30d719 100644
--- a/java/sca/tutorials/store/assets/services/map/FruitsCatalogImpl.java
+++ b/java/sca/tutorials/store/assets/services/map/FruitsCatalogImpl.java
@@ -22,9 +22,9 @@ package services.map;
 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;
 
 import services.Catalog;
 import services.CurrencyConverter;
diff --git a/java/sca/tutorials/store/assets/services/market/MarketCatalogImpl.java b/java/sca/tutorials/store/assets/services/market/MarketCatalogImpl.java
index bd2c7d76a2..8a7306c83c 100644
--- a/java/sca/tutorials/store/assets/services/market/MarketCatalogImpl.java
+++ b/java/sca/tutorials/store/assets/services/market/MarketCatalogImpl.java
@@ -22,8 +22,8 @@ package services.market;
 
 import java.util.Vector;
 
-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 services.Catalog;
 import services.CurrencyConverter;
diff --git a/java/sca/tutorials/store/assets/services/merger/MergedCatalogImpl.java b/java/sca/tutorials/store/assets/services/merger/MergedCatalogImpl.java
index c02b4e821e..3f8cee085d 100644
--- a/java/sca/tutorials/store/assets/services/merger/MergedCatalogImpl.java
+++ b/java/sca/tutorials/store/assets/services/merger/MergedCatalogImpl.java
@@ -19,8 +19,8 @@
 
 package services.merger;
 
-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 services.Catalog;
 import services.CurrencyConverter;
diff --git a/java/sca/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java b/java/sca/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
index 6cfa54e9de..2271034dae 100644
--- a/java/sca/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
+++ b/java/sca/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
@@ -21,8 +21,8 @@ package services.mediation;
 
 import java.rmi.RemoteException;
 
-import org.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.ServiceRuntimeException;
+import org.oasisopen.sca.annotation.Reference;
 
 import services.Catalog;
 import services.Item;
diff --git a/java/sca/tutorials/store/store-client/client/Shopper.java b/java/sca/tutorials/store/store-client/client/Shopper.java
index f8643d4c52..4e2fa63493 100644
--- a/java/sca/tutorials/store/store-client/client/Shopper.java
+++ b/java/sca/tutorials/store/store-client/client/Shopper.java
@@ -19,7 +19,7 @@
 
 package client;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 public interface Shopper {
diff --git a/java/sca/tutorials/store/store-client/client/ShopperImpl.java b/java/sca/tutorials/store/store-client/client/ShopperImpl.java
index c017548fb3..eef92b71f1 100644
--- a/java/sca/tutorials/store/store-client/client/ShopperImpl.java
+++ b/java/sca/tutorials/store/store-client/client/ShopperImpl.java
@@ -20,7 +20,7 @@
 package client;
 
 import org.apache.tuscany.sca.data.collection.NotFoundException;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
 
 import services.Cart;
 import services.Catalog;
diff --git a/java/sca/tutorials/store/store-client/services/Cart.java b/java/sca/tutorials/store/store-client/services/Cart.java
index 9e6226d963..3fb5439bc3 100644
--- a/java/sca/tutorials/store/store-client/services/Cart.java
+++ b/java/sca/tutorials/store/store-client/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/tutorials/store/store-client/services/Catalog.java b/java/sca/tutorials/store/store-client/services/Catalog.java
index 2c3b19f579..b5e504fe11 100644
--- a/java/sca/tutorials/store/store-client/services/Catalog.java
+++ b/java/sca/tutorials/store/store-client/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/tutorials/store/store-client/services/Total.java b/java/sca/tutorials/store/store-client/services/Total.java
index 8f464e526f..b77cc1c7ac 100644
--- a/java/sca/tutorials/store/store-client/services/Total.java
+++ b/java/sca/tutorials/store/store-client/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/tutorials/store/store-market/build.xml b/java/sca/tutorials/store/store-market/build.xml
index a6b0b461b1..94c8b2cad8 100644
--- a/java/sca/tutorials/store/store-market/build.xml
+++ b/java/sca/tutorials/store/store-market/build.xml
@@ -46,7 +46,7 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-2.0-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
     </fileset>
diff --git a/java/sca/tutorials/store/store-test/client/Shopper.java b/java/sca/tutorials/store/store-test/client/Shopper.java
index f8643d4c52..4e2fa63493 100644
--- a/java/sca/tutorials/store/store-test/client/Shopper.java
+++ b/java/sca/tutorials/store/store-test/client/Shopper.java
@@ -19,7 +19,7 @@
 
 package client;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 public interface Shopper {
diff --git a/java/sca/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.java b/java/sca/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.java
index 6f968bdba3..e105fa3e9a 100644
--- a/java/sca/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.java
+++ b/java/sca/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCart.java
@@ -19,7 +19,7 @@
 package amazon.cart;
 
 import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 import com.cart.amazon.CartAdd;
 import com.cart.amazon.CartAddResponse;
diff --git a/java/sca/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCartImpl.java b/java/sca/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCartImpl.java
index 66d72c57c4..36c2ff83e4 100644
--- a/java/sca/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCartImpl.java
+++ b/java/sca/tutorials/store/www-services/cart-amazon/amazon/cart/AmazonCartImpl.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
 
 import com.cart.amazon.AmazonFactory;
 import com.cart.amazon.Cart;
diff --git a/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartService.java b/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartService.java
index e8f383c3e1..649f5b16a3 100644
--- a/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartService.java
+++ b/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartService.java
@@ -1,6 +1,6 @@
 package shoppingstore.services.cart;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 import com.amazon.webservices.awsecommerceservice._2007_05_14.CartAdd;
 import com.amazon.webservices.awsecommerceservice._2007_05_14.CartAddResponse;
diff --git a/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartServiceImpl.java b/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartServiceImpl.java
index 1579dbd60d..12fed3cac6 100644
--- a/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartServiceImpl.java
+++ b/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/cart/CartServiceImpl.java
@@ -2,7 +2,7 @@ package shoppingstore.services.cart;
 
 import java.util.HashMap;
 
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.Scope;
 
 import com.amazon.webservices.awsecommerceservice._2007_05_14.Cart;
 import com.amazon.webservices.awsecommerceservice._2007_05_14.CartAdd;
diff --git a/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreService.java b/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreService.java
index 207125ac75..947b6fda04 100644
--- a/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreService.java
+++ b/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreService.java
@@ -1,6 +1,6 @@
 package shoppingstore.services.proxy;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 
 import com.amazon.webservices.awsecommerceservice._2007_05_14.CartAdd;
 import com.amazon.webservices.awsecommerceservice._2007_05_14.CartAddResponse;
diff --git a/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreServiceImpl.java b/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreServiceImpl.java
index 8a73631cbb..ce121f9d0a 100644
--- a/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreServiceImpl.java
+++ b/java/sca/tutorials/store/www-services/catalog-amazon/cart-amazon/src/main/java/shoppingstore/services/proxy/ShoppingStoreServiceImpl.java
@@ -1,7 +1,7 @@
 package shoppingstore.services.proxy;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
 
 import shoppingstore.services.cart.CartService;
 
diff --git a/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogService.java b/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogService.java
index ce66396582..e557950b24 100644
--- a/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogService.java
+++ b/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogService.java
@@ -20,7 +20,7 @@
 package catalog.amazon;
 
 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;
 
 @Remotable
diff --git a/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogServiceImpl.java b/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogServiceImpl.java
index 2c56a37601..8b411644ce 100644
--- a/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogServiceImpl.java
+++ b/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/amazon/AmazonCatalogServiceImpl.java
@@ -23,9 +23,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogService.java b/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogService.java
index 5aeaabdbf3..a6cd356d5a 100644
--- a/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogService.java
+++ b/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogService.java
@@ -19,7 +19,7 @@
 
 package catalog.ebay;
 
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
 import org.w3c.dom.Node;
 
 /**
diff --git a/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogServiceImpl.java b/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogServiceImpl.java
index dc69816c27..d7fc263740 100644
--- a/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogServiceImpl.java
+++ b/java/sca/tutorials/store/www-services/catalog-amazon/src/main/java/catalog/ebay/EBayCatalogServiceImpl.java
@@ -23,8 +23,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-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 org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/java/sca/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/Catalog.java b/java/sca/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/Catalog.java
index 9f784b0848..b45e5efccb 100644
--- a/java/sca/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/Catalog.java
+++ b/java/sca/tutorials/store/www-services/catalog-amazon/store-db/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/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CatalogImpl.java b/java/sca/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CatalogImpl.java
index c8b3bbf621..f8149bbe8d 100644
--- a/java/sca/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CatalogImpl.java
+++ b/java/sca/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CatalogImpl.java
@@ -25,8 +25,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
 
 public class CatalogImpl implements Catalog {
     @Property
diff --git a/java/sca/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CurrencyConverter.java b/java/sca/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CurrencyConverter.java
index 8b0f70907d..c4b1800a3d 100644
--- a/java/sca/tutorials/store/www-services/catalog-amazon/store-db/src/main/java/services/CurrencyConverter.java
+++ b/java/sca/tutorials/store/www-services/catalog-amazon/store-db/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 {