14 files changed, 211 insertions, 202 deletions
diff --git a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/pom.xml b/sandbox/travelsample/contributions/payment-spring-scatag/pom.xml
index 74c6a0cf09..c1038b32f4 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/payment-spring-scatag/pom.xml
@@ -7,25 +7,26 @@
     * 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.    
+    * under the License.
 -->
 <project>
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.5-SNAPSHOT</version>
+        <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
-    <artifactId>scatours-payment-spring-scatag-contribution</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <artifactId>scatours-contribution-payment-spring-scatag</artifactId>
     <name>Apache Tuscany SCA Tours Payment Spring SCA Tag Contribution</name>
 
     <dependencies>
@@ -62,21 +63,24 @@
             <version>1.6-SNAPSHOT</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>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
-        </dependency>     
-        
+        </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
             <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
-        </dependency>  
-        
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -85,6 +89,18 @@
         </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>
@@ -110,7 +126,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.9</version>
+                <version>1.12</version>
                 <executions>
                     <execution>
                         <id>payment</id>
@@ -119,17 +135,17 @@
                             <goal>wsimport</goal>
                         </goals>
                         <configuration>
-                            <packageName>payment</packageName>
+                            <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> 
+                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>
                             <verbose>false</verbose>
                             <xnocompile>true</xnocompile>
                         </configuration>
-                    </execution> 
+                    </execution>
                     <execution>
                         <id>payment.creditcard</id>
                         <phase>process-sources</phase>
@@ -137,7 +153,7 @@
                             <goal>wsimport</goal>
                         </goals>
                         <configuration>
-                            <packageName>payment.creditcard</packageName>
+                            <packageName>com.tuscanyscatours.payment.creditcard</packageName>
                             <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
                             <wsdlFiles>
                                 <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
@@ -147,7 +163,7 @@
                             <verbose>false</verbose>
                             <xnocompile>true</xnocompile>
                         </configuration>
-                    </execution> 
+                    </execution>
                     <execution>
                         <id>scatours.emailgateway</id>
                         <phase>process-sources</phase>
@@ -155,7 +171,7 @@
                             <goal>wsimport</goal>
                         </goals>
                         <configuration>
-                            <packageName>scatours.emailgateway</packageName>
+                            <packageName>com.tuscanyscatours.emailgateway</packageName>
                             <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
                             <wsdlFiles>
                                 <wsdlFile>EmailGateway.wsdl</wsdlFile>
@@ -165,9 +181,9 @@
                             <verbose>false</verbose>
                             <xnocompile>true</xnocompile>
                         </configuration>
-                    </execution> 
+                    </execution>
                 </executions>
-            </plugin>      
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
index 644519a5e7..5eb825cb85 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
+++ b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
@@ -17,7 +17,10 @@
  * under the License.    
  */
 
-package scatours.emailgateway;
+package com.tuscanyscatours.emailgateway.impl;
+
+import com.tuscanyscatours.emailgateway.EmailGateway;
+import com.tuscanyscatours.emailgateway.EmailType;
 
 public class EmailGatewayImpl implements EmailGateway {
 
diff --git a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/java/payment/PaymentImpl.java b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
index 0ff32a429d..a18dae7f93 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/java/payment/PaymentImpl.java
+++ b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
@@ -17,15 +17,16 @@
  * under the License.    
  */
 
-package payment;
+package com.tuscanyscatours.payment.impl;
 
-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;
+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 {
@@ -61,7 +62,7 @@ public class PaymentImpl implements Payment {
         
         String status = creditCardPayment.authorize(ccDetails, amount);
         
-        scatours.emailgateway.ObjectFactory emailFactory = new scatours.emailgateway.ObjectFactory();
+        com.tuscanyscatours.emailgateway.ObjectFactory emailFactory = new com.tuscanyscatours.emailgateway.ObjectFactory();
         EmailType email = emailFactory.createEmailType();
         email.setTitle("Payment Received");
         email.setTo(customerId);
diff --git a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/CreditCardPayment.wsdl
index 8224cd126f..8224cd126f 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/EmailGateway.wsdl
index 9e9a6ea685..44867f794c 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/EmailGateway.wsdl
+++ b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/EmailGateway.wsdl
@@ -1,89 +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:8088/EmailGateway" />
-        </wsdl:port>
-    </wsdl:service>
-    
-    <plnk:partnerLinkType name="EmailGatewayLinkType">
-        <plnk:role name="forward" portType="tns:EmailGateway"/>
-    </plnk:partnerLinkType>
-</wsdl:definitions>
+<?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/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml
index 3f466760b0..b480cc4aa1 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml
@@ -1,25 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              xmlns:scatours="http://scatours">
-   <export.java package="payment"/>
-   <export namespace="http://www.tuscanyscatours.com/Payment/"/>
-   <deployable composite="scatours:payment" />
-</contribution>
-\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              xmlns:scatours="http://tuscanyscatours.com/">
+    <export.java package="com.tuscanyscatours.payment"/>
+    <deployable composite="scatours:payment" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/Payment-context.xml b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml
index 74cc43d7b8..83776cde1b 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/Payment-context.xml
+++ b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml
@@ -24,20 +24,20 @@
                            http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
 
     <sca:service name="Payment"
-                 type="payment.Payment" 
+                 type="com.tuscanyscatours.payment.Payment" 
                  target="Payment"/>
 
-    <bean id="Payment" class="payment.PaymentImpl">
+    <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="scatours.emailgateway.EmailGatewayImpl">
+    <bean id="EmailGateway" class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl">
     </bean>
     
     <sca:reference name="creditCardPayment" 
-                   type="payment.creditcard.CreditCardPayment"/>  
+                   type="com.tuscanyscatours.payment.creditcard.CreditCardPayment"/>  
                    
     <sca:property name="transactionFee"
                   type="java.lang.Float"/>    
diff --git a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment.wsdl
index e2c4062f2e..e2c4062f2e 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/Payment.wsdl
+++ b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment.wsdl
diff --git a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite
index b864c43931..639f1e5662 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/main/resources/payment.composite
+++ b/sandbox/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite
@@ -18,12 +18,10 @@
  * 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"
+           targetNamespace="http://tuscanyscatours.com/"
            name="payment">
 
-     <component name="PaymentComponent">
+    <component name="Payment">
         <implementation.spring location="Payment-context.xml"/>
         <service name="Payment">
             <binding.ws uri="http://localhost:8081/Payment"/>
diff --git a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java
index 326463d299..4e3c7c57f6 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/java/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java
@@ -17,8 +17,9 @@
  * under the License.    
  */
 
-package payment;
+package scatours.payment;
 
+import com.tuscanyscatours.payment.Payment;
 import org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCAContribution;
 import org.apache.tuscany.sca.node.SCANode;
@@ -36,21 +37,16 @@ public class PaymentTestCase {
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {  
-        try {
-            creditCardNode = SCANodeFactory.newInstance().createSCANode("creditcard.composite",
-                new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"),
-                new SCAContribution("creditcard-test", "../creditcard-payment-jaxb/target/test-classes"));
-            
-            creditCardNode.start();
-                       
-            paymentNode = SCANodeFactory.newInstance().createSCANode(null, 
-                new SCAContribution("payment-spring-annotation", "./target/classes"),
-                new SCAContribution("payment-spring-annotation-test", "./target/test-classes"));
-    
-            paymentNode.start();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
+        creditCardNode = SCANodeFactory.newInstance().createSCANode("creditcard.composite",
+            new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
+        
+        creditCardNode.start();
+                   
+        paymentNode = SCANodeFactory.newInstance().createSCANode(null, 
+            new SCAContribution("payment-spring-annotation", "./target/classes"),
+            new SCAContribution("payment-spring-annotation-test", "./target/test-classes"));
+
+        paymentNode.start();
     }
     
     @Test
@@ -64,7 +60,6 @@ public class PaymentTestCase {
     public static void tearDownAfterClass() throws Exception {
         paymentNode.stop();
         creditCardNode.stop();
-        //emailGatewayNode.stop();
     }
 
 }
diff --git a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/java/payment/client/PaymentClientImpl.java b/sandbox/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
index 556a699ad8..d602f57dfc 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/java/payment/client/PaymentClientImpl.java
+++ b/sandbox/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
@@ -17,13 +17,12 @@
  * under the License.    
  */
 
-package payment.client;
+package scatours.payment.client.impl;
 
+import com.tuscanyscatours.payment.Payment;
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Service;
 
-import payment.Payment;
-
 @Service(Payment.class)
 public class PaymentClientImpl implements Payment {
     @Reference
diff --git a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml
index 011b978db9..b5639eb1f9 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-              xmlns:payment="http://www.tuscanyscatours.com/Payment">
-   <import namespace="http://www.tuscanyscatours.com/Payment/"/>
-   <deployable composite="payment:paymentClient" />
-</contribution>
-\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              xmlns:scatours="http://tuscanyscatours.com/">
+    <import.java package="com.tuscanyscatours.payment"/>
+    <deployable composite="scatours:paymentClient" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/resources/payment-client.composite b/sandbox/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite
index e983bd1d52..642cebfd1c 100644
--- a/sandbox/travelsample/contributions/payment-spring-scatag-contribution/src/test/resources/payment-client.composite
+++ b/sandbox/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite
@@ -18,16 +18,14 @@
  * 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" 
+           targetNamespace="http://tuscanyscatours.com/" 
            name="paymentClient">
            
     <component name="PaymentClient">
-        <implementation.java class="payment.client.PaymentClientImpl" />
+        <implementation.java class="scatours.payment.client.impl.PaymentClientImpl" />
         <reference name="payment">
             <binding.ws uri="http://localhost:8081/Payment" />
         </reference>
-    </component> 
+    </component>   
 
-</composite>
-\ No newline at end of file
+</composite>
diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index 125da5cb9c..b09248df59 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -81,7 +81,7 @@
                 <module>payment-java</module>
                 <module>payment-java-policy</module>
                 <module>payment-spring</module>
-                <module>payment-spring-scatag-contribution</module>
+                <module>payment-spring-scatag</module>
                 <module>payment-bpel-contribution</module>
                 <module>payment-groovy-contribution</module>
                 <module>policy-client</module>