Reorganize car-contribution, common-contribution and creditcardpayment-contribution

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

13 files changed, 4 insertions, 2 deletions

diff --git a/sandbox/travelsample/shared-contributions/car-contribution/src/scatours/car/CarImpl.java b/sandbox/travelsample/shared-contributions/car-contribution/src/main/java/scatours/car/CarImpl.java
index 059365a9ab..059365a9ab 100644
--- a/sandbox/travelsample/shared-contributions/car-contribution/src/scatours/car/CarImpl.java
+++ b/sandbox/travelsample/shared-contributions/car-contribution/src/main/java/scatours/car/CarImpl.java
diff --git a/sandbox/travelsample/shared-contributions/car-contribution/src/scatours/car/CarInfo.java b/sandbox/travelsample/shared-contributions/car-contribution/src/main/java/scatours/car/CarInfo.java
index 2538c51e09..2538c51e09 100644
--- a/sandbox/travelsample/shared-contributions/car-contribution/src/scatours/car/CarInfo.java
+++ b/sandbox/travelsample/shared-contributions/car-contribution/src/main/java/scatours/car/CarInfo.java
diff --git a/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/Book.java b/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Book.java
index f42db4341b..f42db4341b 100644
--- a/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/Book.java
+++ b/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Book.java
diff --git a/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/Search.java b/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Search.java
index 705753972e..705753972e 100644
--- a/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/Search.java
+++ b/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/Search.java
diff --git a/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/SearchCallback.java b/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/SearchCallback.java
index 4bc88fd623..4bc88fd623 100644
--- a/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/SearchCallback.java
+++ b/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/SearchCallback.java
diff --git a/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/TripItem.java b/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/TripItem.java
index e991668cbc..e991668cbc 100644
--- a/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/TripItem.java
+++ b/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/TripItem.java
diff --git a/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/TripLeg.java b/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/TripLeg.java
index 1af33aa6f9..1af33aa6f9 100644
--- a/sandbox/travelsample/shared-contributions/common-contribution/src/scatours/common/TripLeg.java
+++ b/sandbox/travelsample/shared-contributions/common-contribution/src/main/java/scatours/common/TripLeg.java
diff --git a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/META-INF/sca-contribution.xml
index d22f4816ab..d22f4816ab 100644
--- a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/pom.xml b/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/pom.xml
index 9260c856b9..6a706c0791 100644
--- a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/pom.xml
+++ b/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/pom.xml
@@ -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/shared-contributions/creditcardpayment-contribution/src/payment/creditcard/CreditCardPaymentImpl.java b/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
index 450485e466..450485e466 100644
--- a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/payment/creditcard/CreditCardPaymentImpl.java
+++ b/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
diff --git a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/wsdl/CreditCardPayment.wsdl b/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/main/resources/CreditCardPayment.wsdl
index c194d78982..c194d78982 100644
--- a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/wsdl/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java b/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
index 0c25509ab3..0c25509ab3 100644
--- a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
diff --git a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/test/creditcard.composite b/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/test/resources/creditcard.composite
index d0721a8bae..d0721a8bae 100644
--- a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/test/creditcard.composite
+++ b/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/src/test/resources/creditcard.composite