Reorganize chapter 1 source tree

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

10 files changed, 14 insertions, 8 deletions

diff --git a/sandbox/travelsample/chapter-01/build.xml b/sandbox/travelsample/chapter-01/build.xml
index 7a4210ab13..549f1f740b 100644
--- a/sandbox/travelsample/chapter-01/build.xml
+++ b/sandbox/travelsample/chapter-01/build.xml
@@ -21,7 +21,7 @@
 	
     <target name="compile">
     	<mkdir dir="target/classes"/>
-        <javac srcdir="src" destdir="target/classes" 
+        <javac srcdir="src/main/java" destdir="target/classes" 
         	           debug="on" source="1.5" target="1.5">
             <classpath>
             	<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
@@ -32,7 +32,7 @@
     <target name="runcurrencyconverter">
         <java classname="client.CurrencyConverterClient" fork="true">
             <classpath>
-            	<pathelement path="src"/>
+            	<pathelement path="src/main/resources"/>
                 <pathelement path="target/classes"/>
                 <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
@@ -42,7 +42,7 @@
     <target name="runtrip">
         <java classname="client.TripClient" fork="true">
             <classpath>
-            	<pathelement path="src"/>
+            	<pathelement path="src/main/resources"/>
                 <pathelement path="target/classes"/>
             	<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
diff --git a/sandbox/travelsample/chapter-01/pom.xml b/sandbox/travelsample/chapter-01/pom.xml
index 0bd7127f06..8067ff4cd5 100644
--- a/sandbox/travelsample/chapter-01/pom.xml
+++ b/sandbox/travelsample/chapter-01/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.5-SNAPSHOT</version>
+        <version>1.4</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-chapter-01</artifactId>
@@ -31,29 +31,35 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>1.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>test</scope>
         </dependency> 
 
diff --git a/sandbox/travelsample/chapter-01/src/client/CurrencyConverterClient.java b/sandbox/travelsample/chapter-01/src/main/java/client/CurrencyConverterClient.java
index df6cdc10e1..df6cdc10e1 100644
--- a/sandbox/travelsample/chapter-01/src/client/CurrencyConverterClient.java
+++ b/sandbox/travelsample/chapter-01/src/main/java/client/CurrencyConverterClient.java
diff --git a/sandbox/travelsample/chapter-01/src/client/TripClient.java b/sandbox/travelsample/chapter-01/src/main/java/client/TripClient.java
index 6cb33b9577..6cb33b9577 100644
--- a/sandbox/travelsample/chapter-01/src/client/TripClient.java
+++ b/sandbox/travelsample/chapter-01/src/main/java/client/TripClient.java
diff --git a/sandbox/travelsample/chapter-01/src/currencyconverter/CurrencyConverter.java b/sandbox/travelsample/chapter-01/src/main/java/currencyconverter/CurrencyConverter.java
index 95863271c4..95863271c4 100644
--- a/sandbox/travelsample/chapter-01/src/currencyconverter/CurrencyConverter.java
+++ b/sandbox/travelsample/chapter-01/src/main/java/currencyconverter/CurrencyConverter.java
diff --git a/sandbox/travelsample/chapter-01/src/currencyconverter/CurrencyConverterImpl.java b/sandbox/travelsample/chapter-01/src/main/java/currencyconverter/CurrencyConverterImpl.java
index d5b470ddeb..d5b470ddeb 100644
--- a/sandbox/travelsample/chapter-01/src/currencyconverter/CurrencyConverterImpl.java
+++ b/sandbox/travelsample/chapter-01/src/main/java/currencyconverter/CurrencyConverterImpl.java
diff --git a/sandbox/travelsample/chapter-01/src/trip/Trip.java b/sandbox/travelsample/chapter-01/src/main/java/trip/Trip.java
index c7f930c631..c7f930c631 100644
--- a/sandbox/travelsample/chapter-01/src/trip/Trip.java
+++ b/sandbox/travelsample/chapter-01/src/main/java/trip/Trip.java
diff --git a/sandbox/travelsample/chapter-01/src/trip/TripImpl.java b/sandbox/travelsample/chapter-01/src/main/java/trip/TripImpl.java
index 9fe9fb1834..9fe9fb1834 100644
--- a/sandbox/travelsample/chapter-01/src/trip/TripImpl.java
+++ b/sandbox/travelsample/chapter-01/src/main/java/trip/TripImpl.java
diff --git a/sandbox/travelsample/chapter-01/src/currencyconverter.composite b/sandbox/travelsample/chapter-01/src/main/resources/currencyconverter.composite
index 2a37151e08..2a37151e08 100644
--- a/sandbox/travelsample/chapter-01/src/currencyconverter.composite
+++ b/sandbox/travelsample/chapter-01/src/main/resources/currencyconverter.composite
diff --git a/sandbox/travelsample/chapter-01/src/trip.composite b/sandbox/travelsample/chapter-01/src/main/resources/trip.composite
index 32a3eed4be..32a3eed4be 100644
--- a/sandbox/travelsample/chapter-01/src/trip.composite
+++ b/sandbox/travelsample/chapter-01/src/main/resources/trip.composite