Move redundant modules into contrib

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

15 files changed, 8 insertions, 8 deletions

diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/pom.xml b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/pom.xml
index 21826c81c0..aee48250d6 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-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.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-payment-java-contribution</artifactId>
@@ -32,48 +32,48 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</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.6-SNAPSHOT</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.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-transaction</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>     
         
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/payment/PaymentImpl.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/payment/PaymentImpl.java
index 8c9777fdd4..8c9777fdd4 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/payment/PaymentImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/payment/PaymentImpl.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
index 02918efb6c..02918efb6c 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/Customer.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/Customer.java
index f80a691d96..f80a691d96 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/Customer.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/Customer.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerNotFoundException.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerNotFoundException.java
index ebfb104650..ebfb104650 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerNotFoundException.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerNotFoundException.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistry.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistry.java
index c7c9f11a6c..c7c9f11a6c 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistry.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistry.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java
index 615f0ef1b9..615f0ef1b9 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/customer/CustomerRegistryImpl.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGateway.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGateway.java
index 6c3662b265..6c3662b265 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGateway.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGateway.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
index b5a5debd38..b5a5debd38 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/CreditCardPayment.wsdl
index 7d30a6a395..7d30a6a395 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml
index 7adba24d58..7adba24d58 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/Payment.wsdl
index 2519d7642e..2519d7642e 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/Payment.wsdl
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/Payment.wsdl
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/definitions.xml b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/definitions.xml
index 475d923506..475d923506 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/definitions.xml
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/definitions.xml
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/payment.composite
index 00ea330e79..00ea330e79 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/main/resources/payment.composite
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/main/resources/payment.composite
diff --git a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java
index d88764cfac..d88764cfac 100644
--- a/sandbox/travelsample/shared-contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java