diff options
Diffstat (limited to '')
14 files changed, 57 insertions, 57 deletions
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
|