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

2 files changed, 11 insertions, 8 deletions

diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml
index d3de0083f7..12b9852bf0 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -17,6 +17,8 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">

+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

+              xmlns:scatours="http://scatours">

    <export.java package="payment"/>

+   <deployable composite="scatours:payment" />

 </contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/payment.composite
index a3eb5c79cd..53fcefc241 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/payment.composite
+++ b/sandbox/travelsample/contributions/payment-java-contribution/src/main/resources/payment.composite
@@ -25,22 +25,23 @@
            

     <component name="PaymentComponent">

         <implementation.java class="payment.PaymentImpl" />

+        <service name="Payment">

+           <binding.ws uri="http://localhost:8081/Payment"/>

+        </service>

         <reference name="customerRegistry" target="CustomerRegistryComponent"/>

-        <reference name="creditCardPayment" target="CreditCardPaymentComponent"/>

+        <reference name="creditCardPayment">

+            <binding.ws uri="http://localhost:8082/CreditCardPayment"/>

+        </reference>

         <reference name="emailGateway" target="EmailGatewayComponent"/>

         <property name="transactionFeeRate">0.02</property>

     </component>

-    

+        

     <component name="CustomerRegistryComponent">

         <implementation.java class="scatours.customer.CustomerRegistryImpl" />

     </component>

-    

+            

     <component name="EmailGatewayComponent">

         <implementation.java class="scatours.emailgateway.EmailGatewayImpl" />

     </component>    

     

-    <component name="CreditCardPaymentComponent">

-        <implementation.java class="payment.creditcard.CreditCardPaymentImpl" />

-    </component>

-    

 </composite>
\ No newline at end of file