summaryrefslogtreecommitdiffstats
path: root/sandbox/travelsample/contrib/chapter-05
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sandbox/travelsample/contrib/chapter-05/node/build.xml (renamed from sandbox/travelsample/chapter-05/node/build.xml)160
-rw-r--r--sandbox/travelsample/contrib/chapter-05/node/pom.xml (renamed from sandbox/travelsample/chapter-05/node/pom.xml)34
-rw-r--r--sandbox/travelsample/contrib/chapter-05/node/src/main/java/scatours/LaunchNode.java (renamed from sandbox/travelsample/chapter-05/node/src/main/java/scatours/LaunchNode.java)0
-rw-r--r--sandbox/travelsample/contrib/chapter-05/pom.xml (renamed from sandbox/travelsample/chapter-05/pom.xml)0
-rw-r--r--sandbox/travelsample/contrib/chapter-05/ui-contribution/build.xml (renamed from sandbox/travelsample/chapter-05/ui-contribution/build.xml)68
-rw-r--r--sandbox/travelsample/contrib/chapter-05/ui-contribution/pom.xml (renamed from sandbox/travelsample/chapter-05/ui-contribution/pom.xml)12
-rw-r--r--sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml)0
-rw-r--r--sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.composite (renamed from sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite)0
-rw-r--r--sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.html (renamed from sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html)0
-rw-r--r--sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.odg (renamed from sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.odg)bin11477 -> 11477 bytes
-rw-r--r--sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.png (renamed from sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.png)bin11061 -> 11061 bytes
-rw-r--r--sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/style.css (renamed from sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/style.css)0
12 files changed, 139 insertions, 135 deletions
diff --git a/sandbox/travelsample/chapter-05/node/build.xml b/sandbox/travelsample/contrib/chapter-05/node/build.xml
index a96dff856a..3627e840ad 100644
--- a/sandbox/travelsample/chapter-05/node/build.xml
+++ b/sandbox/travelsample/contrib/chapter-05/node/build.xml
@@ -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"/>
diff --git a/sandbox/travelsample/chapter-05/node/pom.xml b/sandbox/travelsample/contrib/chapter-05/node/pom.xml
index df2e00eee0..46dd653664 100644
--- a/sandbox/travelsample/chapter-05/node/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-05/node/pom.xml
@@ -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>
diff --git a/sandbox/travelsample/chapter-05/node/src/main/java/scatours/LaunchNode.java b/sandbox/travelsample/contrib/chapter-05/node/src/main/java/scatours/LaunchNode.java
index 6b1c673579..6b1c673579 100644
--- a/sandbox/travelsample/chapter-05/node/src/main/java/scatours/LaunchNode.java
+++ b/sandbox/travelsample/contrib/chapter-05/node/src/main/java/scatours/LaunchNode.java
diff --git a/sandbox/travelsample/chapter-05/pom.xml b/sandbox/travelsample/contrib/chapter-05/pom.xml
index 5507b545d1..5507b545d1 100644
--- a/sandbox/travelsample/chapter-05/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-05/pom.xml
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/build.xml b/sandbox/travelsample/contrib/chapter-05/ui-contribution/build.xml
index 4c14d4dde8..2d7b30e1e2 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/build.xml
+++ b/sandbox/travelsample/contrib/chapter-05/ui-contribution/build.xml
@@ -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"/>
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-05/ui-contribution/pom.xml
index a51f04ce59..a706c9ab8d 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/pom.xml
+++ b/sandbox/travelsample/contrib/chapter-05/ui-contribution/pom.xml
@@ -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>
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
index 4064565d41..4064565d41 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.composite
index ae8d4b7ff6..ae8d4b7ff6 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.composite
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.html
index b8e27e87fc..b8e27e87fc 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html
+++ b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.html
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.odg b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.odg
index 8ca8fbf133..8ca8fbf133 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.odg
+++ b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.odg
Binary files differ
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.png b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.png
index f68cd84704..f68cd84704 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.png
+++ b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/scatours.png
Binary files differ
diff --git a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/style.css b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/style.css
index 6e17c2747b..6e17c2747b 100644
--- a/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/style.css
+++ b/sandbox/travelsample/contrib/chapter-05/ui-contribution/src/main/resources/style.css