diff options
Diffstat (limited to '')
4 files changed, 20 insertions, 24 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java index ed817a58bb..13dc7428d1 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java @@ -19,7 +19,7 @@ package com.tuscanyscatours.payment.creditcard.impl;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml index ea6bed8e09..f29ddff781 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/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.creditcard" />
<deployable composite="scatours:creditcard" />
+ <export.java package="com.tuscanyscatours.payment.creditcard" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite index db6907cf7e..1e07159fbc 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite @@ -17,17 +17,13 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://tuscanyscatours.com/" - name="creditcard"> - - <component name="CreditCardPayment"> - <implementation.java class="com.tuscanyscatours.payment.creditcard.impl.CreditCardPaymentImpl" /> - <service name="CreditCardPayment"> - <interface.wsdl interface="http://www.tuscanyscatours.com/CreditCardPayment/#wsdl.interface(CreditCardPayment)" /> - <binding.ws uri="http://localhost:8082/CreditCardPayment" /> - <binding.sca/> - </service> - </component> - -</composite> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="creditcard" targetNamespace="http://tuscanyscatours.com/"> + <component name="CreditCardPayment"> + <implementation.java class="com.tuscanyscatours.payment.creditcard.impl.CreditCardPaymentImpl"/> + <service name="CreditCardPayment"> + <interface.wsdl interface="http://www.tuscanyscatours.com/CreditCardPayment/#wsdl.interface(CreditCardPayment)"/> + <binding.ws uri="http://localhost:8082/CreditCardPayment"/> + <binding.sca/> + </service> + </component> +</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java index 65c7beb367..ed3d33af21 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java @@ -19,10 +19,10 @@ package scatours.payment.creditcard;
-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;
@@ -39,7 +39,7 @@ import com.tuscanyscatours.payment.creditcard.PayerType; *
*/
public class CreditCardPaymentTestCase {
- private static SCANode node;
+ private static Node node;
/**
* @throws java.lang.Exception
@@ -48,7 +48,7 @@ public class CreditCardPaymentTestCase { public static void setUpBeforeClass() throws Exception {
try {
node =
- SCANodeFactory.newInstance().createSCANode(null, new SCAContribution("creditcard", "./target/classes"));
+ NodeFactory.getInstance().createNode(new Contribution("creditcard", "./target/classes"));
node.start();
} catch (Exception ex) {
@@ -58,7 +58,7 @@ public class CreditCardPaymentTestCase { @Test
public void testCreditCardPayment() {
- SCAClient client = (SCAClient)node;
+ Node client = (Node)node;
CreditCardPayment cc = client.getService(CreditCardPayment.class, "CreditCardPayment");
ObjectFactory objectFactory = new ObjectFactory();
|