Move redundant modules into contrib

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

11 files changed, 0 insertions, 645 deletions

diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/payment/PaymentImpl.java b/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/payment/PaymentImpl.java
deleted file mode 100644
index 68e941e138..0000000000
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/payment/PaymentImpl.java
+++ /dev/null
@@ -1,78 +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 payment;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import payment.creditcard.CreditCardDetailsType;
-import payment.creditcard.CreditCardPayment;
-import payment.creditcard.CreditCardTypeType;
-import payment.creditcard.ObjectFactory;
-import payment.creditcard.PayerType;
-import scatours.emailgateway.EmailGateway;
-import scatours.emailgateway.EmailType;
-
-@Service(Payment.class)
-public class PaymentImpl implements Payment {
-
-    protected CreditCardPayment creditCardPayment;
-    protected EmailGateway emailGateway;
-    protected float processingCharge = 0;
-    
-    @Reference
-    public void setCreditCardPayment(CreditCardPayment creditCardPayment) {
-        this.creditCardPayment = creditCardPayment;
-    }
-    
-    public void setEmailGateway(EmailGateway emailGateway) {
-        this.emailGateway = emailGateway;
-    }
-    
-    @Property
-    public void setProcessingCharge(float processingCharge) {
-        this.processingCharge = processingCharge;
-    }
-    
-    public String makePaymentMember(String customerId, float amount) {
-        
-        ObjectFactory objectFactory = new ObjectFactory();
-        CreditCardDetailsType ccDetails = objectFactory.createCreditCardDetailsType();
-        ccDetails.setCreditCardType(CreditCardTypeType.fromValue("Visa"));
-        PayerType ccOwner = objectFactory.createPayerType();
-        ccOwner.setName(customerId);
-        ccDetails.setCardOwner(ccOwner);
-        
-        amount += processingCharge;
-        
-        String status = creditCardPayment.authorize(ccDetails, amount);
-        
-        scatours.emailgateway.ObjectFactory emailFactory = new scatours.emailgateway.ObjectFactory();
-        EmailType email = emailFactory.createEmailType();
-        email.setTitle("Payment Received");
-        email.setTo(customerId);
-        
-        emailGateway.sendEmail(email);
-        
-        return status;
-    }
-
-}
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
deleted file mode 100644
index 644519a5e7..0000000000
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
+++ /dev/null
@@ -1,29 +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.emailgateway;
-
-public class EmailGatewayImpl implements EmailGateway {
-
-    public String sendEmail(EmailType email) {
-        System.out.println("Sending mail to " + email.getTo());
-        return "SENT";
-    }
-
-}
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index dbf89924cc..0000000000
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,116 +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" type="tns:AuthorizeType"/>

-            <xsd:complexType name="AuthorizeType">

-                <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 name="authorizeResponse" type="tns:AuthorizeResponseType"/>

-            <xsd:complexType name="AuthorizeResponseType">

-                <xsd:sequence>

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

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <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:8080/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/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/EmailGateway.wsdl
deleted file mode 100644
index a097d9b7e4..0000000000
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/EmailGateway.wsdl
+++ /dev/null
@@ -1,89 +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="EmailGateway" 
-                  targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/" 
-                  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/EmailGateway/"
-                    xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/">
-                    
-            <xsd:element name="sendEmail" type="tns:SendEmailType"/>
-            <xsd:complexType name="SendEmailType">
-                <xsd:sequence>
-                    <xsd:element name="Email" type="tns:EmailType"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:element name="sendEmailResponse" type="tns:SendEmailResponseType"/>
-            <xsd:complexType name="SendEmailResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:complexType name="EmailType">
-                <xsd:sequence>
-                    <xsd:element name="To" type="xsd:string"/>
-                    <xsd:element name="Title" type="xsd:string"/>
-                    <xsd:element name="Body" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="SendEmailRequest">
-        <wsdl:part name="parameters" element="tns:sendEmail"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="SendEmailResponse">
-        <wsdl:part name="parameters" element="tns:sendEmailResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="EmailGateway">
-        <wsdl:operation name="sendEmail">
-            <wsdl:input message="tns:SendEmailRequest"></wsdl:input>
-            <wsdl:output message="tns:SendEmailResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="EmailGatwayBinding" type="tns:EmailGateway">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="sendEmail">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/EmailGateway/sendEmail" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="EmailGatewayService">
-        <wsdl:port name="EmailGatewayPort" binding="tns:EmailGatwayBinding">
-            <soap:address location="http://localhost:8082/EmailGateway" />
-        </wsdl:port>
-    </wsdl:service>
-    
-    <plnk:partnerLinkType name="EmailGatewayLinkType">
-        <plnk:role name="forward" portType="tns:EmailGateway"/>
-    </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 896b1ceb48..0000000000
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <export.java package="payment"/>
-   <export.java package="scatours.emailgateway"/>
-   <export namespace="http://www.tuscanyscatours.com/Payment/"/>
-</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment-context.xml b/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment-context.xml
deleted file mode 100644
index 6942649d8a..0000000000
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment-context.xml
+++ /dev/null
@@ -1,44 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <sca:service name="Payment"
-                 type="payment.Payment" 
-                 target="Payment"/>
-
-    <bean id="Payment" class="payment.PaymentImpl">
-        <property name="creditCardPayment" ref="creditCardPayment"/>
-        <property name="emailGateway" ref="EmailGateway"/>
-        <property name="processingCharge" ref="processingCharge"/>
-    </bean>
-
-    <bean id="EmailGateway" class="scatours.emailgateway.EmailGatewayImpl">
-    </bean>
-    
-    <sca:reference name="creditCardPayment" 
-                   type="payment.creditcard.CreditCardPayment"/>  
-                   
-    <sca:property name="processingCharge"
-                  type="java.lang.Float"/>    
-</beans>
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment.wsdl
deleted file mode 100644
index e2c4062f2e..0000000000
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment.wsdl
+++ /dev/null
@@ -1,83 +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="Payment" 
-                  targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 
-                  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/Payment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">
-
-            <xsd:complexType name="MakePaymentMemberType">
-                <xsd:sequence>
-                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>                    
-            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
-      
-            <xsd:complexType name="MakePaymentMemberResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
-            
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="MakePaymentMemberRequest">
-        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="MakePaymentMemberResponse">
-        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="Payment">
-        <wsdl:operation name="makePaymentMember">
-            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
-            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="PaymentBinding" type="tns:Payment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="makePaymentMember">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="PaymentService">
-        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
-            <soap:address location="http://localhost:8080/Payment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="PaymentLinkType">
-       <plnk:role name="forward" portType="tns:Payment"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/PaymentTestCase.java
deleted file mode 100644
index 5e47c9075e..0000000000
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/PaymentTestCase.java
+++ /dev/null
@@ -1,73 +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 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.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * 
- */
-public class PaymentTestCase {
-    private static SCANode paymentNode;
-    private static SCANode creditCardNode;
-    private static SCANode emailGatewayNode;    
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {  
-        try {
-            creditCardNode = SCANodeFactory.newInstance().createSCANode("creditcard.composite",
-                new SCAContribution("creditcard", "../../shared-contributions/creditcard-payment-jaxb-contribution/target/classes"),
-                new SCAContribution("creditcard-test", "../../shared-contributions/creditcard-payment-jaxb-contribution/target/test-classes"));        
-            //emailGatewayNode = SCANodeFactory.newInstance().createSCANode("emailgateway.composite", 
-            //    new SCAContribution("creditcard", "../../shared-contributions/emailgateway-contribution/target/classes"),
-            //    new SCAContribution("creditcard-test", "../../shared-contributions/emailgateway-contribution/target/test-classes"));
-            paymentNode = SCANodeFactory.newInstance().createSCANode("payment.composite", 
-                new SCAContribution("payment-spring", "./target/classes"),
-                new SCAContribution("payment-spring-test", "./target/test-classes"));
-    
-            creditCardNode.start();
-            //emailGatewayNode.start();
-            paymentNode.start();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-    
-    @Test
-    public void testPayment() {
-        SCAClient client = (SCAClient) paymentNode;
-        Payment payment = client.getService(Payment.class, "PaymentClient");
-        System.out.println("Result = " + payment.makePaymentMember("Fred", 100.00f));
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        paymentNode.stop();
-        creditCardNode.stop();
-        //emailGatewayNode.stop();
-    }
-
-}
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/client/PaymentClientImpl.java b/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/client/PaymentClientImpl.java
deleted file mode 100644
index 556a699ad8..0000000000
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/client/PaymentClientImpl.java
+++ /dev/null
@@ -1,37 +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 payment.client;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import payment.Payment;
-
-@Service(Payment.class)
-public class PaymentClientImpl implements Payment {
-    @Reference
-    protected Payment payment;
-
-    public String makePaymentMember(String customerId, float amount) {
-        // Delegate the external web service
-        return payment.makePaymentMember(customerId, amount);
-    }
-
-}
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 92de8d375b..0000000000
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="payment"/>
-   <import.java package="scatours.emailgateway"/>
-   <import namespace="http://www.tuscanyscatours.com/Payment/"/>
-</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/payment.composite b/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/payment.composite
deleted file mode 100644
index aeb9a3e413..0000000000
--- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/payment.composite
+++ /dev/null
@@ -1,48 +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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:pp="http://www.tuscanyscatours.com/Payment" 
-           targetNamespace="http://www.tuscanyscatours.com/Payment" 
-           name="payment">
-           
-    <component name="PaymentClient">
-        <implementation.java class="payment.client.PaymentClientImpl" />
-        <reference name="payment">
-            <binding.ws uri="http://localhost:8080/Payment" />
-        </reference>
-    </component>
-    
-    <component name="PaymentComponent">
-        <implementation.spring location="Payment-context.xml"/>
-        <service name="Payment">
-            <interface.wsdl interface="http://www.tuscanyscatours.com/Payment/#wsdl.interface(Payment)" />
-            <binding.ws uri="http://localhost:8080/Payment" wsdlElement="http://www.tuscanyscatours.com/Payment/#wsdl.service(PaymentService)"/>
-        </service>
-        <reference name="creditCardPayment">
-            <binding.ws uri="http://localhost:8081/CreditCardPayment"/>
-        </reference>
-        <!--reference name="emailGateway">
-            <binding.ws uri="http://localhost:8082/EmailGateway"/>
-        </reference-->  
-        <property name="processingCharge">9.73</property>     
-    </component>     
-
-</composite>
\ No newline at end of file