diff options
Diffstat (limited to '')
9 files changed, 33 insertions, 33 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml index ff241a81b8..4622ddc8a4 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/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-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> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java index 4381029543..147526dfd3 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java @@ -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; diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/META-INF/sca-contribution.xml index 696bf293f3..41677f6601 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/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:scatours="http://tuscanyscatours.com/"> - <export.java package="com.tuscanyscatours.payment"/> <deployable composite="scatours:payment" /> + <export.java package="com.tuscanyscatours.payment"/> </contribution> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml index 0e421d3b83..df29ffc1b7 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml @@ -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 --> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite index 3f5bcfe48d..5ee7ef73b0 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/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" targetNamespace="http://tuscanyscatours.com/" name="payment"> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/PaymentTestCase.java index 0bff419ccd..1c03ef1572 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/PaymentTestCase.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/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,30 +33,30 @@ import com.tuscanyscatours.payment.Payment; * */ 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)); } diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java index 4f64b20c4e..3fee35a1db 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/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-spring-policy/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/META-INF/sca-contribution.xml index c97b6862f4..969a5286cc 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/META-INF/sca-contribution.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/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:scatours="http://tuscanyscatours.com/"> - <import.java package="com.tuscanyscatours.payment"/> <deployable composite="scatours:paymentClient" /> + <import.java package="com.tuscanyscatours.payment"/> </contribution> diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/payment-client.composite index 642cebfd1c..b442a46101 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/payment-client.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/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" targetNamespace="http://tuscanyscatours.com/" name="paymentClient"> |