diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-16 18:08:46 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-16 18:08:46 +0000 |
commit | 3b191c283307dc68e2aaa6faea58f4b3b717e35c (patch) | |
tree | 9f5742cb5dd7be684c73a606077b106e8d23a700 /sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src | |
parent | f31b8fa6a3b9d9d356212670296c60beb468c8e5 (diff) |
Update the travelsample with 2.x namespace/api/dependency (not completed yet)
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@923913 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
7 files changed, 28 insertions, 28 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java index 26926c7764..d0b1736e98 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java @@ -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.creditcard.PayerType; @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>(); diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml index b480cc4aa1..976e2fc0b6 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/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/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/payment.composite index 1e5bae2a2b..48ef93ba2e 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/payment.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/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/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java index 8723c05624..09420600fb 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/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,22 +33,22 @@ 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/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)); } diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java index 4f64b20c4e..3fee35a1db 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/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/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/META-INF/sca-contribution.xml index b5639eb1f9..d4b14f7c88 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/META-INF/sca-contribution.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/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/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/payment-client.composite index 642cebfd1c..b442a46101 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/payment-client.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/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"> |