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

5 files changed, 46 insertions, 60 deletions

diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/pom.xml b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/pom.xml
index 283b016065..40e9c62f37 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/pom.xml
@@ -26,7 +26,7 @@
         <!--relativePath>../../pom.xml</relativePath-->

     </parent>

     <artifactId>scatours-creditcard-payment-jaxb-contribution</artifactId>

-    <name>Apache Tuscany SCA Tours Credit Card Payment Contribution</name>

+    <name>Apache Tuscany SCA Tours Credit Card Payment Contribution JAXB</name>

 

     <dependencies>

         <dependency>

diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
index 45d954fcbb..ac556c3518 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb-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:creditcard="http://creditcard">

    <export.java package="payment.creditcard"/>

+   <deployable composite="creditcard:creditcard" />

 </contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/resources/creditcard.composite b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/creditcard.composite
index 21964035ec..df37a189db 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/resources/creditcard.composite
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/creditcard.composite
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * 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.    

--->

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

-           targetNamespace="http://creditcard"

-           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"

-           xmlns:c="http://creditcard" 

-           name="creditcard">

-

-    <component name="CreditCardPaymentComponent">

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

-        <service name="CreditCardPayment">

-            <binding.ws uri="http://localhost:8081/CreditCardPayment" />

-            <binding.sca/>

-        </service>

-    </component>

-    

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+           targetNamespace="http://creditcard"
+           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:c="http://creditcard" 
+           name="creditcard">
+
+    <component name="CreditCardPaymentComponent">
+        <implementation.java class="payment.creditcard.CreditCardPaymentImpl" />
+        <service name="CreditCardPayment">
+            <binding.ws uri="http://localhost:8082/CreditCardPayment" />
+            <binding.sca/>
+        </service>
+    </component>
+    
 </composite>
\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
index 2cbcf08d3a..30fe2ca3da 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java
@@ -20,6 +20,7 @@
 package payment.creditcard;

 

 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;

@@ -38,9 +39,14 @@ public class CreditCardPaymentTestCase {
      */

     @BeforeClass

     public static void setUpBeforeClass() throws Exception {

-        SCANodeFactory factory = SCANodeFactory.newInstance();

-        node = factory.createSCANodeFromClassLoader("creditcard.composite", CreditCardPayment.class.getClassLoader());

-        node.start();

+    	try {

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

+	            new SCAContribution("creditcard", "./target/classes"));

+	

+	        node.start();

+    	} catch (Exception ex) {

+    		ex.printStackTrace();

+    	}

     }

     

     @Test

diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 18c9e05b2a..0000000000
--- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * 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.    

--->

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

-    <import.java package="payment.creditcard"/>

-</contribution>
\ No newline at end of file