From c40ade3c51fffbe23ca390599c056206e0f5fd5b Mon Sep 17 00:00:00 2001 From: lresende Date: Tue, 17 Nov 2009 06:21:41 +0000 Subject: Updating store sample application to the latest OASIS namespace/packages and updating the launcher to use 2.x Node git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@881166 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/samples/store/pom.xml | 38 ++++++++++------------ .../samples/store/src/main/java/launch/Launch.java | 11 +++++-- .../samples/store/src/main/java/services/Cart.java | 2 +- .../store/src/main/java/services/Catalog.java | 2 +- .../src/main/java/services/CurrencyConverter.java | 2 +- .../src/main/java/services/FruitsCatalogImpl.java | 6 ++-- .../samples/store/src/main/java/services/Item.java | 1 - .../src/main/java/services/ShoppingCartImpl.java | 4 +-- .../store/src/main/java/services/Total.java | 2 +- .../store/src/main/resources/store.composite | 20 ++++++------ 10 files changed, 45 insertions(+), 43 deletions(-) (limited to 'java') diff --git a/java/sca/samples/store/pom.xml b/java/sca/samples/store/pom.xml index baa666dabd..5e54efd09b 100644 --- a/java/sca/samples/store/pom.xml +++ b/java/sca/samples/store/pom.xml @@ -22,7 +22,7 @@ org.apache.tuscany.sca tuscany-sca - 1.6-SNAPSHOT + 2.0-SNAPSHOT ../pom.xml sample-store @@ -38,70 +38,69 @@ org.apache.tuscany.sca - tuscany-host-embedded - 1.6-SNAPSHOT + tuscany-node-impl + 2.0-SNAPSHOT - + org.apache.tuscany.sca tuscany-data-api - 1.6-SNAPSHOT + 2.0-SNAPSHOT org.apache.tuscany.sca tuscany-implementation-java-runtime - 1.6-SNAPSHOT + 2.0-SNAPSHOT runtime org.apache.tuscany.sca - tuscany-implementation-widget-runtime-tuscany - 1.6-SNAPSHOT + tuscany-implementation-widget-runtime-dojo + 2.0-SNAPSHOT runtime org.apache.tuscany.sca - tuscany-binding-atom-abdera - 1.6-SNAPSHOT + tuscany-binding-atom-runtime + 2.0-SNAPSHOT runtime org.apache.tuscany.sca - tuscany-binding-atom-js - 1.6-SNAPSHOT + tuscany-binding-atom-js-dojo + 2.0-SNAPSHOT runtime org.apache.tuscany.sca tuscany-binding-jsonrpc-runtime - 1.6-SNAPSHOT + 2.0-SNAPSHOT runtime org.apache.tuscany.sca - tuscany-binding-jsonrpc-js - 1.6-SNAPSHOT + tuscany-binding-jsonrpc-js-dojo + 2.0-SNAPSHOT runtime - org.apache.tuscany.sca tuscany-binding-http-runtime - 1.6-SNAPSHOT + 2.0-SNAPSHOT runtime org.apache.tuscany.sca - tuscany-host-tomcat - 1.6-SNAPSHOT + tuscany-host-jetty + 2.0-SNAPSHOT runtime @@ -111,7 +110,6 @@ 4.5 test - diff --git a/java/sca/samples/store/src/main/java/launch/Launch.java b/java/sca/samples/store/src/main/java/launch/Launch.java index 801697abea..5105b0ac43 100644 --- a/java/sca/samples/store/src/main/java/launch/Launch.java +++ b/java/sca/samples/store/src/main/java/launch/Launch.java @@ -19,16 +19,21 @@ package launch; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; public class Launch { public static void main(String[] args) throws Exception { System.out.println("Starting ..."); - SCADomain scaDomain = SCADomain.newInstance("store.composite"); + String contribution = ContributionLocationHelper.getContributionLocation(Launch.class); + Node node = NodeFactory.newInstance().createNode("store.composite", new Contribution("test", contribution)); System.out.println("store.composite ready for big business !!!"); System.in.read(); System.out.println("Stopping ..."); - scaDomain.close(); + node.stop(); + node.destroy(); System.out.println(); } } diff --git a/java/sca/samples/store/src/main/java/services/Cart.java b/java/sca/samples/store/src/main/java/services/Cart.java index 9e6226d963..3fb5439bc3 100644 --- a/java/sca/samples/store/src/main/java/services/Cart.java +++ b/java/sca/samples/store/src/main/java/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 { diff --git a/java/sca/samples/store/src/main/java/services/Catalog.java b/java/sca/samples/store/src/main/java/services/Catalog.java index 2c3b19f579..b5e504fe11 100644 --- a/java/sca/samples/store/src/main/java/services/Catalog.java +++ b/java/sca/samples/store/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/samples/store/src/main/java/services/CurrencyConverter.java b/java/sca/samples/store/src/main/java/services/CurrencyConverter.java index e104a0423a..a064f3dd69 100644 --- a/java/sca/samples/store/src/main/java/services/CurrencyConverter.java +++ b/java/sca/samples/store/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 { diff --git a/java/sca/samples/store/src/main/java/services/FruitsCatalogImpl.java b/java/sca/samples/store/src/main/java/services/FruitsCatalogImpl.java index 377b3d7e59..d132a24b00 100644 --- a/java/sca/samples/store/src/main/java/services/FruitsCatalogImpl.java +++ b/java/sca/samples/store/src/main/java/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/samples/store/src/main/java/services/Item.java b/java/sca/samples/store/src/main/java/services/Item.java index 27abd4f016..fe32cfc828 100644 --- a/java/sca/samples/store/src/main/java/services/Item.java +++ b/java/sca/samples/store/src/main/java/services/Item.java @@ -19,7 +19,6 @@ package services; - public class Item { private String name; private String price; diff --git a/java/sca/samples/store/src/main/java/services/ShoppingCartImpl.java b/java/sca/samples/store/src/main/java/services/ShoppingCartImpl.java index 9889921a96..698614212d 100644 --- a/java/sca/samples/store/src/main/java/services/ShoppingCartImpl.java +++ b/java/sca/samples/store/src/main/java/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/samples/store/src/main/java/services/Total.java b/java/sca/samples/store/src/main/java/services/Total.java index 8f464e526f..b77cc1c7ac 100644 --- a/java/sca/samples/store/src/main/java/services/Total.java +++ b/java/sca/samples/store/src/main/java/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/samples/store/src/main/resources/store.composite b/java/sca/samples/store/src/main/resources/store.composite index 571678839d..89ac474db1 100644 --- a/java/sca/samples/store/src/main/resources/store.composite +++ b/java/sca/samples/store/src/main/resources/store.composite @@ -17,24 +17,24 @@ * specific language governing permissions and limitations * under the License. --> - - + - + - + - + - + @@ -42,7 +42,7 @@ USD - + @@ -50,10 +50,10 @@ - + - + -- cgit v1.2.3