rename getting started module. Get rid of unused domain module

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@741619 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 14 insertions, 23 deletions

diff --git a/sandbox/travelsample/domain/build.xml b/sandbox/travelsample/chapter-01/build.xml
index b4fbc726cf..7a4210ab13 100644
--- a/sandbox/travelsample/domain/build.xml
+++ b/sandbox/travelsample/chapter-01/build.xml
@@ -29,7 +29,7 @@
         </javac>   	
     </target>
 	
-    <target name="run">
+    <target name="runcurrencyconverter">
         <java classname="client.CurrencyConverterClient" fork="true">
             <classpath>
             	<pathelement path="src"/>
@@ -48,14 +48,5 @@
             </classpath>
         </java>    	
     </target>	
-	
-    <target name="runtripws">
-        <java classname="client.TripWsClient" fork="true">
-            <classpath>
-            	<pathelement path="src"/>
-                <pathelement path="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>     
-    </target>   	
+	 	
 </project>
diff --git a/sandbox/travelsample/gettingstarted/pom.xml b/sandbox/travelsample/chapter-01/pom.xml
index 0c343a6bcd..64308ea187 100644
--- a/sandbox/travelsample/gettingstarted/pom.xml
+++ b/sandbox/travelsample/chapter-01/pom.xml
@@ -25,8 +25,8 @@
         <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
-    <artifactId>scatours-gettingstarted</artifactId>
-    <name>Apache Tuscany SCA Tours Getting Started</name>
+    <artifactId>scatours-chapter-01</artifactId>
+    <name>Apache Tuscany SCA Tours Chapter 01</name>
 
     <dependencies>
         <dependency>
diff --git a/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java b/sandbox/travelsample/chapter-01/src/client/CurrencyConverterClient.java
index 2eaf621599..df6cdc10e1 100644
--- a/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java
+++ b/sandbox/travelsample/chapter-01/src/client/CurrencyConverterClient.java
@@ -19,10 +19,9 @@
 package client;
 
 import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
 
-import trip.Trip;
 import currencyconverter.CurrencyConverter;
 
 /**
@@ -31,9 +30,9 @@ import currencyconverter.CurrencyConverter;
 public class CurrencyConverterClient {
  
     public  final static void main(String[] args) throws Exception {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCANode2 node = factory.createSCANodeFromClassLoader("currencyconverter.composite", 
-                                                             null);
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        SCANode node = factory.createSCANodeFromClassLoader("currencyconverter.composite", 
+                                                            null);
         node.start();
         
         CurrencyConverter currencyConverter = 
diff --git a/sandbox/travelsample/gettingstarted/src/client/TripClient.java b/sandbox/travelsample/chapter-01/src/client/TripClient.java
index 36616569a4..6cb33b9577 100644
--- a/sandbox/travelsample/gettingstarted/src/client/TripClient.java
+++ b/sandbox/travelsample/chapter-01/src/client/TripClient.java
@@ -19,8 +19,9 @@
 package client;
 
 import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+
 
 import trip.Trip;
 
@@ -30,8 +31,8 @@ import trip.Trip;
 public class TripClient {
  
     public  final static void main(String[] args) throws Exception {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCANode2 node = factory.createSCANodeFromClassLoader("trip.composite", 
+        SCANodeFactory factory = SCANodeFactory.newInstance();
+        SCANode node = factory.createSCANodeFromClassLoader("trip.composite", 
                                                              null);
         node.start();
         
diff --git a/sandbox/travelsample/gettingstarted/src/currencyconverter.composite b/sandbox/travelsample/chapter-01/src/currencyconverter.composite
index 2a37151e08..2a37151e08 100644
--- a/sandbox/travelsample/gettingstarted/src/currencyconverter.composite
+++ b/sandbox/travelsample/chapter-01/src/currencyconverter.composite
diff --git a/sandbox/travelsample/gettingstarted/src/currencyconverter/CurrencyConverter.java b/sandbox/travelsample/chapter-01/src/currencyconverter/CurrencyConverter.java
index 95863271c4..95863271c4 100644
--- a/sandbox/travelsample/gettingstarted/src/currencyconverter/CurrencyConverter.java
+++ b/sandbox/travelsample/chapter-01/src/currencyconverter/CurrencyConverter.java
diff --git a/sandbox/travelsample/gettingstarted/src/currencyconverter/CurrencyConverterImpl.java b/sandbox/travelsample/chapter-01/src/currencyconverter/CurrencyConverterImpl.java
index d5b470ddeb..d5b470ddeb 100644
--- a/sandbox/travelsample/gettingstarted/src/currencyconverter/CurrencyConverterImpl.java
+++ b/sandbox/travelsample/chapter-01/src/currencyconverter/CurrencyConverterImpl.java
diff --git a/sandbox/travelsample/gettingstarted/src/trip.composite b/sandbox/travelsample/chapter-01/src/trip.composite
index 32a3eed4be..32a3eed4be 100644
--- a/sandbox/travelsample/gettingstarted/src/trip.composite
+++ b/sandbox/travelsample/chapter-01/src/trip.composite
diff --git a/sandbox/travelsample/gettingstarted/src/trip/Trip.java b/sandbox/travelsample/chapter-01/src/trip/Trip.java
index c7f930c631..c7f930c631 100644
--- a/sandbox/travelsample/gettingstarted/src/trip/Trip.java
+++ b/sandbox/travelsample/chapter-01/src/trip/Trip.java
diff --git a/sandbox/travelsample/gettingstarted/src/trip/TripImpl.java b/sandbox/travelsample/chapter-01/src/trip/TripImpl.java
index 9fe9fb1834..9fe9fb1834 100644
--- a/sandbox/travelsample/gettingstarted/src/trip/TripImpl.java
+++ b/sandbox/travelsample/chapter-01/src/trip/TripImpl.java