diff --git a/sandbox/travelsample/calendar-contribution/pom.xml b/sandbox/travelsample/calendar-contribution/pom.xml
index 09d68e01ae..ac4004355c 100644
--- a/sandbox/travelsample/calendar-contribution/pom.xml
+++ b/sandbox/travelsample/calendar-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-calendar-contribution</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/car-contribution/pom.xml b/sandbox/travelsample/car-contribution/pom.xml
index fb91046c89..06c29b25db 100644
--- a/sandbox/travelsample/car-contribution/pom.xml
+++ b/sandbox/travelsample/car-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-car-contribution</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/common-contribution/pom.xml b/sandbox/travelsample/common-contribution/pom.xml
index fc611f9d32..e0b024b666 100644
--- a/sandbox/travelsample/common-contribution/pom.xml
+++ b/sandbox/travelsample/common-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-common-contribution</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/travelsample/currency-contribution/pom.xml b/sandbox/travelsample/currency-contribution/pom.xml
index 6c1a79358e..738c3d7f61 100644
--- a/sandbox/travelsample/currency-contribution/pom.xml
+++ b/sandbox/travelsample/currency-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-currency-contribution</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/travelsample/domain/pom.xml b/sandbox/travelsample/domain/pom.xml
index ee086c6b2c..e081c8a123 100644
--- a/sandbox/travelsample/domain/pom.xml
+++ b/sandbox/travelsample/domain/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-domain</artifactId>
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
 
diff --git a/sandbox/travelsample/emailgateway-contribution/pom.xml b/sandbox/travelsample/emailgateway-contribution/pom.xml
index 8ea2952b69..cbf3165486 100644
--- a/sandbox/travelsample/emailgateway-contribution/pom.xml
+++ b/sandbox/travelsample/emailgateway-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-emailgateway-contribution</artifactId>
@@ -32,34 +32,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sandbox/travelsample/emailgateway-contribution/src/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/emailgateway-contribution/src/scatours/emailgateway/EmailGatewayImpl.java
index 5abaecef0d..6e971c3267 100644
--- a/sandbox/travelsample/emailgateway-contribution/src/scatours/emailgateway/EmailGatewayImpl.java
+++ b/sandbox/travelsample/emailgateway-contribution/src/scatours/emailgateway/EmailGatewayImpl.java
@@ -29,6 +29,7 @@ import org.osoa.sca.annotations.Service;
 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/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayTestCase.java b/sandbox/travelsample/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayTestCase.java
index 7445aa41c3..7b6760954e 100644
--- a/sandbox/travelsample/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayTestCase.java
+++ b/sandbox/travelsample/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayTestCase.java
@@ -48,6 +48,9 @@ public class EmailGatewayTestCase {
         EmailGateway cc = client.getService(EmailGateway.class, "EmailGatewayClient");
         ObjectFactory objectFactory = new ObjectFactory();
         EmailType email = objectFactory.createEmailType();
+        email.setTo("Fred");
+        email.setTitle("An email");
+        email.setBody("A message");
         System.out.println(cc.sendEmail(email));
     }
     
diff --git a/sandbox/travelsample/flight-contribution/pom.xml b/sandbox/travelsample/flight-contribution/pom.xml
index e25ba0b1c1..8782ab83d3 100644
--- a/sandbox/travelsample/flight-contribution/pom.xml
+++ b/sandbox/travelsample/flight-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-flight-contribution</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/gettingstarted/pom.xml b/sandbox/travelsample/gettingstarted/pom.xml
index 71c0de3f23..0c343a6bcd 100644
--- a/sandbox/travelsample/gettingstarted/pom.xml
+++ b/sandbox/travelsample/gettingstarted/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-gettingstarted</artifactId>
@@ -32,28 +32,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
 
diff --git a/sandbox/travelsample/hotel-contribution/pom.xml b/sandbox/travelsample/hotel-contribution/pom.xml
index ff7eeba831..4b49632937 100644
--- a/sandbox/travelsample/hotel-contribution/pom.xml
+++ b/sandbox/travelsample/hotel-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-hotel-contribution</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/node/build.xml b/sandbox/travelsample/node/build.xml
index 7c4e2ae15a..e515111e39 100644
--- a/sandbox/travelsample/node/build.xml
+++ b/sandbox/travelsample/node/build.xml
@@ -57,80 +57,80 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-assembly-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xsd-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-atom-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-atom-abdera-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ejb-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ejb-runtime-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-http-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-http-runtime-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-jsonrpc-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-jsonrpc-runtime-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-axis2-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-axis2-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-axis2-policy-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-wsdlgen-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-java-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-resource-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-core-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-core-databinding-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-core-spi-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-data-api-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-axiom-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-axiom-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-json-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-domain-manager-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-endpoint-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-extensibility-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-host-embedded-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-host-http-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-host-jetty-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-ejb-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-runtime-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-node-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-node-runtime-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-resource-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-resource-runtime-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-widget-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-widget-runtime-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-jaxws-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-wsdl-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-wsdl-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-monitor-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-monitor-logging-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-node-api-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-node-impl-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-node-launcher-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-node-manager-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-security-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-ws-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-workspace-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-workspace-impl-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-workspace-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-xsd-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-xsd-xml-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xsd-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-abdera-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ejb-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ejb-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-http-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-http-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jsonrpc-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jsonrpc-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-axis2-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-axis2-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-axis2-policy-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-wsdlgen-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-impl-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-resource-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-core-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-core-databinding-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-data-api-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-axiom-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-axiom-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-json-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-domain-manager-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-endpoint-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-host-embedded-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-host-http-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-host-jetty-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-ejb-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-resource-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-resource-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-wsdl-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-wsdl-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-node-api-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-node-impl-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-node-launcher-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-node-manager-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-security-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-ws-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-extension-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-impl-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-xml-1.5-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>
@@ -155,15 +155,14 @@
         <include name="axis2-kernel-1.4.1.jar"/>
         <include name="axis2-mtompolicy-1.4.1.jar"/>
         <include name="backport-util-concurrent-3.1.jar"/>
-        <include name="bcel-5.2.jar"/>
-        <include name="bcprov-jdk15-132.jar"/>
+        <include name="bcprov-jdk13-132.jar"/>
         <include name="cglib-nodep-2.1_3.jar"/>
         <include name="commons-codec-1.3.jar"/>
         <include name="commons-collections-3.1.jar"/>
         <include name="commons-discovery-0.2.jar"/>
-        <include name="commons-fileupload-1.1.1.jar"/>
-        <include name="commons-httpclient-3.0.1.jar"/>
-        <include name="commons-io-1.1.jar"/>
+        <include name="commons-fileupload-1.2.jar"/>
+        <include name="commons-httpclient-3.1.jar"/>
+        <include name="commons-io-1.4.jar"/>
         <include name="commons-logging-1.1.1.jar"/>
         <include name="derby-10.3.1.4.jar"/>
         <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>
@@ -175,7 +174,6 @@
         <include name="htmlparser-1.0.5.jar"/>
         <include name="httpcore-4.0-beta1.jar"/>
         <include name="httpcore-nio-4.0-beta1.jar"/>
-        <include name="jakarta-regexp-1.4.jar"/>
         <include name="jaxb-api-2.1.jar"/>
         <include name="jaxb-impl-2.1.7.jar"/>
         <include name="jaxen-1.1.1.jar"/>
@@ -186,7 +184,7 @@
         <include name="json-rpc-1.0.jar"/>
         <include name="jsr181-api-1.0-MR1.jar"/>
         <include name="jsr250-api-1.0.jar"/>
-        <include name="junit-3.8.1.jar"/>
+        <include name="junit-4.5.jar"/>
         <include name="log4j-1.2.15.jar"/>
         <include name="mail-1.4.jar"/>
         <include name="mex-1.41-impl.jar"/>
diff --git a/sandbox/travelsample/node/pom.xml b/sandbox/travelsample/node/pom.xml
index 18deb000d0..43436113c6 100644
--- a/sandbox/travelsample/node/pom.xml
+++ b/sandbox/travelsample/node/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-node</artifactId>
@@ -32,96 +32,96 @@
             <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -154,7 +154,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>1.5-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/sandbox/travelsample/payment-contribution/pom.xml b/sandbox/travelsample/payment-contribution/pom.xml
index 2e22120c38..903bd7096f 100644
--- a/sandbox/travelsample/payment-contribution/pom.xml
+++ b/sandbox/travelsample/payment-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-payment-contribution</artifactId>
@@ -32,34 +32,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java b/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java
index ac5af4e547..48378e6cd0 100644
--- a/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java
@@ -24,6 +24,7 @@ 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.Ignore;
 import org.junit.Test;
 
 /**
@@ -58,6 +59,7 @@ public class CreditCardPaymentTestCase {
     }
     
     @Test
+    //@Ignore
     public void testWaitForInput() {
         System.out.println("Press a key to end");
         try {
diff --git a/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl b/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl
index 14ab0b3bbb..b40c341389 100644
--- a/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl
@@ -30,7 +30,7 @@
                     targetNamespace="http://www.example.org/CreditCardPayment/"
                     xmlns:tns="http://www.example.org/CreditCardPayment/">
             
-            <xsd:element name="Authorize" type="tns:AuthorizeType"/>
+            <xsd:element name="authorize" type="tns:AuthorizeType"/>
             <xsd:complexType name="AuthorizeType">
                 <xsd:sequence>
                     <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
@@ -38,7 +38,7 @@
                 </xsd:sequence>
             </xsd:complexType>
 
-            <xsd:element name="AuthorizeResponse" type="tns:AuthorizeResponseType"/>
+            <xsd:element name="authorizeResponse" type="tns:AuthorizeResponseType"/>
             <xsd:complexType name="AuthorizeResponseType">
                 <xsd:sequence>
                     <xsd:element name="Status" type="xsd:string"></xsd:element>
@@ -81,10 +81,10 @@
         </xsd:schema>
     </wsdl:types>
     <wsdl:message name="AuthorizeRequest">
-        <wsdl:part name="parameters" element="tns:Authorize"></wsdl:part>
+        <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:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
     </wsdl:message>
     <wsdl:portType name="CreditCardPayment">
         <wsdl:operation name="authorize">
diff --git a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/log4j.properties b/sandbox/travelsample/paymentprocess-contribution/log4j.properties
similarity index 100%
rename from sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/log4j.properties
rename to sandbox/travelsample/paymentprocess-contribution/log4j.properties
diff --git a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/paymentprocesstest.composite b/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite
similarity index 92%
rename from sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/paymentprocesstest.composite
rename to sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite
index 8af02af425..b75c0b5ca8 100644
--- a/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/paymentprocesstest.composite
+++ b/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite
@@ -37,11 +37,11 @@
             <binding.ws uri="http://localhost:8080/PaymentProcess" wsdlElement="http://www.example.org/PaymentProcess/#wsdl.service(PaymentProcessService)"/>
         </service>
         <reference name="creditCardPaymentPartnerLink">
-            <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
+            <binding.ws uri="http://localhost:8081/CreditCardPayment"/>
         </reference>
-        <!--reference name="emailGatewayPartnerLink">
+        <reference name="emailGatewayPartnerLink">
             <binding.ws uri="http://localhost:8082/EmailGateway"/>
-        </reference-->       
+        </reference>       
     </component>    
 
 </composite>
\ No newline at end of file
diff --git a/sandbox/travelsample/paymentprocess-contribution/pom.xml b/sandbox/travelsample/paymentprocess-contribution/pom.xml
index 2c8536ae1b..e56584d8eb 100644
--- a/sandbox/travelsample/paymentprocess-contribution/pom.xml
+++ b/sandbox/travelsample/paymentprocess-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-paymentprocess-contribution</artifactId>
@@ -32,34 +32,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
@@ -77,16 +77,13 @@
         <testSourceDirectory>${basedir}/test</testSourceDirectory>
         <resources>
             <resource>
-                <directory>${basedir}/test/scatours/paymentprocess</directory>
-                <includes>
-                    <include>**.composite</include>
-                    <include>**.properties</include>
-                </includes>
+                <directory>${basedir}/resources</directory>
             </resource>
             <resource>
-                <directory>${basedir}/src/scatours/paymentprocess</directory>
+                <directory>${basedir}</directory>
                 <includes>
-                    <include>**</include>
+                    <include>*.composite</include>
+                    <include>*.properties</include>
                 </includes>
             </resource>
         </resources>
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/CreditCardPayment.wsdl b/sandbox/travelsample/paymentprocess-contribution/resources/CreditCardPayment.wsdl
similarity index 97%
rename from sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/CreditCardPayment.wsdl
rename to sandbox/travelsample/paymentprocess-contribution/resources/CreditCardPayment.wsdl
index 4854e7819d..a90c73cdfb 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/paymentprocess-contribution/resources/CreditCardPayment.wsdl
@@ -1,117 +1,117 @@
-<?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.example.org/CreditCardPayment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.example.org/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.example.org/CreditCardPayment/"
-                    xmlns:tns="http://www.example.org/CreditCardPayment/"
-                    elementFormDefault="unqualified">
-            
-            <xsd:element name="authorize" type="tns:AuthorizeType"/>
-            <xsd:complexType name="AuthorizeType">
-                <xsd:sequence>
-                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:element name="authorizeResponse" type="tns:AuthorizeResponseType"/>
-            <xsd:complexType name="AuthorizeResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:complexType name="CreditCardDetailsType">
-                <xsd:sequence>
-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:simpleType name="CreditCardTypeType">
-                <xsd:restriction base="xsd:token">
-                    <xsd:enumeration value="Visa" />
-                    <xsd:enumeration value="MasterCard" />
-                    <xsd:enumeration value="Discover" />
-                    <xsd:enumeration value="Amex" />
-                </xsd:restriction>
-            </xsd:simpleType>
-            <xsd:complexType name="PayerType">
-                <xsd:sequence>
-                    <xsd:element name="Name" type="xsd:string" />
-                    <xsd:element name="Address" type="tns:AddressType" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:complexType name="AddressType">
-                <xsd:sequence>
-                    <xsd:element name="Street" type="xsd:string" />
-                    <xsd:element name="City" type="xsd:string" />
-                    <xsd:element name="State" type="xsd:string" />
-                    <xsd:element name="ZipCode" type="xsd:string" />
-                    <xsd:element name="HomePhone" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="AuthorizeRequest">
-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="AuthorizeResponse">
-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="CreditCardPayment">
-        <wsdl:operation name="authorize">
-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="authorize">
-            <soap:operation soapAction="http://www.example.org/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:8081/CreditCardPayment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">
-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>
-    </plnk:partnerLinkType>    
+<?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.example.org/CreditCardPayment/"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:tns="http://www.example.org/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.example.org/CreditCardPayment/"
+                    xmlns:tns="http://www.example.org/CreditCardPayment/"
+                    elementFormDefault="unqualified">
+            
+            <xsd:element name="authorize" type="tns:AuthorizeType"/>
+            <xsd:complexType name="AuthorizeType">
+                <xsd:sequence>
+                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
+                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>
+
+            <xsd:element name="authorizeResponse" type="tns:AuthorizeResponseType"/>
+            <xsd:complexType name="AuthorizeResponseType">
+                <xsd:sequence>
+                    <xsd:element name="Status" type="xsd:string"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>
+
+            <xsd:complexType name="CreditCardDetailsType">
+                <xsd:sequence>
+                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
+                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
+                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
+                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
+                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:simpleType name="CreditCardTypeType">
+                <xsd:restriction base="xsd:token">
+                    <xsd:enumeration value="Visa" />
+                    <xsd:enumeration value="MasterCard" />
+                    <xsd:enumeration value="Discover" />
+                    <xsd:enumeration value="Amex" />
+                </xsd:restriction>
+            </xsd:simpleType>
+            <xsd:complexType name="PayerType">
+                <xsd:sequence>
+                    <xsd:element name="Name" type="xsd:string" />
+                    <xsd:element name="Address" type="tns:AddressType" />
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="AddressType">
+                <xsd:sequence>
+                    <xsd:element name="Street" type="xsd:string" />
+                    <xsd:element name="City" type="xsd:string" />
+                    <xsd:element name="State" type="xsd:string" />
+                    <xsd:element name="ZipCode" type="xsd:string" />
+                    <xsd:element name="HomePhone" type="xsd:string" />
+                </xsd:sequence>
+            </xsd:complexType>
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="AuthorizeRequest">
+        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="AuthorizeResponse">
+        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
+    </wsdl:message>
+    <wsdl:portType name="CreditCardPayment">
+        <wsdl:operation name="authorize">
+            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
+            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="authorize">
+            <soap:operation soapAction="http://www.example.org/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:8081/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/paymentprocess-contribution/src/scatours/paymentprocess/EmailGateway.wsdl b/sandbox/travelsample/paymentprocess-contribution/resources/EmailGateway.wsdl
similarity index 97%
rename from sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/EmailGateway.wsdl
rename to sandbox/travelsample/paymentprocess-contribution/resources/EmailGateway.wsdl
index 98956e32fd..d9a5e36bc0 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/EmailGateway.wsdl
+++ b/sandbox/travelsample/paymentprocess-contribution/resources/EmailGateway.wsdl
@@ -83,7 +83,7 @@
         </wsdl:port>
     </wsdl:service>
     
-    <!--plnk:partnerLinkType name="EmailGatewayLinkType">
+    <plnk:partnerLinkType name="EmailGatewayLinkType">
         <plnk:role name="forward" portType="tns:EmailGateway"/>
-    </plnk:partnerLinkType-->
+    </plnk:partnerLinkType>
 </wsdl:definitions>
\ No newline at end of file
diff --git a/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..6b09380868
--- /dev/null
+++ b/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+   <export.java package="scatours.payment"/>
+</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/PaymentProcess.wsdl b/sandbox/travelsample/paymentprocess-contribution/resources/PaymentProcess.wsdl
similarity index 97%
rename from sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/PaymentProcess.wsdl
rename to sandbox/travelsample/paymentprocess-contribution/resources/PaymentProcess.wsdl
index 9022763fda..868be04723 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/PaymentProcess.wsdl
+++ b/sandbox/travelsample/paymentprocess-contribution/resources/PaymentProcess.wsdl
@@ -1,83 +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="PaymentProcess" 
-                  targetNamespace="http://www.example.org/PaymentProcess/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.example.org/PaymentProcess/" 
-                  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.example.org/PaymentProcess/"
-                    xmlns:tns="http://www.example.org/PaymentProcess/">
-
-            <xsd:complexType name="MakePaymentType">
-                <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="makePayment" type="tns:MakePaymentType"/>
-      
-            <xsd:complexType name="MakePaymentResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:element name="makePaymentResponse" type="tns:MakePaymentResponseType"/>
-            
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="MakePaymentRequest">
-        <wsdl:part name="parameters" element="tns:makePayment"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="MakePaymentResponse">
-        <wsdl:part name="parameters" element="tns:makePaymentResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="PaymentProcess">
-        <wsdl:operation name="makePayment">
-            <wsdl:input message="tns:MakePaymentRequest"></wsdl:input>
-            <wsdl:output message="tns:MakePaymentResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="PaymentProcessBinding" type="tns:PaymentProcess">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="makePayment">
-            <soap:operation soapAction="http://www.example.org/PaymentProcess/makePayment" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="PaymentProcessService">
-        <wsdl:port name="PaymentProcessPort" binding="tns:PaymentProcessBinding">
-            <soap:address location="http://localhost:8080/PaymentProcess" />
-        </wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="PaymentProcessLinkType">
-       <plnk:role name="forward" portType="tns:PaymentProcess"/>
-   </plnk:partnerLinkType>
+<?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="PaymentProcess" 
+                  targetNamespace="http://www.example.org/PaymentProcess/"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+                  xmlns:tns="http://www.example.org/PaymentProcess/" 
+                  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.example.org/PaymentProcess/"
+                    xmlns:tns="http://www.example.org/PaymentProcess/">
+
+            <xsd:complexType name="MakePaymentType">
+                <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="makePayment" type="tns:MakePaymentType"/>
+      
+            <xsd:complexType name="MakePaymentResponseType">
+                <xsd:sequence>
+                    <xsd:element name="Status" type="xsd:string"></xsd:element>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:element name="makePaymentResponse" type="tns:MakePaymentResponseType"/>
+            
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="MakePaymentRequest">
+        <wsdl:part name="parameters" element="tns:makePayment"></wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="MakePaymentResponse">
+        <wsdl:part name="parameters" element="tns:makePaymentResponse"></wsdl:part>
+    </wsdl:message>
+    <wsdl:portType name="PaymentProcess">
+        <wsdl:operation name="makePayment">
+            <wsdl:input message="tns:MakePaymentRequest"></wsdl:input>
+            <wsdl:output message="tns:MakePaymentResponse"></wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="PaymentProcessBinding" type="tns:PaymentProcess">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="makePayment">
+            <soap:operation soapAction="http://www.example.org/PaymentProcess/makePayment" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="PaymentProcessService">
+        <wsdl:port name="PaymentProcessPort" binding="tns:PaymentProcessBinding">
+            <soap:address location="http://localhost:8080/PaymentProcess" />
+        </wsdl:port>
+    </wsdl:service>
+    
+   <plnk:partnerLinkType name="PaymentProcessLinkType">
+       <plnk:role name="forward" portType="tns:PaymentProcess"/>
+   </plnk:partnerLinkType>
 </wsdl:definitions>
\ No newline at end of file
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.bpel b/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.bpel
similarity index 76%
rename from sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.bpel
rename to sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.bpel
index c23780b052..08c6b8f636 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.bpel
+++ b/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.bpel
@@ -37,25 +37,23 @@
           importType="http://schemas.xmlsoap.org/wsdl/"
           namespace="http://www.example.org/CreditCardPayment/"/>
           
-  <!--import location="EmailGateway.wsdl" 
+  <import location="EmailGateway.wsdl" 
           importType="http://schemas.xmlsoap.org/wsdl/"
-          namespace="http://www.example.org/EmailGateway/"/-->          
+          namespace="http://www.example.org/EmailGateway/"/>          
           
    <partnerLinks>
       <partnerLink name="paymentProcessPartnerLink" partnerLinkType="pp:PaymentProcessLinkType" myRole="forward" />
       <partnerLink name="creditCardPaymentPartnerLink" partnerLinkType="ccp:CreditCardPaymentLinkType" partnerRole="forward" initializePartnerRole="yes" />
-      <!--partnerLink name="emailGatewayPartnerLink" partnerLinkType="eg:EmailGatewayLinkType" partnerRole="forward" initializePartnerRole="yes" /-->
+      <partnerLink name="emailGatewayPartnerLink" partnerLinkType="eg:EmailGatewayLinkType" partnerRole="forward" initializePartnerRole="yes" />
    </partnerLinks>
     
    <variables>
      <variable name="makePaymentRequestMessage" messageType="pp:MakePaymentRequest"/>
      <variable name="makePaymentResponseMessage" messageType="pp:MakePaymentResponse"/>
-     <variable name="makePaymentResponse" type="pp:MakePaymentResponseType"/>
      <variable name="authorizeRequestMessage" messageType="ccp:AuthorizeRequest"/>
      <variable name="authorizeResponseMessage" messageType="ccp:AuthorizeResponse"/>
-     <variable name="authorizeRequest" type="ccp:AuthorizeType"/>
-     <!--variable name="sendEmailRequestMessage" messageType="eg:SendEmailRequest"/>
-     <variable name="sendEmailResponseMessage" messageType="eg:SendEmailResponse"/-->
+     <variable name="sendEmailRequestMessage" messageType="eg:SendEmailRequest"/>
+     <variable name="sendEmailResponseMessage" messageType="eg:SendEmailResponse"/>
    </variables>
 
    <sequence>
@@ -112,23 +110,49 @@
                portType="ccp:CreditCardPayment" />
        
        <!-- set up call to email gateway service -->
+       <assign name="assign2">
+          <copy>
+              <from>
+                  <literal>
+                  <sendEmail xmlns="http://www.example.org/EmailGateway/">
+                    <Email xmlns="">
+                      <To>Default</To>
+                      <Title>Payment Confirmation</Title>
+                      <Body>Your payment has been confirmed</Body>
+                    </Email>
+                  </sendEmail>
+                  </literal>
+              </from>
+              <to>$sendEmailRequestMessage.parameters</to>
+          </copy>
+          <copy>
+              <from>$makePaymentRequestMessage.parameters/CustomerId/text()</from>
+              <to>$sendEmailRequestMessage.parameters/Email/To</to>
+          </copy>                   
+       </assign>                  
        
        <!-- call the email gateway to send a confirmation -->
-       
+       <invoke name="invokeEmailGateway"
+               operation="sendEmail"
+               inputVariable="sendEmailRequestMessage"
+               outputVariable="sendEmailResponseMessage"
+               partnerLink="emailGatewayPartnerLink"
+               portType="eg:EmailGateway" />
        
        <!-- set up the response -->
-       <assign name="assign2">
-          <!--copy>
-              <from><literal><Status>OK</Status></literal></from>
-              <to>$makePaymentResponse</to>
-          </copy-->
+       <assign name="assign3">
           <copy>
-              <from>$authorizeResponseMessage.parameters</from>
+              <from>
+                  <literal> 
+                  <makePaymentResponse xmlns="http://www.example.org/PaymentProcess/">
+                    <Status xmlns="">OK</Status>
+                  </makePaymentResponse>
+                  </literal>
+              </from>
               <to>$makePaymentResponseMessage.parameters</to>
           </copy>
        </assign>
        
-       <!-- email a confirmation -->
        
        <reply name="end"  
               partnerLink="paymentProcessPartnerLink"
diff --git a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.componentType b/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.componentType
similarity index 91%
rename from sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.componentType
rename to sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.componentType
index adadee5e91..ecc2f55a47 100644
--- a/sandbox/travelsample/paymentprocess-contribution/src/scatours/paymentprocess/paymentprocess.componentType
+++ b/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.componentType
@@ -27,12 +27,12 @@
   </service>
   
   <reference name="creditCardPaymentPartnerLink">
-        <interface.wsdl interface="http://www.example.org/CrecitCardPayment/#wsdl.interface(CreditCardPayment)" />
+        <interface.wsdl interface="http://www.example.org/CreditCardPayment/#wsdl.interface(CreditCardPayment)" />
   </reference>
   
-  <!--reference name="emailGatewayPartnerLink">
+  <reference name="emailGatewayPartnerLink">
         <interface.wsdl interface="http://www.example.org/EmailGateway/#wsdl.interface(EmailGateway)" />
-  </reference-->
+  </reference>
 
 </componentType>              
        
\ No newline at end of file
diff --git a/sandbox/travelsample/scatours-contribution/pom.xml b/sandbox/travelsample/scatours-contribution/pom.xml
index 588e69f5c1..8470e06b05 100644
--- a/sandbox/travelsample/scatours-contribution/pom.xml
+++ b/sandbox/travelsample/scatours-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-scatours-contribution</artifactId>
@@ -32,43 +32,43 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-travelcatalog-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-tripbooking-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-shoppingcart-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>         
 
         <dependency>
diff --git a/sandbox/travelsample/shoppingcart-contribution/pom.xml b/sandbox/travelsample/shoppingcart-contribution/pom.xml
index f0e6b92575..c9d19395a0 100644
--- a/sandbox/travelsample/shoppingcart-contribution/pom.xml
+++ b/sandbox/travelsample/shoppingcart-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-shoppingcart-contribution</artifactId>
@@ -32,31 +32,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-tripbooking-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/travelcatalog-contribution/pom.xml b/sandbox/travelsample/travelcatalog-contribution/pom.xml
index 01389b5462..c82a50c012 100644
--- a/sandbox/travelsample/travelcatalog-contribution/pom.xml
+++ b/sandbox/travelsample/travelcatalog-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-travelcatalog-contribution</artifactId>
@@ -32,31 +32,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-tripbooking-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/tripbooking-contribution/pom.xml b/sandbox/travelsample/tripbooking-contribution/pom.xml
index 0df7341dd2..e7061a0d79 100644
--- a/sandbox/travelsample/tripbooking-contribution/pom.xml
+++ b/sandbox/travelsample/tripbooking-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-tripbooking-contribution</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-common-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency> 
 
         <dependency>
diff --git a/sandbox/travelsample/ui-contribution/build.xml b/sandbox/travelsample/ui-contribution/build.xml
index 2152c6fe8a..53e3cc78e9 100644
--- a/sandbox/travelsample/ui-contribution/build.xml
+++ b/sandbox/travelsample/ui-contribution/build.xml
@@ -57,47 +57,46 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-assembly-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xsd-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-java-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-core-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-core-databinding-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-core-spi-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-endpoint-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-extensibility-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-host-embedded-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-node-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-jaxws-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-monitor-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-node-api-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-node-impl-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>
-        <include name="tuscany-xsd-1.4-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xsd-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-impl-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-core-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-core-databinding-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-endpoint-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-host-embedded-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-node-api-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-node-impl-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-extension-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-1.5-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>
         <include name="activation-1.1.jar"/>
         <include name="asm-all-3.1.jar"/>
-        <include name="bcel-5.2.jar"/>
         <include name="cglib-nodep-2.1_3.jar"/>
         <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
-        <include name="jakarta-regexp-1.4.jar"/>
         <include name="jaxb-api-2.1.jar"/>
         <include name="jaxb-impl-2.1.7.jar"/>
         <include name="jaxws-api-2.1.jar"/>
@@ -105,8 +104,6 @@
         <include name="jsr250-api-1.0.jar"/>
         <include name="stax-api-1.0-2.jar"/>
         <include name="wstx-asl-3.2.4.jar"/>
-        <include name="xalan-2.7.0.jar"/>
-        <include name="xml-apis-1.3.03.jar"/>
     </fileset>
 
 </project>
diff --git a/sandbox/travelsample/ui-contribution/pom.xml b/sandbox/travelsample/ui-contribution/pom.xml
index 8e9c91b240..9c4a00a6f3 100644
--- a/sandbox/travelsample/ui-contribution/pom.xml
+++ b/sandbox/travelsample/ui-contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-ui-contribution</artifactId>
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.4-SNAPSHOT</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
 
@@ -85,7 +85,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <version>1.5-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>