summaryrefslogtreecommitdiffstats
path: root/sandbox/sca-cloud-tutorial/store-assets/src/main/java
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-10-27 22:09:18 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-10-27 22:09:18 +0000
commitf94a2904efd56b82c437c29eba14d09773b4d651 (patch)
tree5c1cd8e1a671ce9423fe7ecdb298f1cde748d61e /sandbox/sca-cloud-tutorial/store-assets/src/main/java
parent57301b4c29de5847993f3f522a27adea5a9a8d1b (diff)
Refactoring common artifacts to store-assets module
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830361 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Cart.java (renamed from sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Cart.java)0
-rw-r--r--sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Catalog.java (renamed from sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Catalog.java)0
-rw-r--r--sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CatalogAggregatorImpl.java (renamed from sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CatalogAggregatorImpl.java)0
-rw-r--r--sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverter.java (renamed from sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CurrencyConverter.java)0
-rw-r--r--sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverterImpl.java (renamed from sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CurrencyConverterImpl.java)0
-rw-r--r--sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/FruitsCatalogImpl.java (renamed from sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/src/services/FruitsCatalogImpl.java)0
-rw-r--r--sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Item.java (renamed from sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Item.java)0
-rw-r--r--sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCart.java (renamed from sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCart.java)0
-rw-r--r--sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartImpl.java (renamed from sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCartImpl.java)5
-rw-r--r--sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartManager.java (renamed from sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCartManager.java)3
-rw-r--r--sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Total.java (renamed from sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Total.java)0
-rw-r--r--sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/VegetablesCatalogImpl.java (renamed from sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-2x-webapp/src/main/java/services/VegetablesCatalogImpl.java)2
12 files changed, 5 insertions, 5 deletions
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Cart.java b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Cart.java
index 3fb5439bc3..3fb5439bc3 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Cart.java
+++ b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Cart.java
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Catalog.java b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Catalog.java
index b8630370ad..b8630370ad 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Catalog.java
+++ b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Catalog.java
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CatalogAggregatorImpl.java b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CatalogAggregatorImpl.java
index 09cae14100..09cae14100 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CatalogAggregatorImpl.java
+++ b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CatalogAggregatorImpl.java
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CurrencyConverter.java b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverter.java
index 59435d9099..59435d9099 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CurrencyConverter.java
+++ b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverter.java
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CurrencyConverterImpl.java b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverterImpl.java
index d185a2fe83..d185a2fe83 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/CurrencyConverterImpl.java
+++ b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/CurrencyConverterImpl.java
diff --git a/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/src/services/FruitsCatalogImpl.java b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/FruitsCatalogImpl.java
index 5290623487..5290623487 100644
--- a/sandbox/sca-cloud-tutorial/store-catalog-appengine-webapp/src/services/FruitsCatalogImpl.java
+++ b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/FruitsCatalogImpl.java
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Item.java b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Item.java
index 74e7239a20..74e7239a20 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Item.java
+++ b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Item.java
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCart.java b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCart.java
index e4d590484c..e4d590484c 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCart.java
+++ b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCart.java
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCartImpl.java b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartImpl.java
index cfa9dd7435..000e205948 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCartImpl.java
+++ b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartImpl.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+import java.util.logging.Logger;
import org.apache.tuscany.sca.data.collection.Entry;
import org.apache.tuscany.sca.data.collection.NotFoundException;
@@ -31,7 +32,9 @@ import org.oasisopen.sca.annotation.Scope;
@Scope("COMPOSITE")
public class ShoppingCartImpl implements ShoppingCart {
-
+ private static final Logger log = Logger.getLogger(ShoppingCartImpl.class.getName());
+
+ //private DatastoreDocumentServiceImpl cart = new DatastoreDocumentServiceImpl();
private Map<String, Item> cart = new HashMap<String, Item>();
public Entry<String, Item>[] getAll() {
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCartManager.java b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartManager.java
index 90f25d214c..be2c9216c8 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/ShoppingCartManager.java
+++ b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/ShoppingCartManager.java
@@ -101,17 +101,14 @@ public class ShoppingCartManager implements ShoppingCart {
if(userId == null || userId.length() == 0) {
userId = ANONYMOUS;
}
- log.warning("Using userId:" + userId);
return userId;
}
private String getCartKey() {
String cartKey = "cart-" + this.getUserId();
- log.warning("Using cartKey:" + cartKey);
return cartKey;
}
private String generateItemKey() {
String itemKey = getCartKey() + "-item-" + UUID.randomUUID().toString();
- log.warning("Using itemKey:" + itemKey);
return itemKey;
}
}
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Total.java b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Total.java
index b77cc1c7ac..b77cc1c7ac 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/src/services/Total.java
+++ b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/Total.java
diff --git a/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-2x-webapp/src/main/java/services/VegetablesCatalogImpl.java b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/VegetablesCatalogImpl.java
index 1f22166272..6ca311b42e 100644
--- a/sandbox/sca-cloud-tutorial/store-catalog-ibmcloud-2x-webapp/src/main/java/services/VegetablesCatalogImpl.java
+++ b/sandbox/sca-cloud-tutorial/store-assets/src/main/java/services/VegetablesCatalogImpl.java
@@ -40,7 +40,7 @@ public class VegetablesCatalogImpl implements Catalog {
public void init() {
String currencySymbol = currencyConverter.getCurrencySymbol(currencyCode);
catalog.add(new Item("Broccoli", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 2.99)));
- catalog.add(new Item("Aspargus", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 3.55)));
+ catalog.add(new Item("Asparagus", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 3.55)));
catalog.add(new Item("Cauliflower", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 1.55)));
}