You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2010/03/16 19:08:55 UTC
svn commit: r923913 [6/7] - in /tuscany:
sca-java-1.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/resources/META-INF/
sca-java-2.x/trunk/tutorials/travelsample/
sca-java-2.x/trunk/tutorials/travelsample/clients/ sca-java-2.x/trunk/t...
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java Tue Mar 16 18:08:46 2010
@@ -18,7 +18,7 @@
*/
package scatours.currencyconverter;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The CurrencyConverter service interface
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java Tue Mar 16 18:08:46 2010
@@ -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");
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java Tue Mar 16 18:08:46 2010
@@ -18,7 +18,7 @@
*/
package scatours.currencyconverter;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The CurrencyConverter service interface
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java Tue Mar 16 18:08:46 2010
@@ -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();
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java Tue Mar 16 18:08:46 2010
@@ -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();
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java Tue Mar 16 18:08:46 2010
@@ -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/ ");
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java Tue Mar 16 18:08:46 2010
@@ -23,14 +23,14 @@ import static scatours.launcher.Launcher
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"),
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java Tue Mar 16 18:08:46 2010
@@ -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.");
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java Tue Mar 16 18:08:46 2010
@@ -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();
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java Tue Mar 16 18:08:46 2010
@@ -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();
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java Tue Mar 16 18:08:46 2010
@@ -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();
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java Tue Mar 16 18:08:46 2010
@@ -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();
}
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java Tue Mar 16 18:08:46 2010
@@ -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));
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java Tue Mar 16 18:08:46 2010
@@ -18,7 +18,7 @@
*/
package scatours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Trips {
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java Tue Mar 16 18:08:46 2010
@@ -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));
}
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java Tue Mar 16 18:08:46 2010
@@ -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...";
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java Tue Mar 16 18:08:46 2010
@@ -23,10 +23,10 @@ import static scatours.launcher.Launcher
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...";
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java Tue Mar 16 18:08:46 2010
@@ -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...";
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java Tue Mar 16 18:08:46 2010
@@ -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...";
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java Tue Mar 16 18:08:46 2010
@@ -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...";
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java Tue Mar 16 18:08:46 2010
@@ -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");
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java Tue Mar 16 18:08:46 2010
@@ -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");
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java Tue Mar 16 18:08:46 2010
@@ -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");
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java Tue Mar 16 18:08:46 2010
@@ -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");
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java Tue Mar 16 18:08:46 2010
@@ -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");
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java Tue Mar 16 18:08:46 2010
@@ -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");
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml Tue Mar 16 18:08:46 2010
@@ -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
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java Tue Mar 16 18:08:46 2010
@@ -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();
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>