activate composites in payment and credit card payment and use the contributions in the databinding sample. Still some problem when running these contributions in full app mode that causes a wire configuration problem.

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

3 files changed, 2 insertions, 19 deletions

diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite
index b0a975c0b7..2a877cff01 100644
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite
@@ -143,25 +143,8 @@
         <service name="ShoppingCart">
         </service>
         <reference name="payment">
-            <binding.ws uri="http://localhost:8080/Payment" />
+            <binding.ws uri="http://localhost:8081/Payment" />
         </reference> 
-    </component>   
-    
-    <!--component name="PaymentComponent">
-        <implementation.java class="payment.PaymentImpl" />
-        <service name="Payment">
-            <binding.ws uri="http://localhost:8080/Payment" />
-        </service>
-        <reference name="creditCardPayment">
-            <binding.ws uri="http://localhost:8080/CreditCardPayment" />
-        </reference>
-    </component>
-    
-    <component name="CreditCardPaymentComponent">
-        <implementation.java class="payment.creditcard.CreditCardPaymentImpl" />
-        <service name="CreditCardPayment">
-            <binding.ws uri="http://localhost:8080/CreditCardPayment" />
-        </service>
-    </component-->     
+    </component>     
 
 </composite>
diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.odg b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.odg
index 8ca8fbf133..8466377374 100644
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.odg
+++ b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.odg
diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.png b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.png
index f68cd84704..563bf4ea91 100644
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.png
+++ b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.png