diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-01 19:00:22 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-01 19:00:22 +0000 |
commit | 38ebe24c08241e09ac0c1c5e257a25583a868566 (patch) | |
tree | dffd176567c83812f03df4cc7cd658e4f5a25e7d /sandbox/travelsample/contrib/chapter-06 | |
parent | 066ce9d3b6b12a8523c5ce208673bcbc8e6a8de6 (diff) |
Move redundant modules into contrib
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@780781 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/node/build.xml (renamed from sandbox/travelsample/chapter-06/node/build.xml) | 149 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/node/pom.xml (renamed from sandbox/travelsample/chapter-06/node/pom.xml) | 30 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java (renamed from sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java (renamed from sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/log4j.properties (renamed from sandbox/travelsample/chapter-06/payment-bpel-contribution/log4j.properties) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/pom.xml (renamed from sandbox/travelsample/chapter-06/payment-bpel-contribution/pom.xml) | 18 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl (renamed from sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl (renamed from sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl (renamed from sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel (renamed from sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java (renamed from sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java (renamed from sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite (renamed from sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/pom.xml (renamed from sandbox/travelsample/chapter-06/payment-javascript-contribution/pom.xml) | 14 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/CreditCardPayment.wsdl (renamed from sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/CreditCardPayment.wsdl) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/EmailGateway.wsdl (renamed from sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/EmailGateway.wsdl) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/Payment.wsdl (renamed from sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/Payment.wsdl) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/payment.composite (renamed from sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/payment.composite) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/payment/PaymentImpl.groovy (renamed from sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/payment/PaymentImpl.groovy) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/payment/PaymentTestCase.java (renamed from sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/PaymentTestCase.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/payment/client/PaymentClientImpl.java (renamed from sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/client/PaymentClientImpl.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java (renamed from sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/scatours/emailgateway/EmailGatewayImpl.java (renamed from sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/scatours/emailgateway/EmailGatewayImpl.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/pom.xml (renamed from sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/pom.xml) | 14 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/java/payment/PaymentImpl.java (renamed from sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/payment/PaymentImpl.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java (renamed from sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/CreditCardPayment.wsdl (renamed from sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/CreditCardPayment.wsdl) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/EmailGateway.wsdl (renamed from sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/EmailGateway.wsdl) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment-context.xml (renamed from sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment-context.xml) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment.wsdl (renamed from sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment.wsdl) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/PaymentTestCase.java (renamed from sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/PaymentTestCase.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/client/PaymentClientImpl.java (renamed from sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/client/PaymentClientImpl.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/resources/payment.composite (renamed from sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/payment.composite) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/pom.xml (renamed from sandbox/travelsample/chapter-06/payment-spring-contribution/pom.xml) | 14 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/java/payment/PaymentImpl.java (renamed from sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/java/payment/PaymentImpl.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java (renamed from sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl (renamed from sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/EmailGateway.wsdl (renamed from sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/EmailGateway.wsdl) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/Payment-context.xml (renamed from sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/Payment-context.xml) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/Payment.wsdl (renamed from sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/Payment.wsdl) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java (renamed from sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java (renamed from sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/resources/payment.composite (renamed from sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/resources/payment.composite) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/pom.xml (renamed from sandbox/travelsample/chapter-06/pom.xml) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/build.xml (renamed from sandbox/travelsample/chapter-06/ui-bpel-contribution/build.xml) | 67 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/pom.xml (renamed from sandbox/travelsample/chapter-06/ui-bpel-contribution/pom.xml) | 12 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.composite (renamed from sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.composite) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.html (renamed from sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.html) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.odg (renamed from sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.odg) | bin | 11477 -> 11477 bytes | |||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.png (renamed from sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.png) | bin | 11061 -> 11061 bytes | |||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/style.css (renamed from sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/style.css) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/build.xml (renamed from sandbox/travelsample/chapter-06/ui-spring-contribution/build.xml) | 67 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/pom.xml (renamed from sandbox/travelsample/chapter-06/ui-spring-contribution/pom.xml) | 12 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.composite (renamed from sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.composite) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.html (renamed from sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.html) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.odg (renamed from sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.odg) | bin | 11477 -> 11477 bytes | |||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.png (renamed from sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.png) | bin | 11061 -> 11061 bytes | |||
-rw-r--r-- | sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/style.css (renamed from sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/style.css) | 0 |
67 files changed, 201 insertions, 196 deletions
diff --git a/sandbox/travelsample/chapter-06/node/build.xml b/sandbox/travelsample/contrib/chapter-06/node/build.xml index 0ccfcedee1..e49a915d6d 100644 --- a/sandbox/travelsample/chapter-06/node/build.xml +++ b/sandbox/travelsample/contrib/chapter-06/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-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"/> diff --git a/sandbox/travelsample/chapter-06/node/pom.xml b/sandbox/travelsample/contrib/chapter-06/node/pom.xml index 5319b87630..19262eeb89 100644 --- a/sandbox/travelsample/chapter-06/node/pom.xml +++ b/sandbox/travelsample/contrib/chapter-06/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-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> diff --git a/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java b/sandbox/travelsample/contrib/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java index e87b0ca44e..e87b0ca44e 100644 --- a/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java +++ b/sandbox/travelsample/contrib/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java diff --git a/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java b/sandbox/travelsample/contrib/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java index 45c9be4bce..45c9be4bce 100644 --- a/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java +++ b/sandbox/travelsample/contrib/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/log4j.properties b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/log4j.properties index 7ed0bcaf77..7ed0bcaf77 100644 --- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/log4j.properties +++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/log4j.properties diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/pom.xml index e30d8b7ff2..8cfe95771a 100644 --- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/pom.xml +++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-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-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> diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl index 22ef6de317..22ef6de317 100644 --- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl +++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl index a097d9b7e4..a097d9b7e4 100644 --- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl +++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml index 725c95a2bd..725c95a2bd 100644 --- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl index e2c4062f2e..e2c4062f2e 100644 --- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl +++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel index 8f11d76888..8f11d76888 100644 --- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel +++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java index a69c16a726..a69c16a726 100644 --- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java +++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java index eaa7498e84..eaa7498e84 100644 --- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java +++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml index 4984ef0252..4984ef0252 100644 --- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml diff --git a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite index ab26a48b20..ab26a48b20 100644 --- a/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite +++ b/sandbox/travelsample/contrib/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/pom.xml index f80a6e2de1..67882f6ddb 100644 --- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/pom.xml +++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-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-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> diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/CreditCardPayment.wsdl index 1813c77436..1813c77436 100644 --- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/CreditCardPayment.wsdl +++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/CreditCardPayment.wsdl diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/EmailGateway.wsdl index a097d9b7e4..a097d9b7e4 100644 --- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/EmailGateway.wsdl +++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/EmailGateway.wsdl diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/META-INF/sca-contribution.xml index 7adba24d58..7adba24d58 100644 --- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/META-INF/sca-contribution.xml diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/Payment.wsdl index 2519d7642e..2519d7642e 100644 --- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/Payment.wsdl +++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/Payment.wsdl diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/payment.composite index 9743f24ada..9743f24ada 100644 --- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/payment.composite +++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/payment.composite diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/payment/PaymentImpl.groovy b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/payment/PaymentImpl.groovy index dab3003eed..dab3003eed 100644 --- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/main/resources/payment/PaymentImpl.groovy +++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/main/resources/payment/PaymentImpl.groovy diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/payment/PaymentTestCase.java index 21bf6ff428..21bf6ff428 100644 --- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/PaymentTestCase.java +++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/payment/PaymentTestCase.java diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/client/PaymentClientImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/payment/client/PaymentClientImpl.java index 556a699ad8..556a699ad8 100644 --- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/client/PaymentClientImpl.java +++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/payment/client/PaymentClientImpl.java diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java index ac05bf7359..ac05bf7359 100644 --- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java +++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java diff --git a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/scatours/emailgateway/EmailGatewayImpl.java index 974c902f5d..974c902f5d 100644 --- a/sandbox/travelsample/chapter-06/payment-javascript-contribution/src/test/java/scatours/emailgateway/EmailGatewayImpl.java +++ b/sandbox/travelsample/contrib/chapter-06/payment-javascript-contribution/src/test/java/scatours/emailgateway/EmailGatewayImpl.java diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/pom.xml index cdfe544737..3018bc651d 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/pom.xml +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-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-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> diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/payment/PaymentImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/java/payment/PaymentImpl.java index 68e941e138..68e941e138 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/payment/PaymentImpl.java +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/java/payment/PaymentImpl.java diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java index 644519a5e7..644519a5e7 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/CreditCardPayment.wsdl index dbf89924cc..dbf89924cc 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/CreditCardPayment.wsdl +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/CreditCardPayment.wsdl diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/EmailGateway.wsdl index a097d9b7e4..a097d9b7e4 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/EmailGateway.wsdl +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/EmailGateway.wsdl diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/META-INF/sca-contribution.xml index 896b1ceb48..896b1ceb48 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/META-INF/sca-contribution.xml diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment-context.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment-context.xml index 6942649d8a..6942649d8a 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment-context.xml +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment-context.xml diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment.wsdl index e2c4062f2e..e2c4062f2e 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment.wsdl +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/main/resources/Payment.wsdl diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/PaymentTestCase.java index 5e47c9075e..5e47c9075e 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/PaymentTestCase.java +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/PaymentTestCase.java diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/client/PaymentClientImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/client/PaymentClientImpl.java index 556a699ad8..556a699ad8 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/client/PaymentClientImpl.java +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/java/payment/client/PaymentClientImpl.java diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/resources/META-INF/sca-contribution.xml index 92de8d375b..92de8d375b 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/resources/META-INF/sca-contribution.xml diff --git a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/payment.composite b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/resources/payment.composite index aeb9a3e413..aeb9a3e413 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-annotation-contribution/src/test/resources/payment.composite +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-annotation-contribution/src/test/resources/payment.composite diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/pom.xml index 752c5ebebf..299b989cca 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-contribution/pom.xml +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-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-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> diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/java/payment/PaymentImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/java/payment/PaymentImpl.java index 48f829ae0f..48f829ae0f 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/java/payment/PaymentImpl.java +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/java/payment/PaymentImpl.java diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java index 644519a5e7..644519a5e7 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/java/scatours/emailgateway/EmailGatewayImpl.java diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl index dbf89924cc..dbf89924cc 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/EmailGateway.wsdl index a097d9b7e4..a097d9b7e4 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/EmailGateway.wsdl +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/EmailGateway.wsdl diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml index 78a5d851f9..78a5d851f9 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/Payment-context.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/Payment-context.xml index e786e15d55..e786e15d55 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/Payment-context.xml +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/Payment-context.xml diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/Payment.wsdl index e2c4062f2e..e2c4062f2e 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/main/resources/Payment.wsdl +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/main/resources/Payment.wsdl diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java index 8046e8b2cd..8046e8b2cd 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/java/payment/PaymentTestCase.java diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java index 556a699ad8..556a699ad8 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/java/payment/client/PaymentClientImpl.java diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml index 4e61a2f127..4e61a2f127 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/resources/META-INF/sca-contribution.xml diff --git a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/resources/payment.composite b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/resources/payment.composite index 52deda7a18..52deda7a18 100644 --- a/sandbox/travelsample/chapter-06/payment-spring-contribution/src/test/resources/payment.composite +++ b/sandbox/travelsample/contrib/chapter-06/payment-spring-contribution/src/test/resources/payment.composite diff --git a/sandbox/travelsample/chapter-06/pom.xml b/sandbox/travelsample/contrib/chapter-06/pom.xml index 605a362c31..605a362c31 100644 --- a/sandbox/travelsample/chapter-06/pom.xml +++ b/sandbox/travelsample/contrib/chapter-06/pom.xml diff --git a/sandbox/travelsample/chapter-06/ui-bpel-contribution/build.xml b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/build.xml index 591b58299e..37b6800014 100644 --- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/build.xml +++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/build.xml @@ -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"/> diff --git a/sandbox/travelsample/chapter-06/ui-bpel-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/pom.xml index 1a04dbd879..448bd8a96f 100644 --- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/pom.xml +++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-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-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> diff --git a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml index b3de1910d1..b3de1910d1 100644 --- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml diff --git a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.composite index 4b5290b910..4b5290b910 100644 --- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.composite +++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.composite diff --git a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.html b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.html index b8e27e87fc..b8e27e87fc 100644 --- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.html +++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.html diff --git a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.odg b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.odg Binary files differindex 8ca8fbf133..8ca8fbf133 100644 --- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.odg +++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.odg diff --git a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.png b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.png Binary files differindex f68cd84704..f68cd84704 100644 --- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/scatours.png +++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/scatours.png diff --git a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/style.css b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/style.css index 6e17c2747b..6e17c2747b 100644 --- a/sandbox/travelsample/chapter-06/ui-bpel-contribution/src/main/resources/style.css +++ b/sandbox/travelsample/contrib/chapter-06/ui-bpel-contribution/src/main/resources/style.css diff --git a/sandbox/travelsample/chapter-06/ui-spring-contribution/build.xml b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/build.xml index 2f8bd12107..68b3a3adf9 100644 --- a/sandbox/travelsample/chapter-06/ui-spring-contribution/build.xml +++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/build.xml @@ -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"/> diff --git a/sandbox/travelsample/chapter-06/ui-spring-contribution/pom.xml b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/pom.xml index 2303628ab0..42df0ab469 100644 --- a/sandbox/travelsample/chapter-06/ui-spring-contribution/pom.xml +++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-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-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> diff --git a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/META-INF/sca-contribution.xml index b3de1910d1..b3de1910d1 100644 --- a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/META-INF/sca-contribution.xml diff --git a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.composite index 9b21c2a9f2..9b21c2a9f2 100644 --- a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.composite +++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.composite diff --git a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.html b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.html index b8e27e87fc..b8e27e87fc 100644 --- a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.html +++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.html diff --git a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.odg b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.odg Binary files differindex 8ca8fbf133..8ca8fbf133 100644 --- a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.odg +++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.odg diff --git a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.png b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.png Binary files differindex f68cd84704..f68cd84704 100644 --- a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/scatours.png +++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/scatours.png diff --git a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/style.css b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/style.css index 6e17c2747b..6e17c2747b 100644 --- a/sandbox/travelsample/chapter-06/ui-spring-contribution/src/main/resources/style.css +++ b/sandbox/travelsample/contrib/chapter-06/ui-spring-contribution/src/main/resources/style.css |