diff options
author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-27 22:09:18 +0000 |
---|---|---|
committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-27 22:09:18 +0000 |
commit | f94a2904efd56b82c437c29eba14d09773b4d651 (patch) | |
tree | 5c1cd8e1a671ce9423fe7ecdb298f1cde748d61e /sandbox/sca-cloud-tutorial/store-assets | |
parent | 57301b4c29de5847993f3f522a27adea5a9a8d1b (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/META-INF/MANIFEST.MF | 18 | ||||
-rw-r--r-- | sandbox/sca-cloud-tutorial/store-assets/pom.xml | 55 | ||||
-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 | ||||
-rw-r--r-- | sandbox/sca-cloud-tutorial/store-assets/src/main/resources/META-INF/sca-contribution.xml | 25 |
15 files changed, 103 insertions, 5 deletions
diff --git a/sandbox/sca-cloud-tutorial/store-assets/META-INF/MANIFEST.MF b/sandbox/sca-cloud-tutorial/store-assets/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..a03e301420 --- /dev/null +++ b/sandbox/sca-cloud-tutorial/store-assets/META-INF/MANIFEST.MF @@ -0,0 +1,18 @@ +Manifest-Version: 1.0
+Export-Package: services
+Tool: Bnd-0.0.357
+Bundle-Name: Apache Tuscany SCA Cloud Store Tutorial Assets
+Created-By: 1.6.0_15 (Apple Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 2.0.0
+Bnd-LastModified: 1256186081729
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Cloud API
+Import-Package: org.apache.tuscany.sca.cloud.data;version="2.0.0",
+ org.apache.tuscany.sca.cloud.user;version="2.0.0",
+ org.apache.tuscany.sca.data.collection;version="2.0.0",
+ services
+Bundle-SymbolicName: org.apache.tuscany.sca.store.assets
+Bundle-DocURL: http://www.apache.org/
+
diff --git a/sandbox/sca-cloud-tutorial/store-assets/pom.xml b/sandbox/sca-cloud-tutorial/store-assets/pom.xml new file mode 100644 index 0000000000..7fb5fed85c --- /dev/null +++ b/sandbox/sca-cloud-tutorial/store-assets/pom.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" > + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-sca</artifactId> + <version>2.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>store-assets</artifactId> + <version>2.0-SNAPSHOT</version> + <name>Apache Tuscany SCA Cloud store common assets</name> + + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-sca-api</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-cloud-api</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-cloud-google</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + </dependencies> + +</project> 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))); } diff --git a/sandbox/sca-cloud-tutorial/store-assets/src/main/resources/META-INF/sca-contribution.xml b/sandbox/sca-cloud-tutorial/store-assets/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..c3e4e8bab5 --- /dev/null +++ b/sandbox/sca-cloud-tutorial/store-assets/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> +<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" + xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" + xmlns:store="http://store"> + + <export.java package="services" /> +</contribution>
\ No newline at end of file |