Reorganize chapter 5 source tree

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

5 files changed, 35 insertions, 34 deletions

diff --git a/sandbox/travelsample/chapter-05/node/src/scatours/LaunchNode.java b/sandbox/travelsample/chapter-05/node/src/main/java/scatours/LaunchNode.java
index 61ec7e3a30..61ec7e3a30 100644
--- a/sandbox/travelsample/chapter-05/node/src/scatours/LaunchNode.java
+++ b/sandbox/travelsample/chapter-05/node/src/main/java/scatours/LaunchNode.java
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/build.xml b/sandbox/travelsample/chapter-05/ui-contribution/build.xml
index 0aa96f56de..11d6c40c45 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/build.xml
+++ b/sandbox/travelsample/chapter-05/ui-contribution/build.xml
@@ -57,45 +57,46 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-assembly-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xsd-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-impl-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-java-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-namespace-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-core-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-core-databinding-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-core-spi-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-endpoint-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-extensibility-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-host-embedded-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-node-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-jaxws-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-monitor-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-node-api-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-node-impl-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-extension-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-xsd-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-1.4.jar"/>
+        <include name="tuscany-assembly-xml-1.4.jar"/>
+        <include name="tuscany-assembly-xsd-1.4.jar"/>
+        <include name="tuscany-binding-sca-1.4.jar"/>
+        <include name="tuscany-binding-sca-xml-1.4.jar"/>
+        <include name="tuscany-contribution-1.4.jar"/>
+        <include name="tuscany-contribution-impl-1.4.jar"/>
+        <include name="tuscany-contribution-java-1.4.jar"/>
+        <include name="tuscany-contribution-namespace-1.4.jar"/>
+        <include name="tuscany-contribution-xml-1.4.jar"/>
+        <include name="tuscany-core-1.4.jar"/>
+        <include name="tuscany-core-databinding-1.4.jar"/>
+        <include name="tuscany-core-spi-1.4.jar"/>
+        <include name="tuscany-databinding-1.4.jar"/>
+        <include name="tuscany-databinding-jaxb-1.4.jar"/>
+        <include name="tuscany-definitions-1.4.jar"/>
+        <include name="tuscany-definitions-xml-1.4.jar"/>
+        <include name="tuscany-endpoint-1.4.jar"/>
+        <include name="tuscany-extensibility-1.4.jar"/>
+        <include name="tuscany-host-embedded-1.4.jar"/>
+        <include name="tuscany-implementation-node-1.4.jar"/>
+        <include name="tuscany-interface-1.4.jar"/>
+        <include name="tuscany-interface-java-1.4.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.4.jar"/>
+        <include name="tuscany-interface-java-xml-1.4.jar"/>
+        <include name="tuscany-monitor-1.4.jar"/>
+        <include name="tuscany-node-api-1.4.jar"/>
+        <include name="tuscany-node-impl-1.4.jar"/>
+        <include name="tuscany-policy-1.4.jar"/>
+        <include name="tuscany-policy-xml-1.4.jar"/>
+        <include name="tuscany-sca-api-1.4.jar"/>
+        <include name="tuscany-sca-api-extension-1.4.jar"/>
+        <include name="tuscany-xsd-1.4.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>
         <include name="activation-1.1.jar"/>
         <include name="asm-all-3.1.jar"/>
-        <include name="cglib-nodep-2.2.jar"/>
+        <include name="cglib-nodep-2.1_3.jar"/>
+        <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
         <include name="jaxb-api-2.1.jar"/>
         <include name="jaxb-impl-2.1.7.jar"/>
         <include name="jaxws-api-2.1.jar"/>
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/scatours.composite b/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite
index 53fac26d3e..53fac26d3e 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/scatours.composite
+++ b/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/scatours.html b/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html
index f4206548c0..f4206548c0 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/scatours.html
+++ b/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/style.css b/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/style.css
index 6e17c2747b..6e17c2747b 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/style.css
+++ b/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/style.css