Add a spring version of the payment component which has no SCA annotations and uses and internal composition with a local bean to represent the payment and email-gateway wiring. Doesn't quite work yet in the full app as the contribution processing is not picking up the spring context for some reason.

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

18 files changed, 844 insertions, 4 deletions

diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml
index 698ca3ecfb..b051a2572c 100644
--- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -30,9 +30,6 @@
    <import.java package="scatours.travelcatalog"/>
    <import.java package="payment.creditcard"/>
    <import.java package="payment"/>
-   <import.java package="scatours.emailgateway"/>
-   <import.java package="scatours.paymentprocess"/>
    <import.java package="scatours.shoppingcart"/>
    <import.java package="scatours"/>
-   <import namespace="http://www.example.org/PaymentProcess/"/>
 </contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/pom.xml b/sandbox/travelsample/contributions/payment-spring-contribution/pom.xml
new file mode 100644
index 0000000000..cd89efbb42
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/pom.xml
@@ -0,0 +1,173 @@
+<?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>tuscany-sca</artifactId>
+        <version>1.5</version>
+        <!--relativePath>../../pom.xml</relativePath-->
+    </parent>
+    <artifactId>scatours-payment-spring-contribution</artifactId>
+    <name>Apache Tuscany SCA Tours Payment Spring Contribution</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+            <version>1.5</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.5</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>1.5</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring</artifactId>
+            <version>1.5</version>
+            <scope>runtime</scope>
+        </dependency>   
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring-runtime</artifactId>
+            <version>1.5</version>
+            <scope>runtime</scope>
+        </dependency>  
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+    <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.9</version>
+                <executions>
+                    <execution>
+                        <id>payment</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>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>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>scatours.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/sandbox/travelsample/contributions/payment-spring-contribution/src/main/java/payment/PaymentImpl.java b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/java/payment/PaymentImpl.java
new file mode 100644
index 0000000000..48f829ae0f
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/java/payment/PaymentImpl.java
@@ -0,0 +1,64 @@
+/*
+ * 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 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;
+
+public class PaymentImpl implements Payment {
+
+    private CreditCardPayment creditCardPayment;
+    private EmailGateway emailGateway;
+    
+    public void setCreditCardPayment(CreditCardPayment creditCardPayment) {
+        this.creditCardPayment = creditCardPayment;
+    }
+    
+    public void setEmailGateway(EmailGateway emailGateway) {
+        this.emailGateway = emailGateway;
+    }
+    
+    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);
+        
+        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/contributions/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
new file mode 100644
index 0000000000..644519a5e7
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
@@ -0,0 +1,29 @@
+/*
+ * 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/contributions/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl
new file mode 100644
index 0000000000..8224cd126f
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl
@@ -0,0 +1,118 @@
+<?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/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/EmailGateway.wsdl
new file mode 100644
index 0000000000..a097d9b7e4
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/EmailGateway.wsdl
@@ -0,0 +1,89 @@
+<?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/contributions/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..3f466760b0
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              xmlns:scatours="http://scatours">
+   <export.java package="payment"/>
+   <export namespace="http://www.tuscanyscatours.com/Payment/"/>
+   <deployable composite="scatours:payment" />
+</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment-context.xml b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment-context.xml
new file mode 100644
index 0000000000..e786e15d55
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment-context.xml
@@ -0,0 +1,34 @@
+<?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">
+
+    <bean id="Payment" class="payment.PaymentImpl">
+        <property name="creditCardPayment" ref="creditCardPaymentReference"/>
+        <property name="emailGateway" ref="EmailGateway"/>
+    </bean>
+
+    <bean id="EmailGateway" class="scatours.emailgateway.EmailGatewayImpl">
+    </bean>
+  
+</beans>
diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment.wsdl
new file mode 100644
index 0000000000..e2c4062f2e
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment.wsdl
@@ -0,0 +1,83 @@
+<?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/contributions/payment-spring-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite
new file mode 100644
index 0000000000..22087afd29
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite
@@ -0,0 +1,39 @@
+<?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" 
+           targetNamespace="http://scatours"
+           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:c="http://scatours" 
+           name="payment">
+      
+     <component name="PaymentComponent">
+        <implementation.spring location="./Payment-context.xml"/>
+        <service name="Payment">
+            <binding.ws uri="http://localhost:8081/Payment"/>
+        </service>
+        <reference name="creditCardPaymentReference">
+            <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
+        </reference>
+        <!--reference name="emailGateway">
+            <binding.ws uri="http://localhost:8082/EmailGateway"/>
+        </reference-->       
+    </component>     
+    
+</composite>
\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java
new file mode 100644
index 0000000000..e236c00230
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java
@@ -0,0 +1,80 @@
+/*
+ * 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 java.io.IOException;
+
+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", "../creditcard-payment-jaxb-contribution/target/classes"),
+                new SCAContribution("creditcard-test", "../creditcard-payment-jaxb-contribution/target/test-classes"));
+            
+            creditCardNode.start();
+            
+            emailGatewayNode = SCANodeFactory.newInstance().createSCANode("emailgateway.composite", 
+                new SCAContribution("creditcard", "../emailgateway-contribution/target/classes"),
+                new SCAContribution("creditcard-test", "../emailgateway-contribution/target/test-classes"));
+            
+            emailGatewayNode.start();
+            
+            paymentNode = SCANodeFactory.newInstance().createSCANode(null, 
+                new SCAContribution("payment-spring", "./target/classes"),
+                new SCAContribution("payment-spring-test", "./target/test-classes"));
+    
+            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/contributions/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java
new file mode 100644
index 0000000000..556a699ad8
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java
@@ -0,0 +1,37 @@
+/*
+ * 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/contributions/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..3f85e563ed
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              xmlns:payment="http://www.tuscanyscatours.com/Payment">
+   <import namespace="http://www.tuscanyscatours.com/Payment/"/>
+   <deployable composite="payment:paymentClient" />
+</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/payment-client.composite b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/payment-client.composite
new file mode 100644
index 0000000000..14c6a00951
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/test/resources/payment-client.composite
@@ -0,0 +1,33 @@
+<?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="paymentClient">
+           
+    <component name="PaymentClient">
+        <implementation.java class="payment.client.PaymentClientImpl" />
+        <reference name="payment">
+            <binding.ws uri="http://localhost:8081/Payment" />
+        </reference>
+    </component>   
+
+</composite>
\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index 58456a4b39..4842c3c952 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -70,6 +70,7 @@
                 <module>trip-contribution</module>

                 <module>scatours-contribution</module>

                 <module>payment-java-contribution</module>

+                <module>payment-spring-contribution</module>

             </modules>

         </profile>

 

diff --git a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml
index 8599fe70b0..f325b98b4e 100644
--- a/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -19,6 +19,5 @@
 -->

 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">

    <import.java package="scatours.common"/>

-   <import.java package="scatours.paymentprocess"/>

    <export.java package="scatours.shoppingcart"/>

 </contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/pom.xml b/sandbox/travelsample/launchers/fullapp-launcher/pom.xml
index b2104f6291..1f259a9d68 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/fullapp-launcher/pom.xml
@@ -130,6 +130,20 @@
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
             <version>1.5</version>
             <scope>runtime</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring</artifactId>
+            <version>1.5</version>
+            <scope>runtime</scope>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring-runtime</artifactId>
+            <version>1.5</version>
+            <scope>runtime</scope>
         </dependency>        
 
         <dependency>
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java b/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java
index 054061a14b..4ef76d1807 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java
+++ b/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java
@@ -44,6 +44,7 @@ public class LaunchFullAppNode {
 	           new SCAContribution("tripbooking", "../../contributions/tripbooking-contribution/target/classes"),
 	           new SCAContribution("travelcatalog", "../../contributions/travelcatalog-contribution/target/classes"),
 	           new SCAContribution("payment", "../../contributions/payment-java-contribution/target/classes"),
+	           //new SCAContribution("payment", "../../contributions/payment-spring-contribution/target/classes"),
 	           new SCAContribution("creditcard", "../../contributions/creditcard-payment-jaxb-contribution/target/classes"),
 	           new SCAContribution("shoppingcart", "../../contributions/shoppingcart-contribution/target/classes"),
 	           new SCAContribution("scatours", "../../contributions/scatours-contribution/target/classes"),