tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r780781 [1/2] - in /tuscany/sandbox/travelsample: chapter-01/ chapter-02/ chapter-03/ chapter-05/ chapter-06/ chapter-07/ chapter-08/ chapter-09/ contrib/ contrib/chapter-01/ contrib/chapter-02/ contrib/chapter-02/client-contribution/ contr...
Date Mon, 01 Jun 2009 19:00:24 GMT
Author: rfeng
Date: Mon Jun  1 19:00:22 2009
New Revision: 780781

URL: http://svn.apache.org/viewvc?rev=780781&view=rev
Log:
Move redundant modules into contrib

Added:
    tuscany/sandbox/travelsample/contrib/
    tuscany/sandbox/travelsample/contrib/chapter-01/
      - copied from r780697, tuscany/sandbox/travelsample/chapter-01/
    tuscany/sandbox/travelsample/contrib/chapter-02/
      - copied from r780697, tuscany/sandbox/travelsample/chapter-02/
    tuscany/sandbox/travelsample/contrib/chapter-03/
      - copied from r780697, tuscany/sandbox/travelsample/chapter-03/
    tuscany/sandbox/travelsample/contrib/chapter-05/
      - copied from r780697, tuscany/sandbox/travelsample/chapter-05/
    tuscany/sandbox/travelsample/contrib/chapter-06/
      - copied from r780697, tuscany/sandbox/travelsample/chapter-06/
    tuscany/sandbox/travelsample/contrib/chapter-07/
      - copied from r780697, tuscany/sandbox/travelsample/chapter-07/
    tuscany/sandbox/travelsample/contrib/chapter-08/
      - copied from r780697, tuscany/sandbox/travelsample/chapter-08/
    tuscany/sandbox/travelsample/contrib/chapter-09/
      - copied from r780697, tuscany/sandbox/travelsample/chapter-09/
    tuscany/sandbox/travelsample/contrib/shared-contributions/
      - copied from r780697, tuscany/sandbox/travelsample/shared-contributions/
Removed:
    tuscany/sandbox/travelsample/chapter-01/
    tuscany/sandbox/travelsample/chapter-02/
    tuscany/sandbox/travelsample/chapter-03/
    tuscany/sandbox/travelsample/chapter-05/
    tuscany/sandbox/travelsample/chapter-06/
    tuscany/sandbox/travelsample/chapter-07/
    tuscany/sandbox/travelsample/chapter-08/
    tuscany/sandbox/travelsample/chapter-09/
    tuscany/sandbox/travelsample/shared-contributions/
Modified:
    tuscany/sandbox/travelsample/contrib/chapter-01/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-02/client-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-02/node/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-05/node/build.xml
    tuscany/sandbox/travelsample/contrib/chapter-05/node/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-05/ui-contribution/build.xml
    tuscany/sandbox/travelsample/contrib/chapter-05/ui-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-06/node/build.xml
    tuscany/sandbox/travelsample/contrib/chapter-06/node/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/build.xml
    tuscany/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/build.xml
    tuscany/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-09/node/build.xml
    tuscany/sandbox/travelsample/contrib/chapter-09/node/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-09/payment-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/chapter-09/ui-contribution/build.xml
    tuscany/sandbox/travelsample/contrib/chapter-09/ui-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/shared-contributions/calendar-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/shared-contributions/car-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/shared-contributions/common-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/shared-contributions/creditcard-payment-jaxb-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/shared-contributions/currency-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/shared-contributions/emailgateway-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/shared-contributions/flight-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/shared-contributions/hotel-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/shared-contributions/payment-java-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/shared-contributions/scatours-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/shared-contributions/shoppingcart-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/shared-contributions/travelcatalog-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/shared-contributions/trip-contribution/pom.xml
    tuscany/sandbox/travelsample/contrib/shared-contributions/tripbooking-contribution/pom.xml

Modified: tuscany/sandbox/travelsample/contrib/chapter-01/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-01/pom.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-01/pom.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-01/pom.xml Mon Jun  1 19:00:22 2009
@@ -22,7 +22,7 @@
     <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-chapter-01</artifactId>
@@ -32,34 +32,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
 

Modified: tuscany/sandbox/travelsample/contrib/chapter-02/client-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-02/client-contribution/pom.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-02/client-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-02/client-contribution/pom.xml Mon Jun  1 19:00:22 2009
@@ -22,7 +22,7 @@
     <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-chapter-02-client-contribution</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-chapter-02-tuscanyscatours-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
     

Modified: tuscany/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/pom.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-02/goodvaluetrips-contribution/pom.xml Mon Jun  1 19:00:22 2009
@@ -22,7 +22,7 @@
     <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-chapter-02-goodvaluetrips-contribution</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: tuscany/sandbox/travelsample/contrib/chapter-02/node/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-02/node/pom.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-02/node/pom.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-02/node/pom.xml Mon Jun  1 19:00:22 2009
@@ -22,7 +22,7 @@
     <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-chapter-02-node</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 

Modified: tuscany/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/pom.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-02/tuscanyscatours-contribution/pom.xml Mon Jun  1 19:00:22 2009
@@ -22,7 +22,7 @@
     <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-chapter-02-tuscanyscatours-contribution</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>        
     </dependencies>
 

Modified: tuscany/sandbox/travelsample/contrib/chapter-05/node/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-05/node/build.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-05/node/build.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-05/node/build.xml Mon Jun  1 19:00:22 2009
@@ -30,7 +30,6 @@
         </javac>
         <copy todir="target/classes">
             <fileset dir="src\main\resources"/>
-            <fileset dir="src\main\resources"/>
         </copy>
         <jar destfile="target/scatours-chapter-05-node.jar" basedir="target/classes">
             <manifest>
@@ -58,83 +57,88 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../modules">
-        <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-databinding-sdo-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-bpel-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-bpel-ode-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"/>
+        <include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xsd-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-abdera-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-js-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ejb-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ejb-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-http-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-http-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jsonrpc-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jsonrpc-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-axis2-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-axis2-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-axis2-policy-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-wsdlgen-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-jee-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-resource-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-databinding-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-data-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-axiom-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-axiom-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-json-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-sdo-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-domain-manager-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-endpoint-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-host-embedded-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-host-http-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-host-jetty-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-bpel-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-bpel-ode-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-ejb-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-resource-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-resource-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-runtime-tuscany-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-wsdl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-wsdl-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-impl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-launcher-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-manager-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-security-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-security-http-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-ws-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-extension-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-web-javascript-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-impl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-xml-1.6-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>

Modified: tuscany/sandbox/travelsample/contrib/chapter-05/node/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-05/node/pom.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-05/node/pom.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-05/node/pom.xml Mon Jun  1 19:00:22 2009
@@ -22,7 +22,7 @@
     <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-chapter-05-node</artifactId>
@@ -32,103 +32,103 @@
             <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
@@ -147,7 +147,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.5-SNAPSHOT</version>
+                <version>1.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>

Modified: tuscany/sandbox/travelsample/contrib/chapter-05/ui-contribution/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-05/ui-contribution/build.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-05/ui-contribution/build.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-05/ui-contribution/build.xml Mon Jun  1 19:00:22 2009
@@ -30,7 +30,6 @@
         </javac>
         <copy todir="target/classes">
             <fileset dir="src\main\resources"/>
-            <fileset dir="src\main\resources"/>
         </copy>
         <jar destfile="target/scatours-chapter-05-ui-contribution.jar" basedir="target/classes">
             <manifest>
@@ -58,39 +57,40 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../modules">
-        <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"/>
+        <include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xsd-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-databinding-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-endpoint-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-host-embedded-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-host-http-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-impl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-extension-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-1.6-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>

Modified: tuscany/sandbox/travelsample/contrib/chapter-05/ui-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-05/ui-contribution/pom.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-05/ui-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-05/ui-contribution/pom.xml Mon Jun  1 19:00:22 2009
@@ -22,7 +22,7 @@
     <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-chapter-05-ui-contribution</artifactId>
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
 
@@ -71,7 +71,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.5-SNAPSHOT</version>
+                <version>1.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>

Modified: tuscany/sandbox/travelsample/contrib/chapter-06/node/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-06/node/build.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-06/node/build.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-06/node/build.xml Mon Jun  1 19:00:22 2009
@@ -30,7 +30,6 @@
         </javac>
         <copy todir="target/classes">
             <fileset dir="src\main\resources"/>
-            <fileset dir="src\main\resources"/>
         </copy>
         <jar destfile="target/scatours-chapter-06-node.jar" basedir="target/classes">
             <manifest>
@@ -58,78 +57,82 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../modules">
-        <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-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-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-spring-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"/>
+        <include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xsd-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-abdera-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-js-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-http-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-http-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jsonrpc-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jsonrpc-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-axis2-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-axis2-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-axis2-policy-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-wsdlgen-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-resource-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-databinding-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-data-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-axiom-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-axiom-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-json-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-domain-manager-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-endpoint-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-host-embedded-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-host-http-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-host-jetty-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-resource-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-resource-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-spring-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-runtime-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-runtime-tuscany-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-wsdl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-wsdl-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-impl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-launcher-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-manager-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-security-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-security-http-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-ws-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-extension-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-web-javascript-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-impl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-xml-1.6-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>

Modified: tuscany/sandbox/travelsample/contrib/chapter-06/node/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-06/node/pom.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-06/node/pom.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-06/node/pom.xml Mon Jun  1 19:00:22 2009
@@ -22,7 +22,7 @@
     <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-chapter-06-node</artifactId>
@@ -32,89 +32,89 @@
             <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
@@ -133,7 +133,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.5-SNAPSHOT</version>
+                <version>1.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>

Modified: tuscany/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/pom.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/pom.xml Mon Jun  1 19:00:22 2009
@@ -22,7 +22,7 @@
     <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-chapter-06-payment-bpel-contribution</artifactId>
@@ -32,55 +32,55 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-emailgateway-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-creditcard-payment-jaxb-contribution</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
         

Modified: tuscany/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/pom.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/pom.xml Mon Jun  1 19:00:22 2009
@@ -22,7 +22,7 @@
     <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-javascript-contribution</artifactId>
@@ -32,41 +32,41 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         

Modified: tuscany/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/pom.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/pom.xml Mon Jun  1 19:00:22 2009
@@ -22,7 +22,7 @@
     <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-annotation-contribution</artifactId>
@@ -32,41 +32,41 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>      
         

Modified: tuscany/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/pom.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/pom.xml Mon Jun  1 19:00:22 2009
@@ -22,7 +22,7 @@
     <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-contribution</artifactId>
@@ -32,41 +32,41 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 

Modified: tuscany/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/build.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/build.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/build.xml Mon Jun  1 19:00:22 2009
@@ -58,39 +58,40 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../modules">
-        <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"/>
+        <include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xsd-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-databinding-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-endpoint-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-host-embedded-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-host-http-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-impl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-extension-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-1.6-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>

Modified: tuscany/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/pom.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/pom.xml Mon Jun  1 19:00:22 2009
@@ -22,7 +22,7 @@
     <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-chapter-06-ui-bpel-contribution</artifactId>
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
 
@@ -71,7 +71,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.5-SNAPSHOT</version>
+                <version>1.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>

Modified: tuscany/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/build.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/build.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/build.xml Mon Jun  1 19:00:22 2009
@@ -58,39 +58,40 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../modules">
-        <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"/>
+        <include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xsd-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-databinding-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-endpoint-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-host-embedded-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-host-http-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-node-impl-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-extension-1.6-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-1.6-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>

Modified: tuscany/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/pom.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/pom.xml Mon Jun  1 19:00:22 2009
@@ -22,7 +22,7 @@
     <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-ui-spring-contribution</artifactId>
@@ -32,27 +32,27 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
 
@@ -71,7 +71,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.5-SNAPSHOT</version>
+                <version>1.6-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>

Modified: tuscany/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/pom.xml?rev=780781&r1=780697&r2=780781&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contrib/chapter-09/creditcard-payment-sdo-contribution/pom.xml Mon Jun  1 19:00:22 2009
@@ -22,7 +22,7 @@
     <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-chapter-09-creditcard-payment-sdo-contribution</artifactId>
@@ -32,40 +32,40 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.5-SNAPSHOT</version>
+            <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 



Mime
View raw message