From bcbd8cb0b78cf576d73a0140476b2996a36e5245 Mon Sep 17 00:00:00 2001 From: slaws Date: Sun, 31 Aug 2008 12:27:58 +0000 Subject: Namespace changes from scatours to tuscanyscatours and addition of callback configuration. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@690687 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/client/CurrencyConverterClient.java | 20 +++++++++++++++----- .../gettingstarted/src/client/TripClient.java | 16 ++++++++++++---- .../gettingstarted/src/client/TripWsClient.java | 21 +++++++++++++++------ .../gettingstarted/src/currencyconverter.composite | 4 ++-- .../travelsample/gettingstarted/src/trip.composite | 4 ++-- .../gettingstarted/src/tripws.composite | 4 ++-- 6 files changed, 48 insertions(+), 21 deletions(-) (limited to 'sandbox/travelsample/gettingstarted/src') diff --git a/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java b/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java index 92c00fba07..79f274fa65 100644 --- a/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java +++ b/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java @@ -19,6 +19,11 @@ package client; import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.SCAClient; +import org.apache.tuscany.sca.node.SCANode2; +import org.apache.tuscany.sca.node.SCANode2Factory; + +import trip.Trip; import currencyconverter.CurrencyConverter; /** @@ -27,12 +32,17 @@ import currencyconverter.CurrencyConverter; public class CurrencyConverterClient { public final static void main(String[] args) throws Exception { - SCADomain scaDomain = - SCADomain.newInstance("currencyconverter.composite"); + SCANode2Factory factory = SCANode2Factory.newInstance(); + SCANode2 node = factory.createSCANodeFromClassLoader("currencyconverter.composite", + null); + node.start(); + CurrencyConverter currencyConverter = - scaDomain.getService(CurrencyConverter.class, - "CurrencyConverterComponent"); + ((SCAClient)node).getService(CurrencyConverter.class, + "CurrencyConverterComponent"); + System.out.println(currencyConverter.convert("GBP", "USD", 10.00)); - scaDomain.close(); + + node.stop(); } } diff --git a/sandbox/travelsample/gettingstarted/src/client/TripClient.java b/sandbox/travelsample/gettingstarted/src/client/TripClient.java index 73aa5e2146..36616569a4 100644 --- a/sandbox/travelsample/gettingstarted/src/client/TripClient.java +++ b/sandbox/travelsample/gettingstarted/src/client/TripClient.java @@ -18,7 +18,9 @@ */ package client; -import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.SCAClient; +import org.apache.tuscany.sca.node.SCANode2; +import org.apache.tuscany.sca.node.SCANode2Factory; import trip.Trip; @@ -28,10 +30,16 @@ import trip.Trip; public class TripClient { public final static void main(String[] args) throws Exception { - SCADomain scaDomain = SCADomain.newInstance("trip.composite"); - Trip trip = scaDomain.getService(Trip.class, "TripComponent"); + SCANode2Factory factory = SCANode2Factory.newInstance(); + SCANode2 node = factory.createSCANodeFromClassLoader("trip.composite", + null); + node.start(); + + Trip trip = ((SCAClient)node).getService(Trip.class, + "TripComponent"); + System.out.println(trip.getTotalPrice()); - scaDomain.close(); + node.stop(); } } diff --git a/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java b/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java index 2df62d1d3c..54dcb4e52a 100644 --- a/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java +++ b/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java @@ -19,6 +19,9 @@ package client; import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.node.SCAClient; +import org.apache.tuscany.sca.node.SCANode2; +import org.apache.tuscany.sca.node.SCANode2Factory; import trip.Trip; @@ -28,13 +31,19 @@ import trip.Trip; public class TripWsClient { public final static void main(String[] args) throws Exception { - SCADomain scaDomain = SCADomain.newInstance("tripws.composite"); - Trip trip = scaDomain.getService(Trip.class, "TripComponent"); - System.out.println(trip.getTotalPrice()); + SCANode2Factory factory = SCANode2Factory.newInstance(); + SCANode2 node = factory.createSCANodeFromClassLoader("tripws.composite", + null); + node.start(); + + Trip trip = ((SCAClient)node).getService(Trip.class, + "TripComponent"); - System.out.println("press enter to continue"); - System.in.read(); + System.out.println(trip.getTotalPrice()); - scaDomain.close(); + System.out.println("press enter to continue"); + System.in.read(); + + node.stop(); } } diff --git a/sandbox/travelsample/gettingstarted/src/currencyconverter.composite b/sandbox/travelsample/gettingstarted/src/currencyconverter.composite index ae94401f6c..2a37151e08 100644 --- a/sandbox/travelsample/gettingstarted/src/currencyconverter.composite +++ b/sandbox/travelsample/gettingstarted/src/currencyconverter.composite @@ -18,8 +18,8 @@ * under the License. --> diff --git a/sandbox/travelsample/gettingstarted/src/trip.composite b/sandbox/travelsample/gettingstarted/src/trip.composite index ee5c6812db..32a3eed4be 100644 --- a/sandbox/travelsample/gettingstarted/src/trip.composite +++ b/sandbox/travelsample/gettingstarted/src/trip.composite @@ -18,8 +18,8 @@ * under the License. --> diff --git a/sandbox/travelsample/gettingstarted/src/tripws.composite b/sandbox/travelsample/gettingstarted/src/tripws.composite index 2031ca5382..dd399ee92a 100644 --- a/sandbox/travelsample/gettingstarted/src/tripws.composite +++ b/sandbox/travelsample/gettingstarted/src/tripws.composite @@ -18,8 +18,8 @@ * under the License. --> -- cgit v1.2.3