Move the travel sample tutorial from 2.x trunk to contrib as its not in the build, doesn't build, and no one is actively working on it. (and even if they were, i wonder if this should be released seperately like the 1.x version and so not in the trunk tree anyway

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

14 files changed, 0 insertions, 893 deletions

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/build.xml
deleted file mode 100644
index 6ad2ea55ad..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/build.xml
+++ /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.

--->

-

-<project name="scatours-contribution-payment-spring-scatag" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="wsdljava">

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="CreditCardPayment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/creditcard/CreditCardPayment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment.creditcard"/>

-        </antcall>

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="EmailGateway.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/emailgateway/EmailGateway.class"/>

-            <param name="package" value="com.tuscanyscatours.emailgateway"/>

-        </antcall>

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="Payment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/Payment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment"/>

-        </antcall>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml
deleted file mode 100644
index 74aea4b05b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml
+++ /dev/null
@@ -1,189 +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.
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-payment-spring-scatag</artifactId>
-    <name>Apache Tuscany SCA Tours Payment Spring SCA Tag Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!--
-            https://issues.apache.org/jira/browse/TUSCANY-3069
-        -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring-sca</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
-                <executions>
-                    <execution>
-                        <id>payment</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.payment</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>Payment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>payment.creditcard</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.payment.creditcard</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>scatours.emailgateway</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.emailgateway</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>EmailGateway.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/emailgateway.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
deleted file mode 100644
index 5eb825cb85..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
+++ /dev/null
@@ -1,32 +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 com.tuscanyscatours.emailgateway.impl;
-
-import com.tuscanyscatours.emailgateway.EmailGateway;
-import com.tuscanyscatours.emailgateway.EmailType;
-
-public class EmailGatewayImpl implements EmailGateway {
-
-    public String sendEmail(EmailType email) {
-        System.out.println("Sending mail to " + email.getTo());
-        return "SENT";
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
deleted file mode 100644
index 42d995aa88..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
+++ /dev/null
@@ -1,76 +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 com.tuscanyscatours.payment.impl;
-
-import com.tuscanyscatours.emailgateway.EmailGateway;
-import com.tuscanyscatours.emailgateway.EmailType;
-import com.tuscanyscatours.payment.Payment;
-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;
-
-//@Service(Payment.class)
-public class PaymentImpl implements Payment {
-
-    protected CreditCardPayment creditCardPayment;
-    protected EmailGateway emailGateway;
-    protected float transactionFee = 0;
-
-    //@Reference
-    public void setCreditCardPayment(CreditCardPayment creditCardPayment) {
-        this.creditCardPayment = creditCardPayment;
-    }
-
-    public void setEmailGateway(EmailGateway emailGateway) {
-        this.emailGateway = emailGateway;
-    }
-
-    //@Property
-    public void setTransactionFee(Float transactionFee) {
-        this.transactionFee = transactionFee;
-    }
-
-    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 += transactionFee;
-
-        String status = creditCardPayment.authorize(ccDetails, amount);
-
-        com.tuscanyscatours.emailgateway.ObjectFactory emailFactory =
-            new com.tuscanyscatours.emailgateway.ObjectFactory();
-        EmailType email = emailFactory.createEmailType();
-        email.setTitle("Payment Received");
-        email.setTo(customerId);
-
-        emailGateway.sendEmail(email);
-
-        return status;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/CreditCardPayment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index 8224cd126f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/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: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/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/EmailGateway.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/EmailGateway.wsdl
deleted file mode 100644
index 44867f794c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/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:8088/EmailGateway" />

-        </wsdl:port>

-    </wsdl:service>

-    

-    <plnk:partnerLinkType name="EmailGatewayLinkType">

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

-    </plnk:partnerLinkType>

-</wsdl:definitions>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 976e2fc0b6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/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://docs.oasis-open.org/ns/opencsa/sca/200912"

-              xmlns:scatours="http://tuscanyscatours.com/">

-    <deployable composite="scatours:payment" />

-    <export.java package="com.tuscanyscatours.payment"/>

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml
deleted file mode 100644
index d2f757c8ca..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/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://docs.oasis-open.org/ns/opencsa/sca/200912/spring-sca.xsd">
-
-    <sca:service name="Payment"
-                 type="com.tuscanyscatours.payment.Payment" 
-                 target="Payment"/>
-
-    <bean id="Payment" class="com.tuscanyscatours.payment.impl.PaymentImpl">
-        <property name="creditCardPayment" ref="creditCardPayment"/>
-        <property name="emailGateway" ref="EmailGateway"/>
-        <property name="transactionFee" ref="transactionFee"/>
-    </bean>
-
-    <bean id="EmailGateway" class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl">
-    </bean>
-    
-    <sca:reference name="creditCardPayment" 
-                   type="com.tuscanyscatours.payment.creditcard.CreditCardPayment"/>  
-                   
-    <sca:property name="transactionFee"
-                  type="java.lang.Float"/>    
-</beans>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment.wsdl
deleted file mode 100644
index e2c4062f2e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/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/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite
deleted file mode 100644
index 7b923e397e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite
+++ /dev/null
@@ -1,35 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://tuscanyscatours.com/"
-           name="payment">
-
-    <component name="Payment">
-        <implementation.spring location="Payment-context.xml"/>
-        <service name="Payment">
-            <binding.ws uri="http://localhost:8081/Payment"/>
-        </service>
-        <reference name="creditCardPayment">
-            <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
-        </reference>
-        <property name="transactionFee">1.23</property>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java
deleted file mode 100644
index f2a4ecbcb6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java
+++ /dev/null
@@ -1,71 +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;
-
-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;
-
-import com.tuscanyscatours.payment.Payment;
-
-/**
- * 
- */
-public class PaymentTestCase {
-    private static Node paymentNode;
-    private static Node creditCardNode;
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        creditCardNode =
-            NodeFactory.getInstance()
-                .createNode("creditcard.composite",
-                               new Contribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
-
-        creditCardNode.start();
-
-        paymentNode =
-            NodeFactory.getInstance().createNode(
-                                                       new Contribution("payment-spring-annotation",
-                                                                           "./target/classes"),
-                                                       new Contribution("payment-spring-annotation-test",
-                                                                           "./target/test-classes"));
-
-        paymentNode.start();
-    }
-
-    @Test
-    public void testPayment() {
-        Node client = (Node)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();
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
deleted file mode 100644
index 3fee35a1db..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/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 scatours.payment.client.impl;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.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/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index d4b14f7c88..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/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://docs.oasis-open.org/ns/opencsa/sca/200912"

-              xmlns:scatours="http://tuscanyscatours.com/">

-    <deployable composite="scatours:paymentClient" />

-    <import.java package="com.tuscanyscatours.payment"/>

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite
deleted file mode 100644
index b442a46101..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite
+++ /dev/null
@@ -1,31 +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://docs.oasis-open.org/ns/opencsa/sca/200912" 
-           targetNamespace="http://tuscanyscatours.com/" 
-           name="paymentClient">
-           
-    <component name="PaymentClient">
-        <implementation.java class="scatours.payment.client.impl.PaymentClientImpl" />
-        <reference name="payment">
-            <binding.ws uri="http://localhost:8081/Payment" />
-        </reference>
-    </component>   
-
-</composite>