diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-16 18:08:46 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-16 18:08:46 +0000 |
commit | 3b191c283307dc68e2aaa6faea58f4b3b717e35c (patch) | |
tree | 9f5742cb5dd7be684c73a606077b106e8d23a700 /sca-java-2.x/trunk/tutorials/travelsample/launchers | |
parent | f31b8fa6a3b9d9d356212670296c60beb468c8e5 (diff) |
Update the travelsample with 2.x namespace/api/dependency (not completed yet)
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@923913 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
69 files changed, 320 insertions, 325 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml index 6324f538bd..18a9e85bca 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-blog-feed</artifactId>
<name>Apache Tuscany SCA Tours Blog Feed Launcher</name>
@@ -52,7 +52,7 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java index 8dc6956986..76ddbbb079 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java @@ -21,16 +21,16 @@ package scatours; import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class BlogFeedLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution feedContribution = locate("blog-feed");
+ Contribution feedContribution = locate("blog-feed");
- SCANode node = SCANodeFactory.newInstance().createSCANode("blog-feed.composite", feedContribution);
+ Node node = NodeFactory.getInstance().createNode("blog-feed.composite", feedContribution);
node.start();
System.out.println("Node started - Press enter to shutdown.");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml index ea5ba3f930..d24e7b03ee 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-buildingblocks</artifactId>
<name>Apache Tuscany SCA Tours Building Blocks Launcher</name>
@@ -71,7 +71,7 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/main/java/scatours/BuildingBlocksLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/main/java/scatours/BuildingBlocksLauncher.java index aaca0f44fa..6409f319e4 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/main/java/scatours/BuildingBlocksLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/main/java/scatours/BuildingBlocksLauncher.java @@ -20,11 +20,8 @@ package scatours;
import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-import static scatours.launcher.LauncherUtil.locate;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class BuildingBlocksLauncher {
@@ -35,29 +32,29 @@ public class BuildingBlocksLauncher { }
private static void runImpl() throws Exception {
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("tours-impl-client.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("tours-impl-client.composite",
locate("buildingblocks"),
locate("buildingblocks-client"));
node.start();
- Runnable client = ((SCAClient)node).getService(Runnable.class, "ToursClient/Runnable");
+ Runnable client = ((Node)node).getService(Runnable.class, "ToursClient/Runnable");
client.run();
node.stop();
}
private static void runImplInclude() throws Exception {
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("tours-impl-include-client.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("tours-impl-include-client.composite",
locate("introducing-trips"),
locate("buildingblocks"),
locate("buildingblocks-client"));
node.start();
- Runnable client = ((SCAClient)node).getService(Runnable.class, "ToursClient/Runnable");
+ Runnable client = ((Node)node).getService(Runnable.class, "ToursClient/Runnable");
client.run();
node.stop();
@@ -69,20 +66,20 @@ public class BuildingBlocksLauncher { jmsBroker.setUseJmx(false);
jmsBroker.addConnector("tcp://localhost:61619");
- SCANode node1 =
- SCANodeFactory.newInstance().createSCANode("tours-appl.composite",
+ Node node1 =
+ NodeFactory.getInstance().createNode("tours-appl.composite",
locate("introducing-trips"),
locate("buildingblocks"));
- SCANode node2 =
- SCANodeFactory.newInstance().createSCANode("tours-appl-client.composite",
+ Node node2 =
+ NodeFactory.getInstance().createNode("tours-appl-client.composite",
locate("buildingblocks-client"));
jmsBroker.start();
node1.start();
node2.start();
- Runnable client = ((SCAClient)node2).getService(Runnable.class, "ApplClient/Runnable");
+ Runnable client = ((Node)node2).getService(Runnable.class, "ApplClient/Runnable");
client.run();
node2.stop();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml index 30650908b9..93e38eee83 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-currency-converter-corba</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter CORBA Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java index 0f9d0eca80..514fc9fb41 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java @@ -21,27 +21,27 @@ package scatours; import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.currencyconverter.CurrencyConverter;
public class CurrencyConverterCORBALauncher {
public static void main(String[] args) throws Exception {
- SCAContribution currencyCORBAContribution = locate("currency-corba");
- SCAContribution currencyContribution = locate("currency");
+ Contribution currencyCORBAContribution = locate("currency-corba");
+ Contribution currencyContribution = locate("currency");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("currency-converter-corba.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("currency-converter-corba.composite",
currencyContribution,
currencyCORBAContribution);
node.start();
System.out.println("Quick currency converter test");
- CurrencyConverter converter = ((SCAClient)node).getService(CurrencyConverter.class, "CurrencyConverter");
+ CurrencyConverter converter = ((Node)node).getService(CurrencyConverter.class, "CurrencyConverter");
System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));
System.out.println("100 USD = " + converter.convert("USD", "GBP", 100) + "GBP");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/currencyconverter/CurrencyConverter.java index fe5c98bf02..80d623d22d 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/currencyconverter/CurrencyConverter.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/currencyconverter/CurrencyConverter.java @@ -18,7 +18,7 @@ */
package scatours.currencyconverter;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The CurrencyConverter service interface
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml index d30733bf01..34a0af3acd 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-currency-converter-jms</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter JMS Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java index 6da4e7e162..306ec1a9bf 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java @@ -22,9 +22,9 @@ package scatours; import static scatours.launcher.LauncherUtil.locate;
import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class CurrencyConverterJMSLauncher {
@@ -35,11 +35,11 @@ public class CurrencyConverterJMSLauncher { jmsBroker.addConnector("tcp://localhost:61619");
jmsBroker.start();
- SCAContribution currencyJMSContribution = locate("currency-jms");
- SCAContribution currencyContribution = locate("currency");
+ Contribution currencyJMSContribution = locate("currency-jms");
+ Contribution currencyContribution = locate("currency");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("currency-converter-jms.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("currency-converter-jms.composite",
currencyContribution,
currencyJMSContribution);
node.start();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml index b12cfa44ad..588fd37dc3 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-currency-converter-rmi</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter RMI Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java index b1f783bfba..3ebd23b2d0 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java @@ -18,7 +18,7 @@ */
package com.tuscanyscatours.currencyconverter;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The CurrencyConverter service interface
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java index 81d9e19c60..8af4a90f57 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java @@ -21,27 +21,27 @@ package scatours; import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import com.tuscanyscatours.currencyconverter.CurrencyConverter;
public class CurrencyConverterRMILauncher {
public static void main(String[] args) throws Exception {
- SCAContribution currencyRMIContribution = locate("currency-rmi");
- SCAContribution currencyContribution = locate("currency");
+ Contribution currencyRMIContribution = locate("currency-rmi");
+ Contribution currencyContribution = locate("currency");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("currency-converter-rmi.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("currency-converter-rmi.composite",
currencyContribution,
currencyRMIContribution);
node.start();
System.out.println("Quick currency converter test");
- CurrencyConverter converter = ((SCAClient)node).getService(CurrencyConverter.class, "CurrencyConverter");
+ CurrencyConverter converter = ((Node)node).getService(CurrencyConverter.class, "CurrencyConverter");
System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));
System.out.println("100 USD = " + converter.convert("USD", "GBP", 100) + "GBP");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml index 5ff8984dbf..f231094902 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml @@ -22,10 +22,10 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-currency-converter-ws</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter Web Service Launcher</name>
@@ -60,14 +60,14 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java index 2425d3f483..c844463cbf 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java @@ -21,27 +21,27 @@ package scatours; import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.currencyconverter.CurrencyConverter;
public class CurrencyConverterWSLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution currencyWSContribution = locate("currency-ws");
- SCAContribution currencyContribution = locate("currency");
+ Contribution currencyWSContribution = locate("currency-ws");
+ Contribution currencyContribution = locate("currency");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("currency-converter-ws.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("currency-converter-ws.composite",
currencyContribution,
currencyWSContribution);
node.start();
System.out.println("Quick currency converter test");
- CurrencyConverter converter = ((SCAClient)node).getService(CurrencyConverter.class, "CurrencyConverter");
+ CurrencyConverter converter = ((Node)node).getService(CurrencyConverter.class, "CurrencyConverter");
System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));
System.out.println("100 USD = " + converter.convert("USD", "GBP", 100) + "GBP");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java index fe5c98bf02..80d623d22d 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java @@ -18,7 +18,7 @@ */
package scatours.currencyconverter;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The CurrencyConverter service interface
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml index af29324117..9b3f0db297 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-currency-converter</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java index cacd579b3b..7d7d6e3987 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java @@ -21,23 +21,23 @@ package scatours; import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.currencyconverter.CurrencyConverter;
public class CurrencyConverterLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution currencyContribution = locate("currency");
+ Contribution currencyContribution = locate("currency");
- SCANode node = SCANodeFactory.newInstance().createSCANode("currency-converter.composite", currencyContribution);
+ Node node = NodeFactory.getInstance().createNode("currency-converter.composite", currencyContribution);
node.start();
System.out.println("Quick currency converter test");
- CurrencyConverter converter = ((SCAClient)node).getService(CurrencyConverter.class, "CurrencyConverter");
+ CurrencyConverter converter = ((Node)node).getService(CurrencyConverter.class, "CurrencyConverter");
System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));
System.out.println("100 USD = " + converter.convert("USD", "GBP", 100) + "GBP");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java index fe5c98bf02..80d623d22d 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java @@ -18,7 +18,7 @@ */
package scatours.currencyconverter;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The CurrencyConverter service interface
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml index 7fef1796f7..d6645c4895 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml @@ -22,10 +22,10 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <artifactId>scatours-launcher-databinding</artifactId> <name>Apache Tuscany SCA Tours Databinding Launcher</name> @@ -95,7 +95,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java index 6271c60d53..d7cae1e280 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java @@ -21,22 +21,22 @@ package scatours; import static scatours.launcher.LauncherUtil.locate; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; public class DatabindingLauncher { public static void main(String[] args) throws Exception { - SCANode node1 = SCANodeFactory.newInstance().createSCANode(null, + Node node1 = NodeFactory.getInstance().createNode( locate("payment-java"), locate("databinding-client")); - SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, locate("creditcard-payment-sdo")); + Node node2 = NodeFactory.getInstance().createNode(locate("creditcard-payment-sdo")); node1.start(); node2.start(); - Runnable runner = ((SCAClient)node1).getService(Runnable.class, "TestClient/Runnable"); + Runnable runner = ((Node)node1).getService(Runnable.class, "TestClient/Runnable"); runner.run(); node1.stop(); diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml index b8067e75f2..4dd36bfcfc 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml @@ -22,10 +22,10 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-feed-logger</artifactId>
<name>Apache Tuscany SCA Tours Feed Logger Launcher</name>
@@ -53,7 +53,7 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java index 4aea24dbfe..35c3560645 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java @@ -21,22 +21,22 @@ package scatours; import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.feedlogger.FeedLogger;
public class FeedLoggerLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution feedContribution = locate("feed-logger");
+ Contribution feedContribution = locate("feed-logger");
- SCANode node = SCANodeFactory.newInstance().createSCANode("feed-logger.composite", feedContribution);
+ Node node = NodeFactory.getInstance().createNode("feed-logger.composite", feedContribution);
node.start();
- FeedLogger logger = ((SCAClient)node).getService(FeedLogger.class, "FeedLogger");
+ FeedLogger logger = ((Node)node).getService(FeedLogger.class, "FeedLogger");
logger.logFeeds(5);
node.stop();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml index 95d2077d0e..c0e8f0c83d 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-fullapp-domain</artifactId>
<name>Apache Tuscany SCA Tours Full App Domain Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml index 34d2007daa..26bab49e0d 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml @@ -22,9 +22,9 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> - </parent><version>1.0-SNAPSHOT</version> + </parent><version>2.0-SNAPSHOT</version> <artifactId>scatours-launcher-fullapp-nodes</artifactId> <name>Apache Tuscany SCA Tours Full Application Nodes Launcher</name> @@ -125,7 +125,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java index 4d6459b749..cd618a45e0 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java @@ -21,41 +21,41 @@ package scatours; import java.io.IOException; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; public class FullAppNodesLauncher { public static void main(String[] args) throws Exception { - SCANode nodeCreditcard = - SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/creditcard"); + Node nodeCreditcard = + NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/creditcard"); nodeCreditcard.start(); - SCANode nodePayment = - SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/payment"); + Node nodePayment = + NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/payment"); nodePayment.start(); - SCANode nodeShoppingcart = - SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/shoppingcart"); + Node nodeShoppingcart = + NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/shoppingcart"); nodeShoppingcart.start(); - SCANode nodeCurrency = - SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/currency"); + Node nodeCurrency = + NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/currency"); nodeCurrency.start(); - SCANode nodePackagedtrip = - SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/packagedtrip"); + Node nodePackagedtrip = + NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/packagedtrip"); nodePackagedtrip.start(); - SCANode nodeBespoketrip = - SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/bespoketrip"); + Node nodeBespoketrip = + NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/bespoketrip"); nodeBespoketrip.start(); - SCANode nodeFrontend = - SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/coordination"); + Node nodeFrontend = + NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/coordination"); nodeFrontend.start(); - SCANode nodeUI = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ui"); + Node nodeUI = NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/ui"); nodeUI.start(); System.out.println("Point your browser at - http://localhost:8080/scatours/ "); diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml index 24b4624912..c9e810e44a 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml @@ -22,10 +22,10 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <artifactId>scatours-launcher-fullapp</artifactId> <name>Apache Tuscany SCA Tours Full Application Launcher</name> @@ -127,7 +127,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java index ab1b7d031b..c3f68e2d60 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java @@ -23,14 +23,14 @@ import static scatours.launcher.LauncherUtil.locate; import java.io.IOException; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; public class FullAppLauncher { public static void main(String[] args) throws Exception { - SCANode node = - SCANodeFactory.newInstance().createSCANode(null, + Node node = + NodeFactory.getInstance().createNode( locate("common"), locate("currency"), locate("hotel"), diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml index dcad902807..0c83357935 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-help-pages</artifactId>
<name>Apache Tuscany SCA Tours Help Pages Launcher</name>
@@ -66,7 +66,7 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java index a72f5c4c54..4b8960e6ae 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java @@ -21,16 +21,16 @@ package scatours; import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class HelpPagesLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution helpContribution = locate("help-pages");
+ Contribution helpContribution = locate("help-pages");
- SCANode node = SCANodeFactory.newInstance().createSCANode("help-pages.composite", helpContribution);
+ Node node = NodeFactory.getInstance().createNode("help-pages.composite", helpContribution);
node.start();
System.out.println("Node started - Press enter to shutdown.");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml index 7e15913e53..c259624844 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-interaction</artifactId>
<name>Apache Tuscany SCA Tours Interaction Launcher</name>
@@ -59,7 +59,7 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java index b3e0e52f2e..9b66a5c838 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java @@ -21,23 +21,23 @@ package scatours; import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class InteractionLauncher {
public static void main(String[] args) throws Exception {
- SCANode node1 =
- SCANodeFactory.newInstance().createSCANode("client.composite",
+ Node node1 =
+ NodeFactory.getInstance().createNode("client.composite",
locate("common"),
locate("currency"),
locate("calendar"),
locate("shoppingcart"),
locate("interaction-client"));
- SCANode node2 =
- SCANodeFactory.newInstance().createSCANode("service.composite",
+ Node node2 =
+ NodeFactory.getInstance().createNode("service.composite",
locate("common"),
locate("hotel"),
locate("flight"),
@@ -46,22 +46,22 @@ public class InteractionLauncher { node2.start();
node1.start();
- Runnable localInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionLocalClient/Runnable");
+ Runnable localInteraction = ((Node)node1).getService(Runnable.class, "InteractionLocalClient/Runnable");
localInteraction.run();
- Runnable remoteInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionRemoteClient/Runnable");
+ Runnable remoteInteraction = ((Node)node1).getService(Runnable.class, "InteractionRemoteClient/Runnable");
remoteInteraction.run();
Runnable requestResponseInteraction =
- ((SCAClient)node1).getService(Runnable.class, "InteractionRequestResponseClient/Runnable");
+ ((Node)node1).getService(Runnable.class, "InteractionRequestResponseClient/Runnable");
requestResponseInteraction.run();
Runnable onewayCallbackInteraction =
- ((SCAClient)node1).getService(Runnable.class, "InteractionOneWayCallbackClient/Runnable");
+ ((Node)node1).getService(Runnable.class, "InteractionOneWayCallbackClient/Runnable");
onewayCallbackInteraction.run();
Runnable conversationalInteraction =
- ((SCAClient)node1).getService(Runnable.class, "InteractionConversationClient/Runnable");
+ ((Node)node1).getService(Runnable.class, "InteractionConversationClient/Runnable");
conversationalInteraction.run();
node1.stop();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml index 878f27844c..d7dea0d179 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-introducing-client</artifactId>
<name>Apache Tuscany SCA Tours Introducing Client Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java index f261ef6e27..ade9ffad42 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java @@ -19,18 +19,17 @@ package scatours;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class IntroducingClientLauncher {
public static void main(String[] args) throws Exception {
- SCANode node =
- SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ClientNode");
+ Node node =
+ NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/ClientNode");
node.start();
- Runnable client = ((SCAClient)node).getService(Runnable.class, "TestClient/Runnable");
+ Runnable client = node.getService(Runnable.class, "TestClient/Runnable");
client.run();
node.stop();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml index c428b4b87f..817f4409e5 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-introducing-domain</artifactId>
<name>Apache Tuscany SCA Tours Introducing Domain Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml index 1886b977a4..77b8223a8d 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-introducing-tours</artifactId>
<name>Apache Tuscany SCA Tours Introducing Tours Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml index 9cb30beb3f..ccd54dc055 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-introducing-trips</artifactId>
<name>Apache Tuscany SCA Tours Introducing Trips Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml index 98c8627d6c..4294dd2a96 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-introducing</artifactId>
<name>Apache Tuscany SCA Tours Introducing Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java index 4ad19762d9..7008c834b8 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java @@ -21,22 +21,22 @@ package scatours; import static scatours.launcher.LauncherUtil.locate; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; public class IntroducingLauncher { public static void main(String[] args) throws Exception { - SCANode node = - SCANodeFactory.newInstance().createSCANode(null, + Node node = + NodeFactory.getInstance().createNode( locate("introducing-tours"), locate("introducing-trips"), locate("introducing-client")); node.start(); - Runnable proxy = ((SCAClient)node).getService(Runnable.class, "TestClient/Runnable"); + Runnable proxy = ((Node)node).getService(Runnable.class, "TestClient/Runnable"); proxy.run(); node.stop(); diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java index 573d2e76bd..5270cbabe6 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java @@ -18,10 +18,10 @@ */
package scatours;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -33,25 +33,25 @@ import org.junit.Test; */
public class IntroducingTestCase {
- private SCANode node;
+ private Node node;
@Before
public void startServer() throws Exception {
node =
- SCANodeFactory.newInstance()
- .createSCANode(null,
- new SCAContribution("introducing-tours",
+ NodeFactory.getInstance()
+ .createNode(
+ new Contribution("introducing-tours",
"../../contributions/introducing-tours/target/classes"),
- new SCAContribution("introducing-trips",
+ new Contribution("introducing-trips",
"../../contributions/introducing-trips/target/classes"),
- new SCAContribution("introducing-client",
+ new Contribution("introducing-client",
"../../contributions/introducing-client/target/classes"));
node.start();
}
@Test
public void testClient() throws Exception {
- Runnable proxy = ((SCAClient)node).getService(Runnable.class, "TestClient/Runnable");
+ Runnable proxy = ((Node)node).getService(Runnable.class, "TestClient/Runnable");
proxy.run();
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml index 133ed2a0b7..ffc19a754a 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-jumpstart</artifactId>
<name>Apache Tuscany SCA Tours Jump Start Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java index 1ded112193..f478aadae0 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java @@ -21,21 +21,20 @@ package scatours; import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class JumpstartLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution gvtContribution = locate("introducing-trips");
+ Contribution gvtContribution = locate("introducing-trips");
- SCANode node = SCANodeFactory.newInstance().createSCANode("trips.composite", gvtContribution);
+ Node node = NodeFactory.getInstance().createNode("trips.composite", gvtContribution);
node.start();
- Trips tripProvider = ((SCAClient)node).getService(Trips.class, "TripProvider/Trips");
+ Trips tripProvider = node.getService(Trips.class, "TripProvider/Trips");
System.out.println("Trip boooking code = " + tripProvider.checkAvailability("FS1APR4", 1));
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java index a7abf8e08d..32db895bf4 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java @@ -18,7 +18,7 @@ */
package scatours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Trips {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java index 4da7c54917..12654494ac 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java @@ -18,10 +18,10 @@ */
package scatours;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -31,21 +31,21 @@ import org.junit.Test; */
public class JumpstartTestCase {
- private SCANode node;
+ private Node node;
@Before
public void startServer() throws Exception {
node =
- SCANodeFactory.newInstance()
- .createSCANode("trips.composite",
- new SCAContribution("introducing-trips",
+ NodeFactory.getInstance()
+ .createNode("trips.composite",
+ new Contribution("introducing-trips",
"../../contributions/introducing-trips/target/classes"));
node.start();
}
@Test
public void testClient() throws Exception {
- Trips tripProvider = ((SCAClient)node).getService(Trips.class, "TripProvider/Trips");
+ Trips tripProvider = ((Node)node).getService(Trips.class, "TripProvider/Trips");
System.out.println("Trip boooking code = " + tripProvider.checkAvailability("FS1APR4", 2));
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml index ec5957081f..1670a304a4 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-notification-corba</artifactId>
<name>Apache Tuscany SCA Tours Notification CORBA Service Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java index 44b94b3a59..c245dc57fb 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java @@ -21,27 +21,27 @@ package scatours; import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.notification.Notification;
public class NotificationCORBALauncher {
public static void main(String[] args) throws Exception {
- SCAContribution notificationContribution = locate("notification");
- SCAContribution notificationCORBAContribution = locate("notification-corba");
+ Contribution notificationContribution = locate("notification");
+ Contribution notificationCORBAContribution = locate("notification-corba");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("notification-corba.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("notification-corba.composite",
notificationContribution,
notificationCORBAContribution);
node.start();
System.out.println("Quick notification test");
- Notification notification = ((SCAClient)node).getService(Notification.class, "Notification");
+ Notification notification = ((Node)node).getService(Notification.class, "Notification");
String accountID = "1234";
String subject = "Holiday payment taken";
String message = "Payment of £102.37 accepted...";
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml index e5c3d549a9..6f5d074213 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-notification-ejb</artifactId>
<name>Apache Tuscany SCA Tours Notification EJB Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java index 2d843e9ff9..d7b44c9c59 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java @@ -23,10 +23,10 @@ import static scatours.launcher.LauncherUtil.locate; import javax.naming.Context;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.notification.Notification;
@@ -36,17 +36,17 @@ public class NotificationEJBLauncher { System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
System.setProperty(Context.PROVIDER_URL, "ejbd://localhost:4201");
- SCAContribution notificationContribution = locate("notification");
- SCAContribution notificationEJBContribution = locate("notification-ejb");
+ Contribution notificationContribution = locate("notification");
+ Contribution notificationEJBContribution = locate("notification-ejb");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("notification-ejb.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("notification-ejb.composite",
notificationContribution,
notificationEJBContribution);
node.start();
System.out.println("Quick notification test");
- Notification notification = ((SCAClient)node).getService(Notification.class, "Notification");
+ Notification notification = ((Node)node).getService(Notification.class, "Notification");
String accountID = "1234";
String subject = "Holiday payment taken";
String message = "Payment of £102.37 accepted...";
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml index dd0a198622..2413e619b6 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-notification-jms</artifactId>
<name>Apache Tuscany SCA Tours Notification JMS Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java index c2ffda0725..55b0c0830a 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java @@ -21,21 +21,21 @@ package scatours; import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.notification.Notification;
public class NotificationJMSLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution notificationContribution = locate("notification");
- SCAContribution notificationJMSContribution = locate("notification-jms");
+ Contribution notificationContribution = locate("notification");
+ Contribution notificationJMSContribution = locate("notification-jms");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("notification-jms.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("notification-jms.composite",
notificationContribution,
notificationJMSContribution);
@@ -43,7 +43,7 @@ public class NotificationJMSLauncher { node.start();
System.out.println("Quick notification test");
- Notification notification = ((SCAClient)node).getService(Notification.class, "Notification");
+ Notification notification = ((Node)node).getService(Notification.class, "Notification");
String accountID = "1234";
String subject = "Holiday payment taken";
String message = "Payment of £102.37 accepted...";
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml index f6fea913fe..fe3140acb9 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-notification-rmi</artifactId>
<name>Apache Tuscany SCA Tours Notification RMI Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java index 2904349a49..48d229f2f0 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java @@ -21,27 +21,27 @@ package scatours; import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.notification.Notification;
public class NotificationRMILauncher {
public static void main(String[] args) throws Exception {
- SCAContribution notificationContribution = locate("notification");
- SCAContribution notificationRMIContribution = locate("notification-rmi");
+ Contribution notificationContribution = locate("notification");
+ Contribution notificationRMIContribution = locate("notification-rmi");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("notification-rmi.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("notification-rmi.composite",
notificationContribution,
notificationRMIContribution);
node.start();
System.out.println("Quick notification test");
- Notification notification = ((SCAClient)node).getService(Notification.class, "Notification");
+ Notification notification = ((Node)node).getService(Notification.class, "Notification");
String accountID = "1234";
String subject = "Holiday payment taken";
String message = "Payment of £102.37 accepted...";
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml index 4625a6e85c..5e666379f6 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-notification-ws</artifactId>
<name>Apache Tuscany SCA Tours Notification Web Service Launcher</name>
@@ -59,14 +59,14 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java index fbdb1500f5..8957e1ddf0 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java @@ -21,27 +21,27 @@ package scatours; import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.notification.Notification;
public class NotificationWSLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution notificationContribution = locate("notification");
- SCAContribution notificationWSContribution = locate("notification-ws");
+ Contribution notificationContribution = locate("notification");
+ Contribution notificationWSContribution = locate("notification-ws");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("notification-ws.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("notification-ws.composite",
notificationContribution,
notificationWSContribution);
node.start();
System.out.println("Quick notification test");
- Notification notification = ((SCAClient)node).getService(Notification.class, "Notification");
+ Notification notification = ((Node)node).getService(Notification.class, "Notification");
String accountID = "1234";
String subject = "Holiday payment taken";
String message = "Payment of £102.37 accepted...";
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml index 498ee1eb53..a3c6710ec4 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml @@ -22,9 +22,9 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> - </parent><version>1.0-SNAPSHOT</version> + </parent><version>2.0-SNAPSHOT</version> <artifactId>scatours-launcher-payment-bpel</artifactId> <name>Apache Tuscany SCA Tours Payment BPEL Launcher</name> @@ -101,7 +101,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java index 45df91a5e9..2107c6ebcd 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java @@ -21,23 +21,23 @@ package scatours.payment; import static scatours.launcher.LauncherUtil.locate; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import com.tuscanyscatours.payment.Payment; public class PaymentLauncher { public static void main(String[] args) throws Exception { - SCANode node = SCANodeFactory.newInstance().createSCANode(null, + Node node = NodeFactory.getInstance().createNode( locate("payment-bpel-process"), locate("payment-bpel"), locate("creditcard-payment-jaxb"), locate("emailgateway")); node.start(); - SCAClient client = (SCAClient)node; + Node client = (Node)node; Payment payment = client.getService(Payment.class, "Payment/paymentPartnerLink"); System.out.println("Payment BPEL test"); diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml index 3631ee365a..6942fa7307 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml @@ -22,9 +22,9 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> - </parent><version>1.0-SNAPSHOT</version> + </parent><version>2.0-SNAPSHOT</version> <artifactId>scatours-launcher-payment-groovy</artifactId> <name>Apache Tuscany SCA Tours Payment Groovy Launcher</name> @@ -84,7 +84,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java index 8dbf39b514..46edb706fc 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java @@ -21,22 +21,22 @@ package scatours.payment; import static scatours.launcher.LauncherUtil.locate; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import com.tuscanyscatours.payment.Payment; public class PaymentLauncher { public static void main(String[] args) throws Exception { - SCANode node = SCANodeFactory.newInstance().createSCANode(null, + Node node = NodeFactory.getInstance().createNode( locate("payment-groovy"), locate("creditcard-payment-jaxb"), locate("emailgateway")); node.start(); - SCAClient client = (SCAClient)node; + Node client = (Node)node; Payment payment = client.getService(Payment.class, "Payment"); System.out.println("Payment Groovy test"); diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml index 3f6fbe1439..c0177e8afa 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml @@ -22,9 +22,9 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> - </parent><version>1.0-SNAPSHOT</version> + </parent><version>2.0-SNAPSHOT</version> <artifactId>scatours-launcher-payment-java-policy</artifactId> <name>Apache Tuscany SCA Tours Payment Java Policy Launcher</name> @@ -77,7 +77,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java index e5bd98ff2b..cda3ebd091 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java @@ -21,21 +21,21 @@ package scatours.payment; import static scatours.launcher.LauncherUtil.locate; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import com.tuscanyscatours.payment.Payment; public class PaymentLauncher { public static void main(String[] args) throws Exception { - SCANode node = SCANodeFactory.newInstance().createSCANode(null, + Node node = NodeFactory.getInstance().createNode( locate("payment-java-policy"), locate("creditcard-payment-jaxb-policy")); node.start(); - SCAClient client = (SCAClient)node; + Node client = (Node)node; Payment payment = client.getService(Payment.class, "Payment"); System.out.println("Payment Java Policy test"); diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml index f9d5255938..c8889d109a 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml @@ -22,9 +22,9 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> - </parent><version>1.0-SNAPSHOT</version> + </parent><version>2.0-SNAPSHOT</version> <artifactId>scatours-launcher-payment-java</artifactId> <name>Apache Tuscany SCA Tours Payment Java Launcher</name> @@ -77,7 +77,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java index 8d5cc8765d..cc80ec4128 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java @@ -21,21 +21,21 @@ package scatours.payment; import static scatours.launcher.LauncherUtil.locate; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import com.tuscanyscatours.payment.Payment; public class PaymentLauncher { public static void main(String[] args) throws Exception { - SCANode node = SCANodeFactory.newInstance().createSCANode(null, + Node node = NodeFactory.getInstance().createNode( locate("payment-java"), locate("creditcard-payment-jaxb")); node.start(); - SCAClient client = (SCAClient)node; + Node client = (Node)node; Payment payment = client.getService(Payment.class, "Payment"); System.out.println("Payment Java test"); diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml index a03f2d0d51..a4524fc728 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml @@ -22,9 +22,9 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> - </parent><version>1.0-SNAPSHOT</version> + </parent><version>2.0-SNAPSHOT</version> <artifactId>scatours-launcher-payment-spring-scatag</artifactId> <name>Apache Tuscany SCA Tours Payment Spring SCATag Launcher</name> @@ -91,7 +91,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java index 5760fe0d72..7e5d7225e5 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java @@ -21,21 +21,21 @@ package scatours.payment; import static scatours.launcher.LauncherUtil.locate; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import com.tuscanyscatours.payment.Payment; public class PaymentLauncher { public static void main(String[] args) throws Exception { - SCANode node = SCANodeFactory.newInstance().createSCANode(null, + Node node = NodeFactory.getInstance().createNode( locate("payment-spring-scatag"), locate("creditcard-payment-jaxb")); node.start(); - SCAClient client = (SCAClient)node; + Node client = (Node)node; Payment payment = client.getService(Payment.class, "Payment/Payment"); System.out.println("Payment Spring SCATag test"); diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml index c57b5e2e24..23660aa8a5 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml @@ -22,9 +22,9 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> - </parent><version>1.0-SNAPSHOT</version> + </parent><version>2.0-SNAPSHOT</version> <artifactId>scatours-launcher-payment-spring</artifactId> <name>Apache Tuscany SCA Tours Payment Spring Launcher</name> @@ -91,7 +91,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java index 6917b9c57b..d877d55569 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java @@ -21,21 +21,21 @@ package scatours.payment; import static scatours.launcher.LauncherUtil.locate; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import com.tuscanyscatours.payment.Payment; public class PaymentLauncher { public static void main(String[] args) throws Exception { - SCANode node = SCANodeFactory.newInstance().createSCANode(null, + Node node = NodeFactory.getInstance().createNode( locate("payment-spring"), locate("creditcard-payment-jaxb")); node.start(); - SCAClient client = (SCAClient)node; + Node client = (Node)node; Payment payment = client.getService(Payment.class, "Payment/Payment"); System.out.println("Payment Spring test"); diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml index 4ceebd71f7..3adfca89f4 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml @@ -2,7 +2,7 @@ <target name="init"/> <target name="copy-resources" depends="init"> <copy todir="target/classes/META-INF" filtering="true"> - <fileset dir="." includes="LICENSE|NOTICE"/> + <fileset dir="." includes="LICENSE|NOTICE" excludes="**/*.java"/> </copy> </target> </project>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml index bd11cebf24..05964e23dd 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml @@ -22,9 +22,9 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> - </parent><version>1.0-SNAPSHOT</version> + </parent><version>2.0-SNAPSHOT</version> <artifactId>scatours-launcher-policy</artifactId> <name>Apache Tuscany SCA Tours Policy Launcher</name> @@ -52,7 +52,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java index b48c4e88ec..8fc3e92059 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java @@ -21,26 +21,26 @@ package scatours; import static scatours.launcher.LauncherUtil.locate; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; public class PolicyLauncher { public static void main(String[] args) throws Exception { - SCANode node1 = - SCANodeFactory.newInstance().createSCANode(null, + Node node1 = + NodeFactory.getInstance().createNode( locate("policy-client"), locate("payment-java-policy")); node1.start(); - SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, + Node node2 = NodeFactory.getInstance().createNode( locate("creditcard-payment-jaxb-policy")); node2.start(); - Runnable client = ((SCAClient)node1).getService(Runnable.class, "TestClient/Runnable"); + Runnable client = ((Node)node1).getService(Runnable.class, "TestClient/Runnable"); client.run(); node1.stop(); diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml index 3d8738dc86..f0211eafd0 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml @@ -22,10 +22,10 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-launchers</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany SCA Tours Launchers</name>
|