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

4 files changed, 22 insertions, 62 deletions

diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java b/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
deleted file mode 100644
index ab2b114ee9..0000000000
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-

-package payment.creditcard;

-

-import javax.annotation.security.RolesAllowed;

-

-import org.osoa.sca.annotations.Requires;

-import org.osoa.sca.annotations.Service;

-

-@Service(CreditCardPayment.class)

-@Requires("{http://www.osoa.org/xmlns/sca/1.0}authorization")

-@RolesAllowed("Admin")

-public class CreditCardPaymentImpl implements CreditCardPayment {

-

-    public String authorize(CreditCardDetailsType creditCard, float amount) throws AuthorizeFault_Exception {

-        if (creditCard != null) {

-            System.out.println("Checking card: name = " + creditCard.getCardOwner().getName()

-                + " number = "

-                + creditCard.getCreditCardNumber()

-                + " for amount "

-                + amount);

-        } else {

-            System.out.println("Checking card is null");

-            ObjectFactory factory = new ObjectFactory();

-            AuthorizeFault fault = factory.createAuthorizeFault();

-            fault.setErrorCode("001 - Invalid card");

-            AuthorizeFault_Exception ex = new AuthorizeFault_Exception("Invalid card", fault);

-            throw ex;

-        }

-

-        return "OK";

-    }

-}

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
diff --git a/sandbox/travelsample/contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java
index 45c42fadd0..39671b33ca 100644
--- a/sandbox/travelsample/contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contributions/payment-java-contribution/src/test/java/payment/PaymentTestCase.java
@@ -20,6 +20,7 @@
 package payment;

 

 import org.apache.tuscany.sca.node.SCAClient;

+import org.apache.tuscany.sca.node.SCAContribution;

 import org.apache.tuscany.sca.node.SCANode;

 import org.apache.tuscany.sca.node.SCANodeFactory;

 import org.junit.AfterClass;

@@ -37,13 +38,19 @@ public class PaymentTestCase {
      */

     @BeforeClass

     public static void setUpBeforeClass() throws Exception {

-        SCANodeFactory factory = SCANodeFactory.newInstance();

-        node = factory.createSCANodeFromClassLoader("payment.composite", Payment.class.getClassLoader());

-        node.start();

+    	try {

+	        node = SCANodeFactory.newInstance().createSCANode(null, 

+	            new SCAContribution("payment", "./target/classes"),

+	            new SCAContribution("tuscanyscatours", "../../contributions/creditcard-payment-jaxb-contribution/target/classes"));

+	

+	        node.start();

+    	} catch (Exception ex) {

+    		ex.printStackTrace();

+    	}

     }

     

     @Test

-    public void testCreditCardPayment() {

+    public void testPayment() {

         SCAClient client = (SCAClient) node;

         Payment payment = client.getService(Payment.class, "PaymentComponent");

         System.out.println(payment.makePaymentMember("c-0", 100.00f));