summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-07-26 10:23:02 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2009-07-26 10:23:02 +0000
commitc4b2020602b8d6e32baa392f69da934e04f3cf0b (patch)
tree46bd1bc05c91f320be24409a400e39e73dcea235 /sandbox
parent3facd14020c31532b7684d3d6e493f16964de499 (diff)
Separate out the test client component from the BPEL payment component into distinct composites so that the payment composite can be reused as is
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@797902 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/payment.composite (renamed from sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment.composite)7
-rw-r--r--sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java2
-rw-r--r--sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml4
-rw-r--r--sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment-client.composite33
5 files changed, 40 insertions, 10 deletions
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
index 725c95a2bd..b458868b09 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,9 @@
* 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:pp="http://www.tuscanyscatours.com/Payment" >
<export namespace="http://www.tuscanyscatours.com/Payment"/>
<export namespace="http://www.tuscanyscatours.com/Payment/"/>
+ <deployable composite="pp:payment" />
</contribution> \ No newline at end of file
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment.composite b/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/payment.composite
index 8c3e68bdc5..5c337799a7 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment.composite
+++ b/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/payment.composite
@@ -22,13 +22,6 @@
xmlns:pp="http://www.tuscanyscatours.com/Payment"
targetNamespace="http://www.tuscanyscatours.com/Payment"
name="payment">
-
- <component name="PaymentClient">
- <implementation.java class="scatours.payment.client.PaymentClientImpl" />
- <reference name="payment">
- <binding.ws uri="http://localhost:8080/Payment" />
- </reference>
- </component>
<component name="Payment">
<implementation.bpel process="pp:Payment"/>
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
index 4653d0c181..ffcc08c0c8 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
@@ -50,7 +50,7 @@ public class PaymentTestCase {
emailGatewayNode.start();
- paymentNode = SCANodeFactory.newInstance().createSCANode("payment.composite",
+ paymentNode = SCANodeFactory.newInstance().createSCANode(null,
new SCAContribution("payment-bpel", "./target/classes"),
new SCAContribution("payment-bpel-test", "./target/test-classes"));
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml
index 4984ef0252..86dd694fa9 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,9 @@
* 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:pp="http://www.tuscanyscatours.com/Payment" >
<import namespace="http://www.tuscanyscatours.com/Payment"/>
<import namespace="http://www.tuscanyscatours.com/Payment/"/>
+ <deployable composite="pp:paymentClient" />
</contribution> \ No newline at end of file
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment-client.composite b/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment-client.composite
new file mode 100644
index 0000000000..75001d947b
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment-client.composite
@@ -0,0 +1,33 @@
+<?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"
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:pp="http://www.tuscanyscatours.com/Payment"
+ targetNamespace="http://www.tuscanyscatours.com/Payment"
+ name="paymentClient">
+
+ <component name="PaymentClient">
+ <implementation.java class="scatours.payment.client.PaymentClientImpl" />
+ <reference name="payment">
+ <binding.ws uri="http://localhost:8080/Payment" />
+ </reference>
+ </component>
+
+</composite> \ No newline at end of file