Reorganize code directories and update pom versions

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

16 files changed, 29 insertions, 27 deletions

diff --git a/sandbox/travelsample/chapter-09/node/pom.xml b/sandbox/travelsample/chapter-09/node/pom.xml
index 6d56f965be..76df04dd32 100644
--- a/sandbox/travelsample/chapter-09/node/pom.xml
+++ b/sandbox/travelsample/chapter-09/node/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-09-node</artifactId>
@@ -32,82 +32,82 @@
             <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</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>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</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>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
        
diff --git a/sandbox/travelsample/chapter-09/node/src/scatours/LaunchNode.java b/sandbox/travelsample/chapter-09/node/src/main/java/scatours/LaunchNode.java
index 777963c13e..777963c13e 100644
--- a/sandbox/travelsample/chapter-09/node/src/scatours/LaunchNode.java
+++ b/sandbox/travelsample/chapter-09/node/src/main/java/scatours/LaunchNode.java
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/pom.xml b/sandbox/travelsample/chapter-09/payment-contribution/pom.xml
index a9754c86f1..c8739eef73 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/pom.xml
+++ b/sandbox/travelsample/chapter-09/payment-contribution/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-09-payment-contribution</artifactId>
@@ -32,34 +32,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</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>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
             <scope>runtime</scope>
         </dependency>
         
@@ -73,6 +73,7 @@
     </dependencies>
     <build>
         <finalName>${artifactId}</finalName>
+        <!--
         <sourceDirectory>${basedir}/src</sourceDirectory>
         <testSourceDirectory>${basedir}/test</testSourceDirectory>
         <resources>
@@ -92,7 +93,8 @@
                     <exclude>**/.*/**</exclude>
                 </excludes>
             </testResource>
-        </testResources>        
+        </testResources>
+        -->
     <plugins>
         <plugin>
             <groupId>org.codehaus.mojo</groupId>
@@ -126,7 +128,7 @@
                     </goals>
                     <configuration>
                         <packageName>payment.creditcard</packageName>
-                        <wsdlDirectory>${basedir}/src/wsdl
+                        <wsdlDirectory>${basedir}/src/main/resources
                         </wsdlDirectory>
                         <wsdlFiles>
                             <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/src/payment/Payment.java b/sandbox/travelsample/chapter-09/payment-contribution/src/main/java/payment/Payment.java
index f1a45cb031..f1a45cb031 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/src/payment/Payment.java
+++ b/sandbox/travelsample/chapter-09/payment-contribution/src/main/java/payment/Payment.java
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/src/payment/PaymentImpl.java b/sandbox/travelsample/chapter-09/payment-contribution/src/main/java/payment/PaymentImpl.java
index aa8f3cd01a..aa8f3cd01a 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/src/payment/PaymentImpl.java
+++ b/sandbox/travelsample/chapter-09/payment-contribution/src/main/java/payment/PaymentImpl.java
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/src/wsdl/CreditCardPayment.wsdl b/sandbox/travelsample/chapter-09/payment-contribution/src/main/resources/CreditCardPayment.wsdl
index b40c341389..b40c341389 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/src/wsdl/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/chapter-09/payment-contribution/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/src/META-INF/sca-contribution.xml b/sandbox/travelsample/chapter-09/payment-contribution/src/main/resources/META-INF/sca-contribution.xml
index d22f4816ab..d22f4816ab 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/src/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/chapter-09/payment-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/test/payment/PaymentTestCase.java b/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/PaymentTestCase.java
index ffdaf73ef8..ffdaf73ef8 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/test/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/PaymentTestCase.java
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/test/payment/creditcard/CreditCardPaymentImpl.java b/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
index 450485e466..450485e466 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/test/payment/creditcard/CreditCardPaymentImpl.java
+++ b/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
diff --git a/sandbox/travelsample/chapter-09/payment-contribution/test/payment.composite b/sandbox/travelsample/chapter-09/payment-contribution/src/test/resources/payment.composite
index 90665e86e0..90665e86e0 100644
--- a/sandbox/travelsample/chapter-09/payment-contribution/test/payment.composite
+++ b/sandbox/travelsample/chapter-09/payment-contribution/src/test/resources/payment.composite
diff --git a/sandbox/travelsample/chapter-09/pom.xml b/sandbox/travelsample/chapter-09/pom.xml
index d10718baa7..21836dd895 100644
--- a/sandbox/travelsample/chapter-09/pom.xml
+++ b/sandbox/travelsample/chapter-09/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4</version>
         <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>tuscany-scatours-chapter-09</artifactId>
diff --git a/sandbox/travelsample/chapter-09/ui-contribution/pom.xml b/sandbox/travelsample/chapter-09/ui-contribution/pom.xml
index 9a66c4d017..2fadc4d53b 100644
--- a/sandbox/travelsample/chapter-09/ui-contribution/pom.xml
+++ b/sandbox/travelsample/chapter-09/ui-contribution/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-09-ui-contribution</artifactId>
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.4</version>
         </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-09/ui-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
index 764030c28e..764030c28e 100644
--- a/sandbox/travelsample/chapter-09/ui-contribution/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-09/ui-contribution/scatours.composite b/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/scatours.composite
index 53fac26d3e..53fac26d3e 100644
--- a/sandbox/travelsample/chapter-09/ui-contribution/scatours.composite
+++ b/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/scatours.composite
diff --git a/sandbox/travelsample/chapter-09/ui-contribution/scatours.html b/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/scatours.html
index f4206548c0..f4206548c0 100644
--- a/sandbox/travelsample/chapter-09/ui-contribution/scatours.html
+++ b/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/scatours.html
diff --git a/sandbox/travelsample/chapter-09/ui-contribution/style.css b/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/style.css
index 6e17c2747b..6e17c2747b 100644
--- a/sandbox/travelsample/chapter-09/ui-contribution/style.css
+++ b/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/style.css