diff options
author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2009-08-27 01:07:30 +0000 |
---|---|---|
committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2009-08-27 01:07:30 +0000 |
commit | 47d7bf03613dfd6a2db848df57306c0c2b8c2402 (patch) | |
tree | 47d5bc9c7e565ffc5f1a653c2ba2d3cc2df1a940 /sandbox/travelsample/contributions/creditcard-payment-jaxb/src | |
parent | e55e032a7fbf42b17461e4fa4ad729b8f58a0f60 (diff) |
Apply the new naming conventions to the fullapp contributions and launchers
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@808241 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java (renamed from sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java) | 4 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/CreditCardPayment.wsdl (renamed from sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/contributions/fullapp-currency-contribution/src/main/resources/META-INF/sca-contribution.xml) | 48 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite (renamed from sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/creditcard.composite) | 10 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java (renamed from sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java) | 11 |
5 files changed, 40 insertions, 33 deletions
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java index 1f2c1d7043..b9227b1752 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/java/payment/creditcard/CreditCardPaymentImpl.java +++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java @@ -17,8 +17,10 @@ * under the License.
*/
-package payment.creditcard;
+package com.tuscanyscatours.payment.creditcard.impl;
+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
+import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
import org.osoa.sca.annotations.Service;
/**
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/CreditCardPayment.wsdl index 6dcc619c48..6dcc619c48 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl +++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/CreditCardPayment.wsdl diff --git a/sandbox/travelsample/contributions/fullapp-currency-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml index 76427565fc..ea6bed8e09 100644 --- a/sandbox/travelsample/contributions/fullapp-currency-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml @@ -1,24 +1,24 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:scatours="http://scatours"> - <deployable composite="scatours:currency"/> - <import.java package="scatours.currencyconverter"/> -</contribution>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:scatours="http://tuscanyscatours.com/">
+ <export.java package="com.tuscanyscatours.payment.creditcard" />
+ <deployable composite="scatours:creditcard" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/creditcard.composite b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite index e675da0372..db6907cf7e 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/main/resources/creditcard.composite +++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite @@ -18,13 +18,11 @@ * under the License. --> <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://creditcard" - xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" - xmlns:c="http://creditcard" + targetNamespace="http://tuscanyscatours.com/" name="creditcard"> - <component name="CreditCardPaymentComponent"> - <implementation.java class="payment.creditcard.CreditCardPaymentImpl" /> + <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" /> @@ -32,4 +30,4 @@ </service> </component> -</composite>
\ No newline at end of file +</composite> diff --git a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java index 5beca2ddb0..2bb8b3b35c 100644 --- a/sandbox/travelsample/contributions/creditcard-payment-jaxb-contribution/src/test/java/payment/creditcard/CreditCardPaymentTestCase.java +++ b/sandbox/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java @@ -17,7 +17,14 @@ * under the License.
*/
-package payment.creditcard;
+package scatours.payment.creditcard;
+
+import com.tuscanyscatours.payment.creditcard.AuthorizeFault_Exception;
+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
+import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
+import com.tuscanyscatours.payment.creditcard.CreditCardTypeType;
+import com.tuscanyscatours.payment.creditcard.ObjectFactory;
+import com.tuscanyscatours.payment.creditcard.PayerType;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
@@ -52,7 +59,7 @@ public class CreditCardPaymentTestCase { @Test
public void testCreditCardPayment() {
SCAClient client = (SCAClient) node;
- CreditCardPayment cc = client.getService(CreditCardPayment.class, "CreditCardPaymentComponent/CreditCardPayment");
+ CreditCardPayment cc = client.getService(CreditCardPayment.class, "CreditCardPayment");
ObjectFactory objectFactory = new ObjectFactory();
CreditCardDetailsType ccDetails = objectFactory.createCreditCardDetailsType();
|