Contrib holds material that's no longer used in the same. Don't need it in trunk but it's still in the sandbox if you really need anything from here.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@902577 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 0 insertions, 629 deletions

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java b/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java
deleted file mode 100644
index 49e1f6a119..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/CurrencyConverter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*

- * 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.

- */

-package scatours.currency;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The CurrencyConverter service interface

- */

-@Remotable

-public interface CurrencyConverter {

-

-    float getExchangeRate(String fromCurrencyCode, String toCurrencyCode);

-

-    float convert(String fromCurrencyCode, String toCurrencyCode, float amount);

-

-}

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java b/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java
deleted file mode 100644
index 2a3ffc1a1e..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/currency/impl/CurrencyConverterImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*

- * 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.

- */

-package scatours.currency.impl;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.oasisopen.sca.annotation.Service;

-

-import scatours.currency.CurrencyConverter;

-

-/**

- * An implementation of the CurrencyConverter service

- */

-@Service(CurrencyConverter.class)

-public class CurrencyConverterImpl implements CurrencyConverter {

-

-    // currency index

-    private Map<String, Integer> currencyIndex = new HashMap<String, Integer>();

-

-    // exchange rates

-    private final float rates[][] = { {1.00f, 0.50f, 0.66f}, {2.00f, 1.00f, 1.33f}, {1.50f, 0.75f, 1.00f}};

-

-    public CurrencyConverterImpl() {

-        currencyIndex.put("USD", new Integer(0));

-        currencyIndex.put("GBP", new Integer(1));

-        currencyIndex.put("EUR", new Integer(2));

-    }

-

-    public float getExchangeRate(String fromCurrencyCode, String toCurrencyCode) {

-        return rates[currencyIndex.get(fromCurrencyCode).intValue()][currencyIndex.get(toCurrencyCode).intValue()];

-    }

-

-    public float convert(String fromCurrencyCode, String toCurrencyCode, float amount) {

-        float converted = amount * getExchangeRate(fromCurrencyCode, toCurrencyCode);

-        System.out.println(fromCurrencyCode + amount + "=" + toCurrencyCode + converted);

-        return converted;

-    }

-}

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java b/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java
deleted file mode 100644
index 9c7364d4d5..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*

- * 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.

- */

-

-package scatours.payment.creditcard.impl;

-

-import org.osgi.framework.BundleActivator;

-import org.osgi.framework.BundleContext;

-

-import scatours.payment.creditcard.CreditCardPayment;

-

-/**

- *

- */

-public class CreditCardPaymentActivator implements BundleActivator {

-

-    public void start(BundleContext context) throws Exception {

-        System.out.println("[" + context.getBundle().getSymbolicName() + "]: Registering CreditCardPayment service...");

-        context.registerService(CreditCardPayment.class.getName(), new CreditCardPaymentImpl(context), null);

-    }

-

-    public void stop(BundleContext context) throws Exception {

-    }

-

-}

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java b/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java
deleted file mode 100644
index d726b85f9f..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*

- * 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.

- */

-

-package scatours.payment.creditcard.impl;

-

-import java.io.StringWriter;

-import java.util.UUID;

-

-import javax.xml.bind.JAXBContext;

-import javax.xml.bind.JAXBElement;

-import javax.xml.bind.JAXBException;

-import javax.xml.bind.Marshaller;

-import javax.xml.bind.PropertyException;

-import javax.xml.namespace.QName;

-

-import org.osgi.framework.BundleContext;

-import org.osgi.framework.ServiceReference;

-

-import scatours.currency.CurrencyConverter;

-import scatours.payment.creditcard.CreditCardDetailsType;

-import scatours.payment.creditcard.CreditCardPayment;

-

-public class CreditCardPaymentImpl implements CreditCardPayment {

-    private BundleContext context;

-

-    public CreditCardPaymentImpl(BundleContext context) {

-        super();

-        this.context = context;

-    }

-

-    public String authorize(CreditCardDetailsType creditCard, float amount) {

-        float charge = amount;

-        if (creditCard != null) {

-            try {

-                print(creditCard);

-            } catch (Exception e) {

-                e.printStackTrace();

-            }

-

-            System.out.println("Credit card: name = " + creditCard.getCardOwner().getName()

-                + " number = "

-                + creditCard.getCreditCardNumber()

-                + " for amount "

-                + amount

-                + " EUR");

-            charge = convertCurrency(amount);

-        } else {

-            System.out.println("Credit card is null");

-            return "FAILURE: Invalid Credit Card Number";

-        }

-

-        return "SUCCESS: Auth Code=" + UUID.randomUUID() + " (EUR" + amount + "->USD" + charge + ")";

-    }

-

-    private void print(CreditCardDetailsType creditCard) throws JAXBException, PropertyException {

-        JAXBContext context = JAXBContext.newInstance(CreditCardDetailsType.class);

-        QName name = new QName("http://ns1", "creditCard");

-        JAXBElement<Object> element = new JAXBElement<Object>(name, Object.class, creditCard);

-        StringWriter writer = new StringWriter();

-        Marshaller marshaller = context.createMarshaller();

-        marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);

-        marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);

-        context.createMarshaller().marshal(element, writer);

-        writer.flush();

-        System.out.println("[CreditCard]: ");

-        System.out.println(writer.toString());

-    }

-

-    private float convertCurrency(float amount) {

-        ServiceReference ref = context.getServiceReference(CurrencyConverter.class.getName());

-        if (ref != null) {

-            CurrencyConverter converter = (CurrencyConverter)context.getService(ref);

-            if (converter != null) {

-                amount = converter.convert("EUR", "USD", amount);

-                context.ungetService(ref);

-                return amount;

-            }

-        }

-        throw new IllegalArgumentException("Currency cannot be converted");

-    }

-}

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/resources/CreditCardPayment.wsdl b/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index d50a63ac42..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.

--->

-<wsdl:definitions name="CreditCardPayment"

-                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"

-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

-                  xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

-                  xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">

-    <wsdl:types>

-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

-                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">

-

-            <xsd:element name="authorize">

-                <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>

-                        <xsd:element name="Amount" type="xsd:float"></xsd:element>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-

-            <xsd:element name="authorizeResponse">

-                <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="Status" type="xsd:string"></xsd:element>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-

-            <xsd:complexType name="CreditCardDetailsType">

-                <xsd:sequence>

-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />

-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />

-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />

-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />

-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />

-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:simpleType name="CreditCardTypeType">

-                <xsd:restriction base="xsd:token">

-                    <xsd:enumeration value="Visa" />

-                    <xsd:enumeration value="MasterCard" />

-                    <xsd:enumeration value="Discover" />

-                    <xsd:enumeration value="Amex" />

-                </xsd:restriction>

-            </xsd:simpleType>

-            <xsd:complexType name="PayerType">

-                <xsd:sequence>

-                    <xsd:element name="Name" type="xsd:string" />

-                    <xsd:element name="Address" type="tns:AddressType" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:complexType name="AddressType">

-                <xsd:sequence>

-                    <xsd:element name="Street" type="xsd:string" />

-                    <xsd:element name="City" type="xsd:string" />

-                    <xsd:element name="State" type="xsd:string" />

-                    <xsd:element name="ZipCode" type="xsd:string" />

-                    <xsd:element name="HomePhone" type="xsd:string" />

-                </xsd:sequence>

-            </xsd:complexType>

-        </xsd:schema>

-    </wsdl:types>

-    <wsdl:message name="AuthorizeRequest">

-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="AuthorizeResponse">

-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>

-    </wsdl:message>

-    <wsdl:portType name="CreditCardPayment">

-        <wsdl:operation name="authorize">

-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>

-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>

-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">

-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-        <wsdl:operation name="authorize">

-            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="CreditCardPaymentService">

-        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">

-            <soap:address location="http://localhost:8082/CreditCardPayment" />

-        </wsdl:port>

-    </wsdl:service>

-

-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">

-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>

-    </plnk:partnerLinkType>

-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentClient.java b/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentClient.java
deleted file mode 100644
index d41571f679..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentClient.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*

- * 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.

- */

-

-package scatours.payment.creditcard.test;

-

-import scatours.payment.creditcard.CreditCardDetailsType;

-import scatours.payment.creditcard.CreditCardPayment;

-import scatours.payment.creditcard.CreditCardPaymentService;

-import scatours.payment.creditcard.CreditCardTypeType;

-import scatours.payment.creditcard.ObjectFactory;

-import scatours.payment.creditcard.PayerType;

-

-/**

- *

- */

-public class CreditCardPaymentClient {

-    static String invoke() {

-        CreditCardPaymentService service = new CreditCardPaymentService();

-        ObjectFactory objectFactory = new ObjectFactory();

-        CreditCardDetailsType ccDetails = objectFactory.createCreditCardDetailsType();

-        ccDetails.setCreditCardType(CreditCardTypeType.fromValue("Visa"));

-        ccDetails.setCreditCardNumber("1234-5678-1234-5678");

-        ccDetails.setCVV2("123");

-        ccDetails.setExpMonth(12);

-        ccDetails.setExpYear(2011);

-        PayerType ccOwner = objectFactory.createPayerType();

-        ccOwner.setName("Fred");

-        ccDetails.setCardOwner(ccOwner);

-        CreditCardPayment cc = service.getCreditCardPaymentPort();

-        String status = cc.authorize(ccDetails, 100.00f);

-        System.out.println("Status of the transaction: " + status);

-        return status;

-    }

-

-    public static void main(String[] args) {

-        invoke();

-    }

-}

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentOSGiTestCase.java b/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentOSGiTestCase.java
deleted file mode 100644
index 98c1fced9d..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/CreditCardPaymentOSGiTestCase.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*

- * 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.

- */

-

-package scatours.payment.creditcard.test;

-

-import static scatours.payment.creditcard.test.OSGiTestUtils.bundleStatus;

-

-import java.io.InputStream;

-import java.io.InputStreamReader;

-import java.io.Reader;

-import java.net.URL;

-

-import org.apache.tuscany.sca.node.equinox.launcher.EquinoxHost;

-import org.junit.AfterClass;

-import org.junit.Assert;

-import org.junit.BeforeClass;

-import org.junit.Test;

-import org.osgi.framework.Bundle;

-import org.osgi.framework.BundleContext;

-import org.osgi.framework.Constants;

-

-/**

- *

- */

-public class CreditCardPaymentOSGiTestCase {

-    private static EquinoxHost host;

-    private static BundleContext context;

-    private static Bundle ccBundle;

-

-    /**

-     * @throws java.lang.Exception

-     */

-    @BeforeClass

-    public static void setUpBeforeClass() throws Exception {

-        try {

-            host = new EquinoxHost();

-            context = host.start();

-

-            for (Bundle b : context.getBundles()) {

-                System.out.println(b);

-                if (b.getSymbolicName().equals("org.eclipse.equinox.ds") || b.getSymbolicName()

-                    .startsWith("org.apache.tuscany.sca.")) {

-                    try {

-                        if (b.getHeaders().get(Constants.FRAGMENT_HOST) == null) {

-                            // Start the non-fragment bundle

-                            b.start();

-                        }

-                    } catch (Exception e) {

-                        e.printStackTrace();

-                    }

-                    System.out.println(bundleStatus(b, false));

-                }

-                if ("scatours.creditcard.payment".equals(b.getSymbolicName())) {

-                    ccBundle = b;

-                }

-            }

-

-            if (ccBundle != null) {

-                ccBundle.start();

-                System.out.println(bundleStatus(ccBundle, false));

-            }

-

-        } catch (Exception e) {

-            e.printStackTrace();

-            throw e;

-        }

-    }

-

-    @Test

-    // @Ignore("Now we use the testClient")

-    public void testWS() throws Exception {

-        URL url = new URL("http://localhost:8082/CreditCardPayment?wsdl");

-        InputStream is = url.openStream();

-        Reader reader = new InputStreamReader(is);

-        char[] content = new char[10240]; // 10k

-        int len = 0;

-        while (true) {

-            int size = reader.read(content, len, content.length - len);

-            if (size < 0) {

-                break;

-            }

-            len += size;

-        }

-        Assert.assertTrue(len > 0);

-        String str = new String(content, 0, len);

-        System.out.println(str);

-        Assert.assertTrue(str.indexOf("<wsdl:definitions") != -1);

-    }

-

-    /**

-     * Test the Web service exposed by the Calculator

-     */

-    @Test

-    public void testClient() {

-        String status = CreditCardPaymentClient.invoke();

-        Assert.assertTrue(status.startsWith("SUCCESS"));

-    }

-

-    /**

-     * @throws java.lang.Exception

-     */

-    @AfterClass

-    public static void tearDownAfterClass() throws Exception {

-        if (host != null) {

-            host.stop();

-            host = null;

-            context = null;

-        }

-    }

-

-}

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/OSGiTestUtils.java b/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/OSGiTestUtils.java
deleted file mode 100644
index de8a77a818..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/contrib/2.x/creditcard-payment-dosgi-contribution/src/test/java/scatours/payment/creditcard/test/OSGiTestUtils.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*

- * 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.

- */

-

-package scatours.payment.creditcard.test;

-

-import java.lang.reflect.InvocationHandler;

-import java.lang.reflect.Method;

-import java.lang.reflect.Proxy;

-

-import org.osgi.framework.Bundle;

-

-/**

- *

- * Utility class to create OSGi bundles

- *

- * @version $Rev: 758877 $ $Date: 2009-03-26 14:51:19 -0700 (Thu, 26 Mar 2009) $

- */

-public class OSGiTestUtils {

-    private static class InvocationHandlerImpl implements InvocationHandler {

-        private Object instance;

-

-        public InvocationHandlerImpl(Object instance) {

-            super();

-            this.instance = instance;

-        }

-

-        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {

-            Method m = instance.getClass().getMethod(method.getName(), method.getParameterTypes());

-            return m.invoke(instance, args);

-        }

-

-    }

-

-    /**

-     * Returns a string representation of the given bundle.

-     *

-     * @param b

-     * @param verbose

-     * @return

-     */

-    public static String bundleStatus(Bundle bundle, boolean verbose) {

-        StringBuffer sb = new StringBuffer();

-        sb.append(bundle.getBundleId()).append(" ").append(bundle.getSymbolicName());

-        int s = bundle.getState();

-        if ((s & Bundle.UNINSTALLED) != 0) {

-            sb.append(" UNINSTALLED");

-        }

-        if ((s & Bundle.INSTALLED) != 0) {

-            sb.append(" INSTALLED");

-        }

-        if ((s & Bundle.RESOLVED) != 0) {

-            sb.append(" RESOLVED");

-        }

-        if ((s & Bundle.STARTING) != 0) {

-            sb.append(" STARTING");

-        }

-        if ((s & Bundle.STOPPING) != 0) {

-            sb.append(" STOPPING");

-        }

-        if ((s & Bundle.ACTIVE) != 0) {

-            sb.append(" ACTIVE");

-        }

-

-        if (verbose) {

-            sb.append(" ").append(bundle.getLocation());

-            sb.append(" ").append(bundle.getHeaders());

-        }

-        return sb.toString();

-    }

-

-    /**

-     * A utility to cast the object to the given interface. If the class for the object

-     * is loaded by a different classloader, a proxy will be created.

-     *

-     * @param <T>

-     * @param obj

-     * @param cls

-     * @return

-     */

-    public static <T> T cast(Object obj, Class<T> cls) {

-        if (cls.isInstance(obj)) {

-            return cls.cast(obj);

-        } else {

-            return cls.cast(Proxy.newProxyInstance(cls.getClassLoader(),

-                                                   new Class<?>[] {cls},

-                                                   new InvocationHandlerImpl(obj)));

-        }

-    }

-}