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

14 files changed, 14 insertions, 243 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
diff --git a/sandbox/travelsample/domain/pom.xml b/sandbox/travelsample/domain/pom.xml
deleted file mode 100644
index e081c8a123..0000000000
--- a/sandbox/travelsample/domain/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>1.5-SNAPSHOT</version>
-        <!--relativePath>../../pom.xml</relativePath-->
-    </parent>
-    <artifactId>scatours-domain</artifactId>
-    <name>Apache Tuscany SCA Tours Domain</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency> 
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-       <sourceDirectory>${basedir}/src</sourceDirectory>
-    </build>
-</project>
diff --git a/sandbox/travelsample/gettingstarted/build.xml b/sandbox/travelsample/gettingstarted/build.xml
deleted file mode 100644
index b4fbc726cf..0000000000
--- a/sandbox/travelsample/gettingstarted/build.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project name="gettingstarted" default="compile">
-	<property environment="env"/> 
-	
-    <target name="compile">
-    	<mkdir dir="target/classes"/>
-        <javac srcdir="src" destdir="target/classes" 
-        	           debug="on" source="1.5" target="1.5">
-            <classpath>
-            	<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>   	
-    </target>
-	
-    <target name="run">
-        <java classname="client.CurrencyConverterClient" fork="true">
-            <classpath>
-            	<pathelement path="src"/>
-                <pathelement path="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>     
-    </target> 	
-	
-    <target name="runtrip">
-        <java classname="client.TripClient" fork="true">
-            <classpath>
-            	<pathelement path="src"/>
-                <pathelement path="target/classes"/>
-            	<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </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/src/client/TripWsClient.java b/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java
deleted file mode 100644
index bb9d9cce15..0000000000
--- a/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package client;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-
-import trip.Trip;
-
-/**
- * This shows how to run the CurrencyConverter component.
- */
-public class TripWsClient {
- 
-    public  final static void main(String[] args) throws Exception {
-        SCANode2Factory factory = SCANode2Factory.newInstance();
-        SCANode2 node = factory.createSCANodeFromClassLoader("tripws.composite", 
-                                                             null);
-        node.start();
-        
-        Trip trip = ((SCAClient)node).getService(Trip.class, 
-                                                 "TripComponent");
-
-        System.out.println(trip.getTotalPrice());
-        
-        System.out.println("press enter to continue");
-        System.in.read();        
-
-        node.stop();        
-    }    
-}
diff --git a/sandbox/travelsample/gettingstarted/src/tripws.composite b/sandbox/travelsample/gettingstarted/src/tripws.composite
deleted file mode 100644
index dd399ee92a..0000000000
--- a/sandbox/travelsample/gettingstarted/src/tripws.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://tuscanyscatours"
-           xmlns:sample="http://tuscanyscatours"
-           name="tripws">
-
-    <component name="TripComponent">
-        <implementation.java class="trip.TripImpl"/>
-        <reference name="currencyConverter" target="CurrencyConverterComponent">
-            <binding.ws/>
-        </reference>
-    </component>
-    
-    <component name="CurrencyConverterComponent">
-		<implementation.java class="currencyconverter.CurrencyConverterImpl"/>
-		<service name="CurrencyConverter">
-		    <binding.ws uri="http://localhost:8085/CurrencyConverterComponent"/>
-		</service>
-    </component>
-
-</composite>