You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2010/03/16 19:08:55 UTC
svn commit: r923913 [4/7] - in /tuscany:
sca-java-1.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/resources/META-INF/
sca-java-2.x/trunk/tutorials/travelsample/
sca-java-2.x/trunk/tutorials/travelsample/clients/ sca-java-2.x/trunk/t...
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java Tue Mar 16 18:08:46 2010
@@ -19,7 +19,7 @@
package com.tuscanyscatours.smsgateway;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* A gateway to send SMS messages.
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/resources/META-INF/sca-contribution.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/resources/META-INF/sca-contribution.xml Tue Mar 16 18:08:46 2010
@@ -17,7 +17,7 @@
* 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.java package="com.tuscanyscatours.notification" />
<export.java package="com.tuscanyscatours.notification.impl" />
<export.java package="com.tuscanyscatours.smsgateway" />
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite Tue Mar 16 18:08:46 2010
@@ -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"
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java Tue Mar 16 18:08:46 2010
@@ -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.Payme
*
*/
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));
}
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java Tue Mar 16 18:08:46 2010
@@ -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;
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml Tue Mar 16 18:08:46 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite Tue Mar 16 18:08:46 2010
@@ -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"
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml Tue Mar 16 18:08:46 2010
@@ -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-groovy</artifactId>
<name>Apache Tuscany SCA Tours Payment Groovy Contribution</name>
@@ -59,7 +59,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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml Tue Mar 16 18:08:46 2010
@@ -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:tours="http://tuscanyscatours.com/">
- <export.java package="com.tuscanyscatours.payment" />
<deployable composite="tours:payment" />
+ <export.java package="com.tuscanyscatours.payment" />
</contribution>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.composite?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.composite (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.composite Tue Mar 16 18:08:46 2010
@@ -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"
targetNamespace="http://tuscanyscatours.com/"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java Tue Mar 16 18:08:46 2010
@@ -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;
@@ -34,32 +34,32 @@ import com.tuscanyscatours.payment.Payme
*/
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-groovy", "./target/classes"),
- new SCAContribution("payment-groovy-test",
+ NodeFactory.getInstance().createNode(
+ new Contribution("payment-groovy", "./target/classes"),
+ new Contribution("payment-groovy-test",
"./target/test-classes"));
paymentNode.start();
@@ -67,7 +67,7 @@ public class PaymentTestCase {
@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));
}
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java Tue Mar 16 18:08:46 2010
@@ -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;
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml Tue Mar 16 18:08:46 2010
@@ -17,7 +17,7 @@
* 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:tours="http://tuscanyscatours.com/" >
<deployable composite="tours:paymentClient" />
</contribution>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite Tue Mar 16 18:08:46 2010
@@ -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"
targetNamespace="http://tuscanyscatours.com/"
name="paymentClient">
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/maven-eclipse.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/maven-eclipse.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/maven-eclipse.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/maven-eclipse.xml Tue Mar 16 18:08:46 2010
@@ -2,7 +2,7 @@
<target name="init"/>
<target name="copy-resources" depends="init">
<copy todir="target/classes/META-INF" filtering="true">
- <fileset dir="." includes="LICENSE|NOTICE"/>
+ <fileset dir="." includes="LICENSE|NOTICE" excludes="**/*.java"/>
</copy>
</target>
</project>
\ No newline at end of file
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml Tue Mar 16 18:08:46 2010
@@ -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-java-policy</artifactId>
<name>Apache Tuscany SCA Tours Payment Java Policy Contribution</name>
@@ -52,7 +52,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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java Tue Mar 16 18:08:46 2010
@@ -23,12 +23,12 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Requires;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.EagerInit;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Requires;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.customer.Customer;
import com.tuscanyscatours.customer.CustomerNotFoundException;
@@ -44,7 +44,7 @@ import com.tuscanyscatours.payment.credi
@Service(CustomerRegistry.class)
@Scope("COMPOSITE")
@EagerInit
-@Requires("{http://www.osoa.org/xmlns/sca/1.0}managedTransaction.global")
+@Requires("{http://docs.oasis-open.org/ns/opencsa/sca/200912}managedTransaction.global")
public class CustomerRegistryImpl implements CustomerRegistry {
private volatile static int idGenerator = 0;
private Map<String, Customer> customers = new HashMap<String, Customer>();
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java Tue Mar 16 18:08:46 2010
@@ -19,7 +19,7 @@
package com.tuscanyscatours.emailgateway;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* A gateway to send e-mail
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java Tue Mar 16 18:08:46 2010
@@ -19,7 +19,7 @@
package com.tuscanyscatours.emailgateway.impl;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.emailgateway.EmailGateway;
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java Tue Mar 16 18:08:46 2010
@@ -19,10 +19,10 @@
package com.tuscanyscatours.payment.impl;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Requires;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Requires;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.customer.Customer;
import com.tuscanyscatours.customer.CustomerNotFoundException;
@@ -45,7 +45,7 @@ public class PaymentImpl implements Paym
@Reference
//@Authentication - not supported
- @Requires("{http://www.osoa.org/xmlns/sca/1.0}authentication")
+ @Requires("{http://docs.oasis-open.org/ns/opencsa/sca/200912}authentication")
protected CreditCardPayment creditCardPayment;
@Reference
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/META-INF/sca-contribution.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/META-INF/sca-contribution.xml Tue Mar 16 18:08:46 2010
@@ -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:scatours="http://tuscanyscatours.com/">
- <export.java package="com.tuscanyscatours.payment" />
<deployable composite="scatours:payment" />
+ <export.java package="com.tuscanyscatours.payment" />
</contribution>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/definitions.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/definitions.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/definitions.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/definitions.xml Tue Mar 16 18:08:46 2010
@@ -17,9 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
<!-- Policy Intents Defined by the SCA Runtime -->
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/payment.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/payment.composite?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/payment.composite (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/payment.composite Tue Mar 16 18:08:46 2010
@@ -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"
targetNamespace="http://tuscanyscatours.com/"
name="payment">
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java Tue Mar 16 18:08:46 2010
@@ -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.Ignore;
@@ -31,19 +31,19 @@ import org.junit.Test;
import com.tuscanyscatours.payment.Payment;
public class PaymentTestCase {
- private static SCANode node1;
- private static SCANode node2;
+ private static Node node1;
+ private static Node node2;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
node1 =
- SCANodeFactory.newInstance()
- .createSCANode("payment.composite",
- new SCAContribution("payment", "./target/classes"));
+ NodeFactory.getInstance()
+ .createNode("payment.composite",
+ new Contribution("payment", "./target/classes"));
node2 =
- SCANodeFactory.newInstance()
- .createSCANode("creditcard.composite",
- new SCAContribution("creditcard",
+ NodeFactory.getInstance()
+ .createNode("creditcard.composite",
+ new Contribution("creditcard",
"../../contributions/creditcard-payment-jaxb/target/classes"));
node1.start();
node2.start();
@@ -51,7 +51,7 @@ public class PaymentTestCase {
@Test
public void testPayment() {
- SCAClient client = (SCAClient)node1;
+ Node client = (Node)node1;
Payment payment = client.getService(Payment.class, "Payment");
System.out.println("\n\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml Tue Mar 16 18:08:46 2010
@@ -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-java</artifactId>
<name>Apache Tuscany SCA Tours Payment Java Contribution</name>
@@ -52,7 +52,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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java Tue Mar 16 18:08:46 2010
@@ -23,12 +23,12 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Requires;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.EagerInit;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Requires;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.customer.Customer;
import com.tuscanyscatours.customer.CustomerNotFoundException;
@@ -44,7 +44,7 @@ import com.tuscanyscatours.payment.credi
@Service(CustomerRegistry.class)
@Scope("COMPOSITE")
@EagerInit
-@Requires("{http://www.osoa.org/xmlns/sca/1.0}managedTransaction.global")
+@Requires("{http://docs.oasis-open.org/ns/opencsa/sca/200912}managedTransaction.global")
public class CustomerRegistryImpl implements CustomerRegistry {
private volatile static int idGenerator = 0;
private Map<String, Customer> customers = new HashMap<String, Customer>();
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java Tue Mar 16 18:08:46 2010
@@ -19,7 +19,7 @@
package com.tuscanyscatours.emailgateway;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* A gateway to send e-mail
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java Tue Mar 16 18:08:46 2010
@@ -19,7 +19,7 @@
package com.tuscanyscatours.emailgateway.impl;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.emailgateway.EmailGateway;
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java Tue Mar 16 18:08:46 2010
@@ -19,9 +19,9 @@
package com.tuscanyscatours.payment.impl;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.customer.Customer;
import com.tuscanyscatours.customer.CustomerNotFoundException;
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml Tue Mar 16 18:08:46 2010
@@ -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:scatours="http://tuscanyscatours.com/">
- <export.java package="com.tuscanyscatours.payment" />
<deployable composite="scatours:payment" />
+ <export.java package="com.tuscanyscatours.payment" />
</contribution>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml Tue Mar 16 18:08:46 2010
@@ -17,9 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<!-- Policy Intents Defined by the SCA Runtime -->
<intent name="authorization" constrains="sca:implementation"/>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/payment.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/payment.composite?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/payment.composite (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/payment.composite Tue Mar 16 18:08:46 2010
@@ -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"
targetNamespace="http://tuscanyscatours.com/"
name="payment">
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java Tue Mar 16 18:08:46 2010
@@ -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.Ignore;
@@ -31,22 +31,22 @@ import org.junit.Test;
import com.tuscanyscatours.payment.Payment;
public class PaymentTestCase {
- private static SCANode node;
+ private static Node node;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
node =
- SCANodeFactory.newInstance()
- .createSCANode(null,
- new SCAContribution("payment", "./target/classes"),
- new SCAContribution("creditcard",
+ NodeFactory.getInstance()
+ .createNode(
+ new Contribution("payment", "./target/classes"),
+ new Contribution("creditcard",
"../../contributions/creditcard-payment-jaxb/target/classes"));
node.start();
}
@Test
public void testPayment() {
- SCAClient client = (SCAClient)node;
+ Node client = (Node)node;
Payment payment = client.getService(Payment.class, "Payment");
System.out.println("\n\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml Tue Mar 16 18:08:46 2010
@@ -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-spring-policy</artifactId>
<name>Apache Tuscany SCA Tours Payment Spring Policy Contribution</name>
@@ -52,7 +52,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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java Tue Mar 16 18:08:46 2010
@@ -23,11 +23,11 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.EagerInit;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.customer.Customer;
import com.tuscanyscatours.customer.CustomerNotFoundException;
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/META-INF/sca-contribution.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/META-INF/sca-contribution.xml Tue Mar 16 18:08:46 2010
@@ -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:scatours="http://tuscanyscatours.com/">
- <export.java package="com.tuscanyscatours.payment"/>
<deployable composite="scatours:payment" />
+ <export.java package="com.tuscanyscatours.payment"/>
</contribution>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml Tue Mar 16 18:08:46 2010
@@ -17,9 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
<!-- Policy Sets -->
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite Tue Mar 16 18:08:46 2010
@@ -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"
targetNamespace="http://tuscanyscatours.com/"
name="payment">
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/PaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/PaymentTestCase.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/PaymentTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/PaymentTestCase.java Tue Mar 16 18:08:46 2010
@@ -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,30 +33,30 @@ import com.tuscanyscatours.payment.Payme
*
*/
public class PaymentTestCase {
- private static SCANode paymentNode;
- private static SCANode creditCardNode;
+ private static Node paymentNode;
+ private static Node creditCardNode;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
creditCardNode =
- SCANodeFactory.newInstance()
- .createSCANode("creditcard.composite",
- new SCAContribution("creditcard", "../creditcard-payment-jaxb-policy/target/classes"));
+ NodeFactory.getInstance()
+ .createNode("creditcard.composite",
+ new Contribution("creditcard", "../creditcard-payment-jaxb-policy/target/classes"));
creditCardNode.start();
paymentNode =
- SCANodeFactory.newInstance()
- .createSCANode(null,
- new SCAContribution("payment-spring-policy", "./target/classes"),
- new SCAContribution("payment-spring-policy-test", "./target/test-classes"));
+ NodeFactory.getInstance()
+ .createNode(
+ new Contribution("payment-spring-policy", "./target/classes"),
+ new Contribution("payment-spring-policy-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("c-0", 100.00f));
}
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java Tue Mar 16 18:08:46 2010
@@ -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;
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/META-INF/sca-contribution.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/META-INF/sca-contribution.xml Tue Mar 16 18:08:46 2010
@@ -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:scatours="http://tuscanyscatours.com/">
- <import.java package="com.tuscanyscatours.payment"/>
<deployable composite="scatours:paymentClient" />
+ <import.java package="com.tuscanyscatours.payment"/>
</contribution>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/payment-client.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/payment-client.composite?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/payment-client.composite (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/payment-client.composite Tue Mar 16 18:08:46 2010
@@ -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"
targetNamespace="http://tuscanyscatours.com/"
name="paymentClient">
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml Tue Mar 16 18:08:46 2010
@@ -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-spring-scatag</artifactId>
<name>Apache Tuscany SCA Tours Payment Spring SCA Tag Contribution</name>
@@ -52,7 +52,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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml Tue Mar 16 18:08:46 2010
@@ -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:scatours="http://tuscanyscatours.com/">
- <export.java package="com.tuscanyscatours.payment"/>
<deployable composite="scatours:payment" />
+ <export.java package="com.tuscanyscatours.payment"/>
</contribution>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml Tue Mar 16 18:08:46 2010
@@ -21,7 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:sca="http://www.springframework.org/schema/sca"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
+ http://www.springframework.org/schema/sca http://docs.oasis-open.org/ns/opencsa/sca/200912/spring-sca.xsd">
<sca:service name="Payment"
type="com.tuscanyscatours.payment.Payment"
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite Tue Mar 16 18:08:46 2010
@@ -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"
targetNamespace="http://tuscanyscatours.com/"
name="payment">
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java Tue Mar 16 18:08:46 2010
@@ -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,23 +33,23 @@ import com.tuscanyscatours.payment.Payme
*
*/
public class PaymentTestCase {
- private static SCANode paymentNode;
- private static SCANode creditCardNode;
+ private static Node paymentNode;
+ private static Node creditCardNode;
@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();
paymentNode =
- SCANodeFactory.newInstance().createSCANode(null,
- new SCAContribution("payment-spring-annotation",
+ NodeFactory.getInstance().createNode(
+ new Contribution("payment-spring-annotation",
"./target/classes"),
- new SCAContribution("payment-spring-annotation-test",
+ new Contribution("payment-spring-annotation-test",
"./target/test-classes"));
paymentNode.start();
@@ -57,7 +57,7 @@ public class PaymentTestCase {
@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));
}
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java Tue Mar 16 18:08:46 2010
@@ -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;
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml Tue Mar 16 18:08:46 2010
@@ -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:scatours="http://tuscanyscatours.com/">
- <import.java package="com.tuscanyscatours.payment"/>
<deployable composite="scatours:paymentClient" />
+ <import.java package="com.tuscanyscatours.payment"/>
</contribution>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite Tue Mar 16 18:08:46 2010
@@ -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"
targetNamespace="http://tuscanyscatours.com/"
name="paymentClient">
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml Tue Mar 16 18:08:46 2010
@@ -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-spring</artifactId>
<name>Apache Tuscany SCA Tours Payment Spring Contribution</name>
@@ -52,7 +52,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>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java Tue Mar 16 18:08:46 2010
@@ -23,12 +23,12 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Requires;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.EagerInit;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Requires;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.customer.Customer;
import com.tuscanyscatours.customer.CustomerNotFoundException;
@@ -44,7 +44,7 @@ import com.tuscanyscatours.payment.credi
@Service(CustomerRegistry.class)
@Scope("COMPOSITE")
@EagerInit
-@Requires("{http://www.osoa.org/xmlns/sca/1.0}managedTransaction.global")
+@Requires("{http://docs.oasis-open.org/ns/opencsa/sca/200912}managedTransaction.global")
public class CustomerRegistryImpl implements CustomerRegistry {
private volatile static int idGenerator = 0;
private Map<String, Customer> customers = new HashMap<String, Customer>();
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml Tue Mar 16 18:08:46 2010
@@ -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:scatours="http://tuscanyscatours.com/">
- <export.java package="com.tuscanyscatours.payment"/>
<deployable composite="scatours:payment" />
+ <export.java package="com.tuscanyscatours.payment"/>
</contribution>
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/payment.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/payment.composite?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/payment.composite (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/payment.composite Tue Mar 16 18:08:46 2010
@@ -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"
targetNamespace="http://tuscanyscatours.com/"
name="payment">
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java Tue Mar 16 18:08:46 2010
@@ -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,22 +33,22 @@ import com.tuscanyscatours.payment.Payme
*
*/
public class PaymentTestCase {
- private static SCANode paymentNode;
- private static SCANode creditCardNode;
+ private static Node paymentNode;
+ private static Node creditCardNode;
@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();
paymentNode =
- SCANodeFactory.newInstance().createSCANode(null,
- new SCAContribution("payment-spring", "./target/classes"),
- new SCAContribution("payment-spring-test",
+ NodeFactory.getInstance().createNode(
+ new Contribution("payment-spring", "./target/classes"),
+ new Contribution("payment-spring-test",
"./target/test-classes"));
paymentNode.start();
@@ -56,7 +56,7 @@ public class PaymentTestCase {
@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("c-0", 100.00f));
}
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java Tue Mar 16 18:08:46 2010
@@ -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;
Modified: tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/META-INF/sca-contribution.xml?rev=923913&r1=923912&r2=923913&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/META-INF/sca-contribution.xml Tue Mar 16 18:08:46 2010
@@ -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:scatours="http://tuscanyscatours.com/">
- <import.java package="com.tuscanyscatours.payment"/>
<deployable composite="scatours:paymentClient" />
+ <import.java package="com.tuscanyscatours.payment"/>
</contribution>