From 61c9466ff91ca40f4b1ebbe670d7848e521131d7 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:08:20 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835130 13f79535-47bb-0310-9956-ffa450edef68 --- .../tutorial/assets/META-INF/sca-contribution.xml | 27 ---- branches/sca-java-1.3.3/tutorial/assets/pom.xml | 89 ----------- .../tutorial/assets/services/Cart.java | 28 ---- .../tutorial/assets/services/Catalog.java | 27 ---- .../assets/services/CurrencyConverter.java | 29 ---- .../assets/services/CurrencyConverterImpl.java | 38 ----- .../assets/services/FruitsCatalogImpl.java | 52 ------- .../tutorial/assets/services/Item.java | 66 -------- .../tutorial/assets/services/ShoppingCartImpl.java | 112 -------------- .../tutorial/assets/services/Total.java | 29 ---- .../assets/services/VegetablesCatalogImpl.java | 42 ----- .../assets/services/db/ShoppingCartTableImpl.java | 171 --------------------- .../tutorial/assets/services/db/cart.sql | 27 ---- .../assets/services/map/FruitsCatalogImpl.java | 56 ------- .../assets/services/market/MarketCatalogImpl.java | 66 -------- .../assets/services/merger/MergedCatalogImpl.java | 66 -------- .../sca-java-1.3.3/tutorial/assets/tutorial.html | 37 ----- .../tutorial/assets/uiservices/store.html | 141 ----------------- 18 files changed, 1103 deletions(-) delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/pom.xml delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/services/Cart.java delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/services/Catalog.java delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/services/CurrencyConverter.java delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/services/CurrencyConverterImpl.java delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/services/FruitsCatalogImpl.java delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/services/Item.java delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/services/ShoppingCartImpl.java delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/services/Total.java delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/services/VegetablesCatalogImpl.java delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/services/db/ShoppingCartTableImpl.java delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/services/db/cart.sql delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/services/map/FruitsCatalogImpl.java delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/services/market/MarketCatalogImpl.java delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/services/merger/MergedCatalogImpl.java delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/tutorial.html delete mode 100644 branches/sca-java-1.3.3/tutorial/assets/uiservices/store.html (limited to 'branches/sca-java-1.3.3/tutorial/assets') diff --git a/branches/sca-java-1.3.3/tutorial/assets/META-INF/sca-contribution.xml b/branches/sca-java-1.3.3/tutorial/assets/META-INF/sca-contribution.xml deleted file mode 100644 index cba1564cb4..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/META-INF/sca-contribution.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.3.3/tutorial/assets/pom.xml b/branches/sca-java-1.3.3/tutorial/assets/pom.xml deleted file mode 100644 index c0f20c844c..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/pom.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-tutorial - 1.3.3-SNAPSHOT - ../pom.xml - - tutorial-assets - Apache Tuscany SCA Tutorial Reusable Assets - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.3.3-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-data-api - 1.3.3-SNAPSHOT - - - - org.apache.derby - derby - 10.3.1.4 - - - - - ${artifactId} - ${basedir} - - - ${basedir} - - **/*.java - **/.*/** - pom.xml - build.xml - target/** - - - - - - org.apache.tuscany.sca - tuscany-maven-ant-generator - 1.3.3-SNAPSHOT - - - - generate - - - - - - - - diff --git a/branches/sca-java-1.3.3/tutorial/assets/services/Cart.java b/branches/sca-java-1.3.3/tutorial/assets/services/Cart.java deleted file mode 100644 index 9e6226d963..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/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.osoa.sca.annotations.Remotable; - -@Remotable -public interface Cart extends Collection { - -} diff --git a/branches/sca-java-1.3.3/tutorial/assets/services/Catalog.java b/branches/sca-java-1.3.3/tutorial/assets/services/Catalog.java deleted file mode 100644 index 2c3b19f579..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/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.osoa.sca.annotations.Remotable; - -@Remotable -public interface Catalog { - Item[] get(); -} diff --git a/branches/sca-java-1.3.3/tutorial/assets/services/CurrencyConverter.java b/branches/sca-java-1.3.3/tutorial/assets/services/CurrencyConverter.java deleted file mode 100644 index e104a0423a..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/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.osoa.sca.annotations.Remotable; - -@Remotable -public interface CurrencyConverter { - public double getConversion(String fromCurrenycCode, String toCurrencyCode, double amount); - - public String getCurrencySymbol(String currencyCode); -} diff --git a/branches/sca-java-1.3.3/tutorial/assets/services/CurrencyConverterImpl.java b/branches/sca-java-1.3.3/tutorial/assets/services/CurrencyConverterImpl.java deleted file mode 100644 index c354aed447..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/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/branches/sca-java-1.3.3/tutorial/assets/services/FruitsCatalogImpl.java b/branches/sca-java-1.3.3/tutorial/assets/services/FruitsCatalogImpl.java deleted file mode 100644 index 377b3d7e59..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/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.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.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/branches/sca-java-1.3.3/tutorial/assets/services/Item.java b/branches/sca-java-1.3.3/tutorial/assets/services/Item.java deleted file mode 100644 index 81cefcdbef..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/services/Item.java +++ /dev/null @@ -1,66 +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; - private String origin; - - public Item() { - } - - public Item(String name, String price, String origin) { - this.name = name; - this.price = price; - this.origin = origin; - } - - 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; - } - - public String getOrigin() { - return origin; - } - - public void setOrigin(String origin) { - this.origin = origin; - } - -} diff --git a/branches/sca-java-1.3.3/tutorial/assets/services/ShoppingCartImpl.java b/branches/sca-java-1.3.3/tutorial/assets/services/ShoppingCartImpl.java deleted file mode 100644 index 9889921a96..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/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.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.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/branches/sca-java-1.3.3/tutorial/assets/services/Total.java b/branches/sca-java-1.3.3/tutorial/assets/services/Total.java deleted file mode 100644 index 8f464e526f..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/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.osoa.sca.annotations.Remotable; - -@Remotable -public interface Total { - - String getTotal(); - -} diff --git a/branches/sca-java-1.3.3/tutorial/assets/services/VegetablesCatalogImpl.java b/branches/sca-java-1.3.3/tutorial/assets/services/VegetablesCatalogImpl.java deleted file mode 100644 index 8bfbc757db..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/services/VegetablesCatalogImpl.java +++ /dev/null @@ -1,42 +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.osoa.sca.annotations.Init; - -public class VegetablesCatalogImpl implements Catalog { - private List catalog = new ArrayList(); - - @Init - public void init() { - catalog.add(new Item("Broccoli", "$2.99")); - catalog.add(new Item("Asparagus", "$3.55")); - catalog.add(new Item("Cauliflower", "$1.55")); - } - - public Item[] get() { - Item[] catalogArray = new Item[catalog.size()]; - catalog.toArray(catalogArray); - return catalogArray; - } -} diff --git a/branches/sca-java-1.3.3/tutorial/assets/services/db/ShoppingCartTableImpl.java b/branches/sca-java-1.3.3/tutorial/assets/services/db/ShoppingCartTableImpl.java deleted file mode 100644 index cfc52c563c..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/services/db/ShoppingCartTableImpl.java +++ /dev/null @@ -1,171 +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.db; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.List; -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 services.Cart; -import services.Item; -import services.Total; - -public class ShoppingCartTableImpl implements Cart, Total { - - @Property - public String database; - - private Connection connection; - - @Init - public void init() throws Exception { - Class.forName("org.apache.derby.jdbc.EmbeddedDriver", true, Thread.currentThread().getContextClassLoader()); - String baseDir = System.getProperty("basedir"); - String url = "jdbc:derby:directory:" + (baseDir != null? baseDir + "/" + database : database); - System.out.println("Connecting to database: " + url); - connection = DriverManager.getConnection(url, "", ""); - } - - @Destroy - public void shutdown() throws Exception { - if(connection != null) { - connection.close(); - connection = null; - } - } - - public Entry[] getAll() { - try { - Statement statement = connection.createStatement(); - ResultSet results = statement.executeQuery("select * from Cart"); - List> entries = new ArrayList>(); - while (results.next()) { - Item item = new Item(results.getString("name"), results.getString("price")); - entries.add(new Entry(results.getString("id"), item)); - } - return entries.toArray(new Entry[entries.size()]); - } catch (SQLException e) { - throw new ServiceRuntimeException(e); - } - } - - public Item get(String key) throws NotFoundException { - try { - Statement statement = connection.createStatement(); - ResultSet results = statement.executeQuery("select * from Cart where id = '" + key + "'"); - if (results.next()) { - return new Item(results.getString("name"), results.getString("price")); - } else { - throw new NotFoundException(key); - } - } catch (SQLException e) { - throw new ServiceRuntimeException(e); - } - } - - public String post(String key, Item item) { - if (key == null) { - key = "cart-" + UUID.randomUUID().toString(); - } - try { - Statement statement = connection.createStatement(); - String query = "insert into Cart values ('" + key + "', '" + item.getName() + "', '" + item.getPrice() + "')"; - System.out.println(query); - statement.executeUpdate(query); - } catch (SQLException e) { - throw new ServiceRuntimeException(e); - } - return key; - } - - public void put(String key, Item item) throws NotFoundException { - try { - Statement statement = connection.createStatement(); - String query = "update into Cart set name = '" + item.getName() + "', price = '" + item.getPrice() + "' where id = '" + key + "'"; - System.out.println(query); - int count = statement.executeUpdate(query); - if (count == 0) - throw new NotFoundException(key); - } catch (SQLException e) { - throw new ServiceRuntimeException(e); - } - } - - public void delete(String key) throws NotFoundException { - try { - Statement statement = connection.createStatement(); - if (key == null || key.equals("")) { - String query = "delete from Cart"; - System.out.println(query); - statement.executeUpdate(query); - } else { - String query = "delete from Cart where id = '" + key + "'"; - System.out.println(query); - int count = statement.executeUpdate(query); - if (count == 0) - throw new NotFoundException(key); - } - } catch (SQLException e) { - throw new ServiceRuntimeException(e); - } - } - - public Entry[] query(String queryString) { - try { - Statement statement = connection.createStatement(); - ResultSet results = statement.executeQuery("select * from Cart where " + queryString); - List> entries = new ArrayList>(); - while (results.next()) { - Item item = new Item(results.getString("name"), results.getString("price")); - entries.add(new Entry(results.getString("id"), item)); - } - return entries.toArray(new Entry[entries.size()]); - } catch (SQLException e) { - throw new ServiceRuntimeException(e); - } - } - - public String getTotal() { - Entry[] entries = getAll(); - double total = 0; - String currencySymbol = ""; - if (entries.length > 0) { - Item item = entries[0].getData(); - currencySymbol = item.getPrice().substring(0, 1); - } - for (Entry entry : entries) { - Item item = entry.getData(); - total += Double.valueOf(item.getPrice().substring(1)); - } - return currencySymbol + total; - } -} diff --git a/branches/sca-java-1.3.3/tutorial/assets/services/db/cart.sql b/branches/sca-java-1.3.3/tutorial/assets/services/db/cart.sql deleted file mode 100644 index 25f16cb36b..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/services/db/cart.sql +++ /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. --- - -DROP TABLE CART; - -CREATE TABLE CART( - id VARCHAR(50) NOT NULL, - name VARCHAR(50), - price VARCHAR(10), - primary key (id) -); diff --git a/branches/sca-java-1.3.3/tutorial/assets/services/map/FruitsCatalogImpl.java b/branches/sca-java-1.3.3/tutorial/assets/services/map/FruitsCatalogImpl.java deleted file mode 100644 index b160ba7be0..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/services/map/FruitsCatalogImpl.java +++ /dev/null @@ -1,56 +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.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 services.Catalog; -import services.CurrencyConverter; -import services.Item; - -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), "34.425744,-119.711151")); - catalog.add(new Item("Orange", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 3.55), "25.811018,-80.130844")); - catalog.add(new Item("Pear", currencySymbol + currencyConverter.getConversion("USD", currencyCode, 1.55), "36.596649,-121.8964")); - } - - public Item[] get() { - Item[] catalogArray = new Item[catalog.size()]; - catalog.toArray(catalogArray); - return catalogArray; - } -} diff --git a/branches/sca-java-1.3.3/tutorial/assets/services/market/MarketCatalogImpl.java b/branches/sca-java-1.3.3/tutorial/assets/services/market/MarketCatalogImpl.java deleted file mode 100644 index bd2c7d76a2..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/services/market/MarketCatalogImpl.java +++ /dev/null @@ -1,66 +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.market; - -import java.util.Vector; - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; - -import services.Catalog; -import services.CurrencyConverter; -import services.Item; - - -public class MarketCatalogImpl implements Catalog { - - @Property - public String currencyCode = "USD"; - - @Reference - public CurrencyConverter currencyConverter; - - @Reference(required=false) - protected Catalog[] goodsCatalog; - - - public Item[] get() { - - String currencySymbol = currencyConverter.getCurrencySymbol(currencyCode); - Vector catalog = new Vector(); - - for (int i = 0; i < goodsCatalog.length; i++) { - Item[] items = goodsCatalog[i].get(); - - for (Item item : items) { - double price = Double.valueOf(item.getPrice().substring(1)); - price = currencyConverter.getConversion("USD", currencyCode, price); - catalog.addElement(new Item(item.getName(), currencySymbol + price)); - } - } - - Item[] catalogArray = new Item[catalog.size()]; - catalog.copyInto(catalogArray); - - return catalogArray; - } - -} \ No newline at end of file diff --git a/branches/sca-java-1.3.3/tutorial/assets/services/merger/MergedCatalogImpl.java b/branches/sca-java-1.3.3/tutorial/assets/services/merger/MergedCatalogImpl.java deleted file mode 100644 index c02b4e821e..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/services/merger/MergedCatalogImpl.java +++ /dev/null @@ -1,66 +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.merger; - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; - -import services.Catalog; -import services.CurrencyConverter; -import services.Item; - -public class MergedCatalogImpl implements Catalog { - - @Property - public String currencyCode = "USD"; - - @Reference - public CurrencyConverter currencyConverter; - - @Reference - public Catalog fruitsCatalog; - - @Reference - public Catalog vegetablesCatalog; - - public Item[] get() { - String currencySymbol = currencyConverter.getCurrencySymbol(currencyCode); - - Item[] fruits = fruitsCatalog.get(); - Item[] vegetables = vegetablesCatalog.get(); - - Item[] catalog = new Item[fruits.length + vegetables.length]; - int i =0; - for (Item item: fruits) { - double price = Double.valueOf(item.getPrice().substring(1)); - price = currencyConverter.getConversion("USD", currencyCode, price); - catalog[i++] = new Item(item.getName(), currencySymbol + price); - } - - for (Item item: vegetables) { - double price = Double.valueOf(item.getPrice().substring(1)); - price = currencyConverter.getConversion("USD", currencyCode, price); - catalog[i++] = new Item(item.getName(), currencySymbol + price); - } - - return catalog; - } - -} diff --git a/branches/sca-java-1.3.3/tutorial/assets/tutorial.html b/branches/sca-java-1.3.3/tutorial/assets/tutorial.html deleted file mode 100644 index 14f81e0c22..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/tutorial.html +++ /dev/null @@ -1,37 +0,0 @@ - - - -Apache Tuscany - Online Store Tutorial - - - -

Apache Tuscany - Online Store Tutorial -

Online Store - SCA Domain -

Online Store - Fruits -

Vegetables Catalog Web Service -

Merger - Fruits and Vegetables -

Online Store - Cart Database -

Online Store - Supplier -

Online Store - Marketplace -

Merged Catalog Web Service -

EU Online Store -

Online Store Mashup - - \ No newline at end of file diff --git a/branches/sca-java-1.3.3/tutorial/assets/uiservices/store.html b/branches/sca-java-1.3.3/tutorial/assets/uiservices/store.html deleted file mode 100644 index 095570f949..0000000000 --- a/branches/sca-java-1.3.3/tutorial/assets/uiservices/store.html +++ /dev/null @@ -1,141 +0,0 @@ - - - -Store - - - - - - - - -

Store

-
-

Catalog

-
-
-
- -
- -
- -

Your Shopping Cart

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