diff options
Diffstat (limited to '')
7 files changed, 111 insertions, 112 deletions
diff --git a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/pom.xml b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/pom.xml index 9fb34dba76..e93aa76758 100644 --- a/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/pom.xml +++ b/sandbox/travelsample/chapter-09/creditcard-payment-sdo-contribution/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca</artifactId> - <version>1.4</version> + <version>1.5-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.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-impl</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-databinding-sdo</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-jetty</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/sandbox/travelsample/chapter-09/node/build.xml b/sandbox/travelsample/chapter-09/node/build.xml index 84c1a14a5e..2c26646c51 100644 --- a/sandbox/travelsample/chapter-09/node/build.xml +++ b/sandbox/travelsample/chapter-09/node/build.xml @@ -18,19 +18,19 @@ --> <project name="scatours-chapter-09-node" default="compile"> - <property environment="env"/> <target name="compile"> <mkdir dir="target/classes"/> <javac destdir="target/classes" debug="on" source="1.5" target="1.5"> - <src path="src"/> + <src path="src\main\java"/> <classpath> <fileset refid="tuscany.jars"/> <fileset refid="3rdparty.jars"/> </classpath> </javac> <copy todir="target/classes"> - <fileset dir="." excludes="**/*.java, pom.xml, build.xml, target"/> + <fileset dir="src\main\resources"/> + <fileset dir="src\main\resources"/> </copy> <jar destfile="target/scatours-chapter-09-node.jar" basedir="target/classes"> <manifest> @@ -57,80 +57,80 @@ </delete> </target> - <fileset id="tuscany.jars" dir="${env.TUSCANY}/modules"> - <include name="tuscany-assembly-1.4.jar"/> - <include name="tuscany-assembly-xml-1.4.jar"/> - <include name="tuscany-assembly-xsd-1.4.jar"/> - <include name="tuscany-binding-atom-1.4.jar"/> - <include name="tuscany-binding-atom-abdera-1.4.jar"/> - <include name="tuscany-binding-http-1.4.jar"/> - <include name="tuscany-binding-http-runtime-1.4.jar"/> - <include name="tuscany-binding-jsonrpc-1.4.jar"/> - <include name="tuscany-binding-jsonrpc-runtime-1.4.jar"/> - <include name="tuscany-binding-sca-1.4.jar"/> - <include name="tuscany-binding-sca-axis2-1.4.jar"/> - <include name="tuscany-binding-sca-xml-1.4.jar"/> - <include name="tuscany-binding-ws-1.4.jar"/> - <include name="tuscany-binding-ws-axis2-1.4.jar"/> - <include name="tuscany-binding-ws-axis2-policy-1.4.jar"/> - <include name="tuscany-binding-ws-wsdlgen-1.4.jar"/> - <include name="tuscany-binding-ws-xml-1.4.jar"/> - <include name="tuscany-contribution-1.4.jar"/> - <include name="tuscany-contribution-impl-1.4.jar"/> - <include name="tuscany-contribution-java-1.4.jar"/> - <include name="tuscany-contribution-namespace-1.4.jar"/> - <include name="tuscany-contribution-resource-1.4.jar"/> - <include name="tuscany-contribution-xml-1.4.jar"/> - <include name="tuscany-core-1.4.jar"/> - <include name="tuscany-core-databinding-1.4.jar"/> - <include name="tuscany-core-spi-1.4.jar"/> - <include name="tuscany-data-api-1.4.jar"/> - <include name="tuscany-databinding-1.4.jar"/> - <include name="tuscany-databinding-axiom-1.4.jar"/> - <include name="tuscany-databinding-jaxb-1.4.jar"/> - <include name="tuscany-databinding-jaxb-axiom-1.4.jar"/> - <include name="tuscany-databinding-json-1.4.jar"/> - <include name="tuscany-definitions-1.4.jar"/> - <include name="tuscany-definitions-xml-1.4.jar"/> - <include name="tuscany-domain-manager-1.4.jar"/> - <include name="tuscany-endpoint-1.4.jar"/> - <include name="tuscany-extensibility-1.4.jar"/> - <include name="tuscany-host-embedded-1.4.jar"/> - <include name="tuscany-host-http-1.4.jar"/> - <include name="tuscany-host-jetty-1.4.jar"/> - <include name="tuscany-implementation-java-1.4.jar"/> - <include name="tuscany-implementation-java-runtime-1.4.jar"/> - <include name="tuscany-implementation-java-xml-1.4.jar"/> - <include name="tuscany-implementation-node-1.4.jar"/> - <include name="tuscany-implementation-node-runtime-1.4.jar"/> - <include name="tuscany-implementation-resource-1.4.jar"/> - <include name="tuscany-implementation-resource-runtime-1.4.jar"/> - <include name="tuscany-implementation-widget-1.4.jar"/> - <include name="tuscany-implementation-widget-runtime-1.4.jar"/> - <include name="tuscany-interface-1.4.jar"/> - <include name="tuscany-interface-java-1.4.jar"/> - <include name="tuscany-interface-java-jaxws-1.4.jar"/> - <include name="tuscany-interface-java-xml-1.4.jar"/> - <include name="tuscany-interface-wsdl-1.4.jar"/> - <include name="tuscany-interface-wsdl-xml-1.4.jar"/> - <include name="tuscany-monitor-1.4.jar"/> - <include name="tuscany-node-api-1.4.jar"/> - <include name="tuscany-node-impl-1.4.jar"/> - <include name="tuscany-node-launcher-1.4.jar"/> - <include name="tuscany-node-manager-1.4.jar"/> - <include name="tuscany-policy-1.4.jar"/> - <include name="tuscany-policy-security-1.4.jar"/> - <include name="tuscany-policy-xml-1.4.jar"/> - <include name="tuscany-policy-xml-ws-1.4.jar"/> - <include name="tuscany-sca-api-1.4.jar"/> - <include name="tuscany-sca-api-extension-1.4.jar"/> - <include name="tuscany-workspace-1.4.jar"/> - <include name="tuscany-workspace-impl-1.4.jar"/> - <include name="tuscany-workspace-xml-1.4.jar"/> - <include name="tuscany-xsd-1.4.jar"/> - <include name="tuscany-xsd-xml-1.4.jar"/> + <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-widget-1.5-SNAPSHOT.jar"/> + <include name="tuscany-implementation-widget-runtime-1.5-SNAPSHOT.jar"/> + <include name="tuscany-interface-1.5-SNAPSHOT.jar"/> + <include name="tuscany-interface-java-1.5-SNAPSHOT.jar"/> + <include name="tuscany-interface-java-jaxws-1.5-SNAPSHOT.jar"/> + <include name="tuscany-interface-java-xml-1.5-SNAPSHOT.jar"/> + <include name="tuscany-interface-wsdl-1.5-SNAPSHOT.jar"/> + <include name="tuscany-interface-wsdl-xml-1.5-SNAPSHOT.jar"/> + <include name="tuscany-monitor-1.5-SNAPSHOT.jar"/> + <include name="tuscany-node-api-1.5-SNAPSHOT.jar"/> + <include name="tuscany-node-impl-1.5-SNAPSHOT.jar"/> + <include name="tuscany-node-launcher-1.5-SNAPSHOT.jar"/> + <include name="tuscany-node-manager-1.5-SNAPSHOT.jar"/> + <include name="tuscany-policy-1.5-SNAPSHOT.jar"/> + <include name="tuscany-policy-security-1.5-SNAPSHOT.jar"/> + <include name="tuscany-policy-xml-1.5-SNAPSHOT.jar"/> + <include name="tuscany-policy-xml-ws-1.5-SNAPSHOT.jar"/> + <include name="tuscany-sca-api-1.5-SNAPSHOT.jar"/> + <include name="tuscany-sca-api-extension-1.5-SNAPSHOT.jar"/> + <include name="tuscany-workspace-1.5-SNAPSHOT.jar"/> + <include name="tuscany-workspace-impl-1.5-SNAPSHOT.jar"/> + <include name="tuscany-workspace-xml-1.5-SNAPSHOT.jar"/> + <include name="tuscany-xsd-1.5-SNAPSHOT.jar"/> + <include name="tuscany-xsd-xml-1.5-SNAPSHOT.jar"/> </fileset> - <fileset id="3rdparty.jars" dir="${env.TUSCANY}/lib"> + <fileset id="3rdparty.jars" dir="../../lib"> <include name="XmlSchema-1.4.2.jar"/> <include name="abdera-client-0.4.0-incubating.jar"/> <include name="abdera-core-0.4.0-incubating.jar"/> @@ -154,7 +154,7 @@ <include name="axis2-mtompolicy-1.4.1.jar"/> <include name="backport-util-concurrent-3.1.jar"/> <include name="bcprov-jdk13-132.jar"/> - <include name="cglib-nodep-2.1_3.jar"/> + <include name="cglib-nodep-2.2.jar"/> <include name="commons-codec-1.3.jar"/> <include name="commons-collections-3.1.jar"/> <include name="commons-discovery-0.2.jar"/> @@ -164,7 +164,6 @@ <include name="commons-logging-1.1.1.jar"/> <include name="derby-10.3.1.4.jar"/> <include name="geronimo-activation_1.1_spec-1.0.1.jar"/> - <include name="geronimo-commonj_1.1_spec-1.0.jar"/> <include name="geronimo-javamail_1.4_spec-1.2.jar"/> <include name="geronimo-jms_1.1_spec-1.1.jar"/> <include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/> diff --git a/sandbox/travelsample/chapter-09/node/pom.xml b/sandbox/travelsample/chapter-09/node/pom.xml index 08cd919bfc..b6a0d70a6a 100644 --- a/sandbox/travelsample/chapter-09/node/pom.xml +++ b/sandbox/travelsample/chapter-09/node/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <!--relativePath>../../pom.xml</relativePath--> </parent> <artifactId>scatours-chapter-09-node</artifactId> @@ -32,82 +32,82 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-api</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-launcher</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-domain-manager</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-node-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-widget-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-resource-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-atom-abdera</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-http-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-sca-axis2</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> @@ -127,7 +127,7 @@ <plugin> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-maven-ant-generator</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <executions> <execution> <configuration> diff --git a/sandbox/travelsample/chapter-09/payment-contribution/pom.xml b/sandbox/travelsample/chapter-09/payment-contribution/pom.xml index ce60f33f29..5f3b822de7 100644 --- a/sandbox/travelsample/chapter-09/payment-contribution/pom.xml +++ b/sandbox/travelsample/chapter-09/payment-contribution/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <!--relativePath>../../pom.xml</relativePath--> </parent> <artifactId>scatours-chapter-09-payment-contribution</artifactId> @@ -32,34 +32,34 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-embedded</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-jetty</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/sandbox/travelsample/chapter-09/pom.xml b/sandbox/travelsample/chapter-09/pom.xml index 8fac6c9a59..7d7bee30ff 100644 --- a/sandbox/travelsample/chapter-09/pom.xml +++ b/sandbox/travelsample/chapter-09/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <!--relativePath>../pom.xml</relativePath--> </parent> <artifactId>tuscany-scatours-chapter-09</artifactId> diff --git a/sandbox/travelsample/chapter-09/ui-contribution/build.xml b/sandbox/travelsample/chapter-09/ui-contribution/build.xml index 0aa96f56de..dfebf9c5c1 100644 --- a/sandbox/travelsample/chapter-09/ui-contribution/build.xml +++ b/sandbox/travelsample/chapter-09/ui-contribution/build.xml @@ -92,7 +92,7 @@ <include name="tuscany-xsd-1.5-SNAPSHOT.jar"/> </fileset> <fileset id="3rdparty.jars" dir="../../lib"> - <include name="XmlSchema-1.4.2.jar"/> + <include name="XmlSchema-1.5-SNAPSHOT.2.jar"/> <include name="activation-1.1.jar"/> <include name="asm-all-3.1.jar"/> <include name="cglib-nodep-2.2.jar"/> diff --git a/sandbox/travelsample/chapter-09/ui-contribution/pom.xml b/sandbox/travelsample/chapter-09/ui-contribution/pom.xml index b330385cd1..8b6a8790b1 100644 --- a/sandbox/travelsample/chapter-09/ui-contribution/pom.xml +++ b/sandbox/travelsample/chapter-09/ui-contribution/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <!--relativePath>../../pom.xml</relativePath--> </parent> <artifactId>scatours-chapter-09-ui-contribution</artifactId> @@ -32,27 +32,27 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-embedded</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-tomcat</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>test</scope> </dependency> |