diff options
Diffstat (limited to '')
9 files changed, 33 insertions, 33 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml index 4bd900239c..4b3b63aa9d 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml @@ -22,10 +22,10 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-payment-bpel-process</artifactId>
<name>Apache Tuscany SCA Tours Payment BPEL Process Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml index f32584eee1..9ce3ed273c 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml @@ -17,6 +17,6 @@ * specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<export namespace="http://www.tuscanyscatours.com/Payment"/>
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml index 3cf859b5eb..d520b6650c 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml @@ -22,10 +22,10 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <version>1.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <artifactId>scatours-contribution-payment-bpel</artifactId> <name>Apache Tuscany SCA Tours Payment BPEL Contribution</name> @@ -77,7 +77,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml index e95a8bf0a3..10d81a42e2 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml @@ -17,8 +17,8 @@ * specific language governing permissions and limitations * under the License. --> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" +<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:pp="http://www.tuscanyscatours.com/Payment"> - <import namespace="http://www.tuscanyscatours.com/Payment"/> <deployable composite="pp:payment"/> + <import namespace="http://www.tuscanyscatours.com/Payment"/> </contribution> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite index 5c337799a7..d4e3fe5fb2 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:pp="http://www.tuscanyscatours.com/Payment" targetNamespace="http://www.tuscanyscatours.com/Payment" diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java index b38f2a9e9c..59fc9ef68c 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java @@ -19,10 +19,10 @@ package scatours.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.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -33,42 +33,42 @@ import com.tuscanyscatours.payment.Payment; * */ public class PaymentTestCase { - private static SCANode paymentNode; - private static SCANode creditCardNode; - private static SCANode emailGatewayNode; + private static Node paymentNode; + private static Node creditCardNode; + private static Node emailGatewayNode; @BeforeClass public static void setUpBeforeClass() throws Exception { creditCardNode = - SCANodeFactory.newInstance() - .createSCANode("creditcard.composite", - new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes")); + NodeFactory.getInstance() + .createNode("creditcard.composite", + new Contribution("creditcard", "../creditcard-payment-jaxb/target/classes")); creditCardNode.start(); emailGatewayNode = - SCANodeFactory.newInstance().createSCANode("emailgateway.composite", - new SCAContribution("emailgateway", + NodeFactory.getInstance().createNode("emailgateway.composite", + new Contribution("emailgateway", "../emailgateway/target/classes"), - new SCAContribution("emailgateway-test", + new Contribution("emailgateway-test", "../emailgateway/target/test-classes")); emailGatewayNode.start(); paymentNode = - SCANodeFactory.newInstance() - .createSCANode(null, - new SCAContribution("payment-bpel-process", + NodeFactory.getInstance() + .createNode( + new Contribution("payment-bpel-process", "../payment-bpel-process/target/classes"), - new SCAContribution("payment-bpel", "./target/classes"), - new SCAContribution("payment-bpel-test", "./target/test-classes")); + new Contribution("payment-bpel", "./target/classes"), + new Contribution("payment-bpel-test", "./target/test-classes")); paymentNode.start(); } @Test public void testPayment() { - SCAClient client = (SCAClient)paymentNode; + Node client = (Node)paymentNode; Payment payment = client.getService(Payment.class, "PaymentClient"); System.out.println("Result = " + payment.makePaymentMember("Fred", 100.00f)); } diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java index a38ba51ac5..3b8d8ad88a 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java @@ -19,8 +19,8 @@ package scatours.payment.client.impl;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.payment.Payment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml index fcfc2d7c61..7112bd3820 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml @@ -17,8 +17,8 @@ * specific language governing permissions and limitations * under the License. --> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" +<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:pp="http://www.tuscanyscatours.com/Payment"> - <import.java package="com.tuscanyscatours.payment" /> <deployable composite="pp:paymentClient" /> + <import.java package="com.tuscanyscatours.payment" /> </contribution> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite index a5110aacff..847c0cab6e 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:pp="http://www.tuscanyscatours.com/Payment" targetNamespace="http://www.tuscanyscatours.com/Payment" |