From 938e8f66975589a340ec3818cf50a7ae672161f4 Mon Sep 17 00:00:00 2001 From: antelder Date: Tue, 26 Oct 2010 10:56:15 +0000 Subject: Delete and redo release branch git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027457 13f79535-47bb-0310-9956-ffa450edef68 --- .../store-webapp/src/main/java/services/Cart.java | 28 ---- .../src/main/java/services/Catalog.java | 27 ---- .../src/main/java/services/CurrencyConverter.java | 29 ---- .../main/java/services/CurrencyConverterImpl.java | 38 ----- .../src/main/java/services/FruitsCatalogImpl.java | 52 ------- .../store-webapp/src/main/java/services/Item.java | 51 ------- .../src/main/java/services/ShoppingCartImpl.java | 112 -------------- .../store-webapp/src/main/java/services/Total.java | 29 ---- .../src/main/resources/store.composite | 55 ------- .../src/main/webapp/META-INF/sca-contribution.xml | 23 --- .../src/main/webapp/WEB-INF/geronimo-web.xml | 50 ------- .../store-webapp/src/main/webapp/WEB-INF/web.xml | 36 ----- .../store-webapp/src/main/webapp/store.html | 163 --------------------- 13 files changed, 693 deletions(-) delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Cart.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Catalog.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/CurrencyConverter.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/CurrencyConverterImpl.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/FruitsCatalogImpl.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Item.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/ShoppingCartImpl.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Total.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/resources/store.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/WEB-INF/web.xml delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/store.html (limited to 'sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src') diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Cart.java b/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Cart.java deleted file mode 100644 index 3fb5439bc3..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Cart.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package services; - -import org.apache.tuscany.sca.data.collection.Collection; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Cart extends Collection { - -} diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Catalog.java b/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Catalog.java deleted file mode 100644 index b5e504fe11..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Catalog.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package services; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Catalog { - Item[] get(); -} diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/CurrencyConverter.java b/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/CurrencyConverter.java deleted file mode 100644 index a064f3dd69..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/CurrencyConverter.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package services; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface CurrencyConverter { - public double getConversion(String fromCurrenycCode, String toCurrencyCode, double amount); - - public String getCurrencySymbol(String currencyCode); -} diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/CurrencyConverterImpl.java b/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/CurrencyConverterImpl.java deleted file mode 100644 index c354aed447..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/CurrencyConverterImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package services; - -public class CurrencyConverterImpl implements CurrencyConverter { - public double getConversion(String fromCurrencyCode, String toCurrencyCode, double amount) { - if (toCurrencyCode.equals("USD")) - return amount; - else if (toCurrencyCode.equals("EUR")) - return ((double)Math.round(amount * 0.7256 * 100)) /100; - return 0; - } - - public String getCurrencySymbol(String currencyCode) { - if (currencyCode.equals("USD")) - return "$"; - else if (currencyCode.equals("EUR")) - return "E"; //"€"; - return "?"; - } -} diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/FruitsCatalogImpl.java b/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/FruitsCatalogImpl.java deleted file mode 100644 index d132a24b00..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/FruitsCatalogImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package services; - -import java.util.ArrayList; -import java.util.List; - -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Property; -import org.oasisopen.sca.annotation.Reference; - -public class FruitsCatalogImpl implements Catalog { - - @Property - public String currencyCode = "USD"; - - @Reference - public CurrencyConverter currencyConverter; - - private List catalog = new ArrayList(); - - @Init - public void init() { - String currencySymbol = currencyConverter.getCurrencySymbol(currencyCode); - catalog.add(new Item("Apple", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 2.99))); - catalog.add(new Item("Orange", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 3.55))); - catalog.add(new Item("Pear", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 1.55))); - } - - public Item[] get() { - Item[] catalogArray = new Item[catalog.size()]; - catalog.toArray(catalogArray); - return catalogArray; - } -} diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Item.java b/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Item.java deleted file mode 100644 index 27abd4f016..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Item.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package services; - - -public class Item { - private String name; - private String price; - - public Item() { - } - - public Item(String name, String price) { - this.name = name; - this.price = price; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getPrice() { - return price; - } - - public void setPrice(String price) { - this.price = price; - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/ShoppingCartImpl.java b/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/ShoppingCartImpl.java deleted file mode 100644 index 698614212d..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/ShoppingCartImpl.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package services; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import org.apache.tuscany.sca.data.collection.Entry; -import org.apache.tuscany.sca.data.collection.NotFoundException; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Scope; - -@Scope("COMPOSITE") -public class ShoppingCartImpl implements Cart, Total { - - private Map cart; - - @Init - public void init() { - cart = new HashMap(); - } - - public Entry[] getAll() { - Entry[] entries = new Entry[cart.size()]; - int i = 0; - for (Map.Entry e: cart.entrySet()) { - entries[i++] = new Entry(e.getKey(), e.getValue()); - } - return entries; - } - - public Item get(String key) throws NotFoundException { - Item item = cart.get(key); - if (item == null) { - throw new NotFoundException(key); - } else { - return item; - } - } - - public String post(String key, Item item) { - if (key == null) { - key ="cart-" + UUID.randomUUID().toString(); - } - cart.put(key, item); - return key; - } - - public void put(String key, Item item) throws NotFoundException { - if (!cart.containsKey(key)) { - throw new NotFoundException(key); - } - cart.put(key, item); - } - - public void delete(String key) throws NotFoundException { - if (key == null || key.equals("")) { - cart.clear(); - } else { - Item item = cart.remove(key); - if (item == null) - throw new NotFoundException(key); - } - } - - public Entry[] query(String queryString) { - List> entries = new ArrayList>(); - if (queryString.startsWith("name=")) { - String name = queryString.substring(5); - for (Map.Entry e: cart.entrySet()) { - Item item = e.getValue(); - if (item.getName().equals(name)) { - entries.add(new Entry(e.getKey(), e.getValue())); - } - } - } - return entries.toArray(new Entry[entries.size()]); - } - - public String getTotal() { - double total = 0; - String currencySymbol = ""; - if (!cart.isEmpty()) { - Item item = cart.values().iterator().next(); - currencySymbol = item.getPrice().substring(0, 1); - } - for (Item item : cart.values()) { - total += Double.valueOf(item.getPrice().substring(1)); - } - return currencySymbol + String.valueOf(total); - } -} diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Total.java b/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Total.java deleted file mode 100644 index b77cc1c7ac..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/java/services/Total.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package services; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Total { - - String getTotal(); - -} diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/resources/store.composite b/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/resources/store.composite deleted file mode 100644 index 7a07b89903..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/resources/store.composite +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - USD - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/META-INF/sca-contribution.xml deleted file mode 100644 index cdda6bbcad..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml deleted file mode 100644 index b353a6e759..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - org.apache.tuscany - sample-store-webapp - 1.0 - car - - - - - org.apache.axiom - org.apache.axis2 - org.apache.commons - org.jdom - - - - /sample-store-secure-webapp - diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index bf3fe972ca..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - sample-store-webapp - - - tuscany - org.apache.tuscany.sca.host.webapp.TuscanyServletFilter - - - - tuscany - /* - - - - store.html - - \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/store.html b/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/store.html deleted file mode 100644 index 7fa2e07d5a..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/applications/store-webapp/src/main/webapp/store.html +++ /dev/null @@ -1,163 +0,0 @@ - - - -Store - - - - - - - - - -

Store

-
-

Catalog

-
-
-
- -
- -
- -

Your Shopping Cart

-
-
-
-
-
- - - (feed) -
-
- - -- cgit v1.2.3