You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/12/17 15:43:23 UTC
svn commit: r727401 [1/2] - in /tuscany/sandbox/travelsample:
calendar-contribution/ car-contribution/ common-contribution/
currency-contribution/ domain/ emailgateway-contribution/
emailgateway-contribution/src/scatours/emailgateway/ emailgateway-cont...
Author: slaws
Date: Wed Dec 17 06:43:22 2008
New Revision: 727401
URL: http://svn.apache.org/viewvc?rev=727401&view=rev
Log:
Updates to payment process now that implementation.bpel can support multiple outgoing partner links
Added:
tuscany/sandbox/travelsample/paymentprocess-contribution/log4j.properties (with props)
tuscany/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite (with props)
tuscany/sandbox/travelsample/paymentprocess-contribution/resources/
tuscany/sandbox/travelsample/paymentprocess-contribution/resources/CreditCardPayment.wsdl (with props)
tuscany/sandbox/travelsample/paymentprocess-contribution/resources/EmailGateway.wsdl (with props)
tuscany/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/
tuscany/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/sca-contribution.xml (with props)
tuscany/sandbox/travelsample/paymentprocess-contribution/resources/PaymentProcess.wsdl (with props)
tuscany/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.bpel
tuscany/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.componentType (with props)
Removed:
tuscany/sandbox/travelsample/paymentprocess-contribution/src/scatours/
tuscany/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/log4j.properties
tuscany/sandbox/travelsample/paymentprocess-contribution/test/scatours/paymentprocess/paymentprocesstest.composite
Modified:
tuscany/sandbox/travelsample/calendar-contribution/pom.xml
tuscany/sandbox/travelsample/car-contribution/pom.xml
tuscany/sandbox/travelsample/common-contribution/pom.xml
tuscany/sandbox/travelsample/currency-contribution/pom.xml
tuscany/sandbox/travelsample/domain/pom.xml
tuscany/sandbox/travelsample/emailgateway-contribution/pom.xml
tuscany/sandbox/travelsample/emailgateway-contribution/src/scatours/emailgateway/EmailGatewayImpl.java
tuscany/sandbox/travelsample/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayTestCase.java
tuscany/sandbox/travelsample/flight-contribution/pom.xml
tuscany/sandbox/travelsample/gettingstarted/pom.xml
tuscany/sandbox/travelsample/hotel-contribution/pom.xml
tuscany/sandbox/travelsample/node/build.xml
tuscany/sandbox/travelsample/node/pom.xml
tuscany/sandbox/travelsample/payment-contribution/pom.xml
tuscany/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java
tuscany/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl
tuscany/sandbox/travelsample/paymentprocess-contribution/pom.xml
tuscany/sandbox/travelsample/scatours-contribution/pom.xml
tuscany/sandbox/travelsample/shoppingcart-contribution/pom.xml
tuscany/sandbox/travelsample/travelcatalog-contribution/pom.xml
tuscany/sandbox/travelsample/tripbooking-contribution/pom.xml
tuscany/sandbox/travelsample/ui-contribution/build.xml
tuscany/sandbox/travelsample/ui-contribution/pom.xml
Modified: tuscany/sandbox/travelsample/calendar-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/calendar-contribution/pom.xml?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/calendar-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/calendar-contribution/pom.xml Wed Dec 17 06:43:22 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-calendar-contribution</artifactId>
@@ -32,13 +32,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/car-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/car-contribution/pom.xml?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/car-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/car-contribution/pom.xml Wed Dec 17 06:43:22 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-car-contribution</artifactId>
@@ -32,19 +32,19 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-data-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-common-contribution</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/sandbox/travelsample/common-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/common-contribution/pom.xml?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/common-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/common-contribution/pom.xml Wed Dec 17 06:43:22 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-common-contribution</artifactId>
@@ -32,13 +32,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-data-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/sandbox/travelsample/currency-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/currency-contribution/pom.xml?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/currency-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/currency-contribution/pom.xml Wed Dec 17 06:43:22 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-currency-contribution</artifactId>
@@ -32,13 +32,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/domain/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/domain/pom.xml?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/domain/pom.xml (original)
+++ tuscany/sandbox/travelsample/domain/pom.xml Wed Dec 17 06:43:22 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-domain</artifactId>
@@ -32,27 +32,27 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-tomcat</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/emailgateway-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/emailgateway-contribution/pom.xml?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/emailgateway-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/emailgateway-contribution/pom.xml Wed Dec 17 06:43:22 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-emailgateway-contribution</artifactId>
@@ -32,34 +32,34 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/emailgateway-contribution/src/scatours/emailgateway/EmailGatewayImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/emailgateway-contribution/src/scatours/emailgateway/EmailGatewayImpl.java?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/emailgateway-contribution/src/scatours/emailgateway/EmailGatewayImpl.java (original)
+++ tuscany/sandbox/travelsample/emailgateway-contribution/src/scatours/emailgateway/EmailGatewayImpl.java Wed Dec 17 06:43:22 2008
@@ -29,6 +29,7 @@
public class EmailGatewayImpl implements EmailGateway {
public String sendEmail(EmailType email) {
+ System.out.println("Sending mail to " + email.getTo());
return "SENT";
}
Modified: tuscany/sandbox/travelsample/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayTestCase.java?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayTestCase.java (original)
+++ tuscany/sandbox/travelsample/emailgateway-contribution/test/scatours/emailgateway/EmailGatewayTestCase.java Wed Dec 17 06:43:22 2008
@@ -48,6 +48,9 @@
EmailGateway cc = client.getService(EmailGateway.class, "EmailGatewayClient");
ObjectFactory objectFactory = new ObjectFactory();
EmailType email = objectFactory.createEmailType();
+ email.setTo("Fred");
+ email.setTitle("An email");
+ email.setBody("A message");
System.out.println(cc.sendEmail(email));
}
Modified: tuscany/sandbox/travelsample/flight-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/flight-contribution/pom.xml?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/flight-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/flight-contribution/pom.xml Wed Dec 17 06:43:22 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-flight-contribution</artifactId>
@@ -32,19 +32,19 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-data-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-common-contribution</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/sandbox/travelsample/gettingstarted/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/gettingstarted/pom.xml?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/gettingstarted/pom.xml (original)
+++ tuscany/sandbox/travelsample/gettingstarted/pom.xml Wed Dec 17 06:43:22 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-gettingstarted</artifactId>
@@ -32,28 +32,28 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-tomcat</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/hotel-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/hotel-contribution/pom.xml?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/hotel-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/hotel-contribution/pom.xml Wed Dec 17 06:43:22 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-hotel-contribution</artifactId>
@@ -32,19 +32,19 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-data-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-common-contribution</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/sandbox/travelsample/node/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/node/build.xml?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/node/build.xml (original)
+++ tuscany/sandbox/travelsample/node/build.xml Wed Dec 17 06:43:22 2008
@@ -57,80 +57,80 @@
</target>
<fileset id="tuscany.jars" dir="../../modules">
- <include name="tuscany-assembly-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xsd-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-atom-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-atom-abdera-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ejb-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ejb-runtime-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-http-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-http-runtime-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-jsonrpc-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-jsonrpc-runtime-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-axis2-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-axis2-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-axis2-policy-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-wsdlgen-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-java-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-resource-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-core-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-data-api-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-axiom-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-jaxb-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-jaxb-axiom-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-json-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-definitions-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-definitions-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-domain-manager-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-endpoint-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-extensibility-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-host-jetty-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-ejb-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-node-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-node-runtime-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-resource-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-resource-runtime-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-widget-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-widget-runtime-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-jaxws-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-monitor-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-monitor-logging-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-node-api-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-node-impl-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-node-launcher-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-node-manager-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-policy-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-policy-security-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-policy-xml-ws-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-workspace-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-workspace-impl-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-workspace-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-xsd-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-xsd-xml-1.4-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xml-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-assembly-xsd-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-atom-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-atom-abdera-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-ejb-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-ejb-runtime-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-http-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-http-runtime-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-jsonrpc-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-jsonrpc-runtime-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-axis2-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-sca-xml-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-ws-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-ws-axis2-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-ws-axis2-policy-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-ws-wsdlgen-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-binding-ws-xml-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-impl-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-java-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-namespace-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-resource-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-xml-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-core-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-core-databinding-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-core-spi-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-data-api-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-axiom-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-jaxb-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-jaxb-axiom-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-databinding-json-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-definitions-xml-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-domain-manager-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-endpoint-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-extensibility-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-host-embedded-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-host-http-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-host-jetty-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-ejb-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-runtime-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-java-xml-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-node-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-node-runtime-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-resource-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-resource-runtime-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-widget-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-widget-runtime-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-jaxws-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-java-xml-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-wsdl-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-interface-wsdl-xml-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-monitor-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-node-api-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-node-impl-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-node-launcher-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-node-manager-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-security-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-xml-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-policy-xml-ws-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-sca-api-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-sca-api-extension-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-workspace-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-workspace-impl-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-workspace-xml-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-xsd-1.5-SNAPSHOT.jar"/>
+ <include name="tuscany-xsd-xml-1.5-SNAPSHOT.jar"/>
</fileset>
<fileset id="3rdparty.jars" dir="../../lib">
<include name="XmlSchema-1.4.2.jar"/>
@@ -155,15 +155,14 @@
<include name="axis2-kernel-1.4.1.jar"/>
<include name="axis2-mtompolicy-1.4.1.jar"/>
<include name="backport-util-concurrent-3.1.jar"/>
- <include name="bcel-5.2.jar"/>
- <include name="bcprov-jdk15-132.jar"/>
+ <include name="bcprov-jdk13-132.jar"/>
<include name="cglib-nodep-2.1_3.jar"/>
<include name="commons-codec-1.3.jar"/>
<include name="commons-collections-3.1.jar"/>
<include name="commons-discovery-0.2.jar"/>
- <include name="commons-fileupload-1.1.1.jar"/>
- <include name="commons-httpclient-3.0.1.jar"/>
- <include name="commons-io-1.1.jar"/>
+ <include name="commons-fileupload-1.2.jar"/>
+ <include name="commons-httpclient-3.1.jar"/>
+ <include name="commons-io-1.4.jar"/>
<include name="commons-logging-1.1.1.jar"/>
<include name="derby-10.3.1.4.jar"/>
<include name="geronimo-activation_1.1_spec-1.0.1.jar"/>
@@ -175,7 +174,6 @@
<include name="htmlparser-1.0.5.jar"/>
<include name="httpcore-4.0-beta1.jar"/>
<include name="httpcore-nio-4.0-beta1.jar"/>
- <include name="jakarta-regexp-1.4.jar"/>
<include name="jaxb-api-2.1.jar"/>
<include name="jaxb-impl-2.1.7.jar"/>
<include name="jaxen-1.1.1.jar"/>
@@ -186,7 +184,7 @@
<include name="json-rpc-1.0.jar"/>
<include name="jsr181-api-1.0-MR1.jar"/>
<include name="jsr250-api-1.0.jar"/>
- <include name="junit-3.8.1.jar"/>
+ <include name="junit-4.5.jar"/>
<include name="log4j-1.2.15.jar"/>
<include name="mail-1.4.jar"/>
<include name="mex-1.41-impl.jar"/>
Modified: tuscany/sandbox/travelsample/node/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/node/pom.xml?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/node/pom.xml (original)
+++ tuscany/sandbox/travelsample/node/pom.xml Wed Dec 17 06:43:22 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-node</artifactId>
@@ -32,96 +32,96 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-launcher</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-domain-manager</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-node-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-widget-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-resource-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-atom-abdera</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-http-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-sca-axis2</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ejb-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-ejb</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -154,7 +154,7 @@
<plugin>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-ant-generator</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<executions>
<execution>
<configuration>
Modified: tuscany/sandbox/travelsample/payment-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/payment-contribution/pom.xml?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/payment-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/payment-contribution/pom.xml Wed Dec 17 06:43:22 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-payment-contribution</artifactId>
@@ -32,34 +32,34 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java (original)
+++ tuscany/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java Wed Dec 17 06:43:22 2008
@@ -24,6 +24,7 @@
import org.apache.tuscany.sca.node.SCANodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -58,6 +59,7 @@
}
@Test
+ //@Ignore
public void testWaitForInput() {
System.out.println("Press a key to end");
try {
Modified: tuscany/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl (original)
+++ tuscany/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl Wed Dec 17 06:43:22 2008
@@ -30,7 +30,7 @@
targetNamespace="http://www.example.org/CreditCardPayment/"
xmlns:tns="http://www.example.org/CreditCardPayment/">
- <xsd:element name="Authorize" type="tns:AuthorizeType"/>
+ <xsd:element name="authorize" type="tns:AuthorizeType"/>
<xsd:complexType name="AuthorizeType">
<xsd:sequence>
<xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
@@ -38,7 +38,7 @@
</xsd:sequence>
</xsd:complexType>
- <xsd:element name="AuthorizeResponse" type="tns:AuthorizeResponseType"/>
+ <xsd:element name="authorizeResponse" type="tns:AuthorizeResponseType"/>
<xsd:complexType name="AuthorizeResponseType">
<xsd:sequence>
<xsd:element name="Status" type="xsd:string"></xsd:element>
@@ -81,10 +81,10 @@
</xsd:schema>
</wsdl:types>
<wsdl:message name="AuthorizeRequest">
- <wsdl:part name="parameters" element="tns:Authorize"></wsdl:part>
+ <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
</wsdl:message>
<wsdl:message name="AuthorizeResponse">
- <wsdl:part name="parameters" element="tns:AuthorizeResponse"></wsdl:part>
+ <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
</wsdl:message>
<wsdl:portType name="CreditCardPayment">
<wsdl:operation name="authorize">
Added: tuscany/sandbox/travelsample/paymentprocess-contribution/log4j.properties
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/paymentprocess-contribution/log4j.properties?rev=727401&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/paymentprocess-contribution/log4j.properties (added)
+++ tuscany/sandbox/travelsample/paymentprocess-contribution/log4j.properties Wed Dec 17 06:43:22 2008
@@ -0,0 +1,36 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Set root logger level to WARN and its only appender to CONSOLE
+log4j.rootLogger=OFF, CONSOLE
+
+# log4j properties to work with commandline tools.
+log4j.category.org.mortbay=OFF
+log4j.category.org.hibernate.type=OFF
+log4j.category.org.objectweb=OFF
+log4j.category.org.apache.ode.axis2=OFF
+log4j.category.org.apache.ode.bpel.engine=DEBUG
+log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF
+log4j.category.org.apache.ode.bpel.epr=OFF
+log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG
+log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG
+log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=DEBUG
+
+# Console appender
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=[%p] - %C{1}.%M(%L) | %m%n
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: tuscany/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite?rev=727401&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite (added)
+++ tuscany/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite Wed Dec 17 06:43:22 2008
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:pp="http://www.example.org/PaymentProcess"
+ targetNamespace="http://www.example.org/PaymentProcess"
+ name="paymentprocess">
+
+ <component name="PaymentProcessClient">
+ <implementation.java class="scatours.paymentprocess.PaymentProcessClientImpl" />
+ <reference name="paymentProcess">
+ <binding.ws uri="http://localhost:8080/PaymentProcess" />
+ </reference>
+ </component>
+
+ <component name="PaymentProcess">
+ <implementation.bpel process="pp:PaymentProcess"/>
+ <service name="paymentProcessPartnerLink">
+ <interface.wsdl interface="http://www.example.org/PaymentProcess/#wsdl.interface(PaymentProcess)" />
+ <binding.ws uri="http://localhost:8080/PaymentProcess" wsdlElement="http://www.example.org/PaymentProcess/#wsdl.service(PaymentProcessService)"/>
+ </service>
+ <reference name="creditCardPaymentPartnerLink">
+ <binding.ws uri="http://localhost:8081/CreditCardPayment"/>
+ </reference>
+ <reference name="emailGatewayPartnerLink">
+ <binding.ws uri="http://localhost:8082/EmailGateway"/>
+ </reference>
+ </component>
+
+</composite>
\ No newline at end of file
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/paymentprocesstest.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/sandbox/travelsample/paymentprocess-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/paymentprocess-contribution/pom.xml?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/paymentprocess-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/paymentprocess-contribution/pom.xml Wed Dec 17 06:43:22 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-paymentprocess-contribution</artifactId>
@@ -32,34 +32,34 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-bpel-ode</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -77,16 +77,13 @@
<testSourceDirectory>${basedir}/test</testSourceDirectory>
<resources>
<resource>
- <directory>${basedir}/test/scatours/paymentprocess</directory>
- <includes>
- <include>**.composite</include>
- <include>**.properties</include>
- </includes>
+ <directory>${basedir}/resources</directory>
</resource>
<resource>
- <directory>${basedir}/src/scatours/paymentprocess</directory>
+ <directory>${basedir}</directory>
<includes>
- <include>**</include>
+ <include>*.composite</include>
+ <include>*.properties</include>
</includes>
</resource>
</resources>
Added: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/CreditCardPayment.wsdl
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/paymentprocess-contribution/resources/CreditCardPayment.wsdl?rev=727401&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/paymentprocess-contribution/resources/CreditCardPayment.wsdl (added)
+++ tuscany/sandbox/travelsample/paymentprocess-contribution/resources/CreditCardPayment.wsdl Wed Dec 17 06:43:22 2008
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<wsdl:definitions name="CreditCardPayment"
+ targetNamespace="http://www.example.org/CreditCardPayment/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.example.org/CreditCardPayment/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+ <wsdl:types>
+ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.example.org/CreditCardPayment/"
+ xmlns:tns="http://www.example.org/CreditCardPayment/"
+ elementFormDefault="unqualified">
+
+ <xsd:element name="authorize" type="tns:AuthorizeType"/>
+ <xsd:complexType name="AuthorizeType">
+ <xsd:sequence>
+ <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
+ <xsd:element name="Amount" type="xsd:float"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:element name="authorizeResponse" type="tns:AuthorizeResponseType"/>
+ <xsd:complexType name="AuthorizeResponseType">
+ <xsd:sequence>
+ <xsd:element name="Status" type="xsd:string"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="CreditCardDetailsType">
+ <xsd:sequence>
+ <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
+ <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
+ <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
+ <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
+ <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
+ <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:simpleType name="CreditCardTypeType">
+ <xsd:restriction base="xsd:token">
+ <xsd:enumeration value="Visa" />
+ <xsd:enumeration value="MasterCard" />
+ <xsd:enumeration value="Discover" />
+ <xsd:enumeration value="Amex" />
+ </xsd:restriction>
+ </xsd:simpleType>
+ <xsd:complexType name="PayerType">
+ <xsd:sequence>
+ <xsd:element name="Name" type="xsd:string" />
+ <xsd:element name="Address" type="tns:AddressType" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="AddressType">
+ <xsd:sequence>
+ <xsd:element name="Street" type="xsd:string" />
+ <xsd:element name="City" type="xsd:string" />
+ <xsd:element name="State" type="xsd:string" />
+ <xsd:element name="ZipCode" type="xsd:string" />
+ <xsd:element name="HomePhone" type="xsd:string" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="AuthorizeRequest">
+ <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="AuthorizeResponse">
+ <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="CreditCardPayment">
+ <wsdl:operation name="authorize">
+ <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
+ <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="authorize">
+ <soap:operation soapAction="http://www.example.org/CreditCardPayment/authorize" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="CreditCardPaymentService">
+ <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
+ <soap:address location="http://localhost:8081/CreditCardPayment" />
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="CreditCardPaymentLinkType">
+ <plnk:role name="forward" portType="tns:CreditCardPayment"/>
+ </plnk:partnerLinkType>
+</wsdl:definitions>
\ No newline at end of file
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/CreditCardPayment.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/CreditCardPayment.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/CreditCardPayment.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/EmailGateway.wsdl
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/paymentprocess-contribution/resources/EmailGateway.wsdl?rev=727401&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/paymentprocess-contribution/resources/EmailGateway.wsdl (added)
+++ tuscany/sandbox/travelsample/paymentprocess-contribution/resources/EmailGateway.wsdl Wed Dec 17 06:43:22 2008
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<wsdl:definitions name="EmailGateway"
+ targetNamespace="http://www.example.org/EmailGateway/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.example.org/EmailGateway/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+ <wsdl:types>
+ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.example.org/EmailGateway/"
+ xmlns:tns="http://www.example.org/EmailGateway/">
+
+ <xsd:element name="sendEmail" type="tns:SendEmailType"/>
+ <xsd:complexType name="SendEmailType">
+ <xsd:sequence>
+ <xsd:element name="Email" type="tns:EmailType"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:element name="sendEmailResponse" type="tns:SendEmailResponseType"/>
+ <xsd:complexType name="SendEmailResponseType">
+ <xsd:sequence>
+ <xsd:element name="Status" type="xsd:string"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="EmailType">
+ <xsd:sequence>
+ <xsd:element name="To" type="xsd:string"/>
+ <xsd:element name="Title" type="xsd:string"/>
+ <xsd:element name="Body" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="SendEmailRequest">
+ <wsdl:part name="parameters" element="tns:sendEmail"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="SendEmailResponse">
+ <wsdl:part name="parameters" element="tns:sendEmailResponse"></wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="EmailGateway">
+ <wsdl:operation name="sendEmail">
+ <wsdl:input message="tns:SendEmailRequest"></wsdl:input>
+ <wsdl:output message="tns:SendEmailResponse"></wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="EmailGatwayBinding" type="tns:EmailGateway">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="sendEmail">
+ <soap:operation soapAction="http://www.example.org/EmailGateway/sendEmail" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="EmailGatewayService">
+ <wsdl:port name="EmailGatewayPort" binding="tns:EmailGatwayBinding">
+ <soap:address location="http://localhost:8082/EmailGateway" />
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="EmailGatewayLinkType">
+ <plnk:role name="forward" portType="tns:EmailGateway"/>
+ </plnk:partnerLinkType>
+</wsdl:definitions>
\ No newline at end of file
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/EmailGateway.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/EmailGateway.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/EmailGateway.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/sca-contribution.xml?rev=727401&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/sca-contribution.xml (added)
+++ tuscany/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/sca-contribution.xml Wed Dec 17 06:43:22 2008
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+ <export.java package="scatours.payment"/>
+</contribution>
\ No newline at end of file
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/PaymentProcess.wsdl
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/paymentprocess-contribution/resources/PaymentProcess.wsdl?rev=727401&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/paymentprocess-contribution/resources/PaymentProcess.wsdl (added)
+++ tuscany/sandbox/travelsample/paymentprocess-contribution/resources/PaymentProcess.wsdl Wed Dec 17 06:43:22 2008
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<wsdl:definitions name="PaymentProcess"
+ targetNamespace="http://www.example.org/PaymentProcess/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.example.org/PaymentProcess/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+ <wsdl:types>
+ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.example.org/PaymentProcess/"
+ xmlns:tns="http://www.example.org/PaymentProcess/">
+
+ <xsd:complexType name="MakePaymentType">
+ <xsd:sequence>
+ <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
+ <xsd:element name="Amount" type="xsd:float"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="makePayment" type="tns:MakePaymentType"/>
+
+ <xsd:complexType name="MakePaymentResponseType">
+ <xsd:sequence>
+ <xsd:element name="Status" type="xsd:string"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="makePaymentResponse" type="tns:MakePaymentResponseType"/>
+
+ </xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="MakePaymentRequest">
+ <wsdl:part name="parameters" element="tns:makePayment"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="MakePaymentResponse">
+ <wsdl:part name="parameters" element="tns:makePaymentResponse"></wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="PaymentProcess">
+ <wsdl:operation name="makePayment">
+ <wsdl:input message="tns:MakePaymentRequest"></wsdl:input>
+ <wsdl:output message="tns:MakePaymentResponse"></wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="PaymentProcessBinding" type="tns:PaymentProcess">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="makePayment">
+ <soap:operation soapAction="http://www.example.org/PaymentProcess/makePayment" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="PaymentProcessService">
+ <wsdl:port name="PaymentProcessPort" binding="tns:PaymentProcessBinding">
+ <soap:address location="http://localhost:8080/PaymentProcess" />
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="PaymentProcessLinkType">
+ <plnk:role name="forward" portType="tns:PaymentProcess"/>
+ </plnk:partnerLinkType>
+</wsdl:definitions>
\ No newline at end of file
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/PaymentProcess.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/PaymentProcess.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/PaymentProcess.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.bpel
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.bpel?rev=727401&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.bpel (added)
+++ tuscany/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.bpel Wed Dec 17 06:43:22 2008
@@ -0,0 +1,164 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<process name="PaymentProcess"
+ targetNamespace="http://www.example.org/PaymentProcess"
+ xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ xmlns:tns="http://tuscany.apache.org/PaymentProcess"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:pp="http://www.example.org/PaymentProcess/"
+ xmlns:ccp="http://www.example.org/CreditCardPayment/"
+ xmlns:eg="http://www.example.org/EmailGateway/"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+
+ <import location="PaymentProcess.wsdl"
+ importType="http://schemas.xmlsoap.org/wsdl/"
+ namespace="http://www.example.org/PaymentProcess/"/>
+
+ <import location="CreditCardPayment.wsdl"
+ importType="http://schemas.xmlsoap.org/wsdl/"
+ namespace="http://www.example.org/CreditCardPayment/"/>
+
+ <import location="EmailGateway.wsdl"
+ importType="http://schemas.xmlsoap.org/wsdl/"
+ namespace="http://www.example.org/EmailGateway/"/>
+
+ <partnerLinks>
+ <partnerLink name="paymentProcessPartnerLink" partnerLinkType="pp:PaymentProcessLinkType" myRole="forward" />
+ <partnerLink name="creditCardPaymentPartnerLink" partnerLinkType="ccp:CreditCardPaymentLinkType" partnerRole="forward" initializePartnerRole="yes" />
+ <partnerLink name="emailGatewayPartnerLink" partnerLinkType="eg:EmailGatewayLinkType" partnerRole="forward" initializePartnerRole="yes" />
+ </partnerLinks>
+
+ <variables>
+ <variable name="makePaymentRequestMessage" messageType="pp:MakePaymentRequest"/>
+ <variable name="makePaymentResponseMessage" messageType="pp:MakePaymentResponse"/>
+ <variable name="authorizeRequestMessage" messageType="ccp:AuthorizeRequest"/>
+ <variable name="authorizeResponseMessage" messageType="ccp:AuthorizeResponse"/>
+ <variable name="sendEmailRequestMessage" messageType="eg:SendEmailRequest"/>
+ <variable name="sendEmailResponseMessage" messageType="eg:SendEmailResponse"/>
+ </variables>
+
+ <sequence>
+ <receive name="start"
+ partnerLink="paymentProcessPartnerLink"
+ portType="pp:PaymentProcess"
+ operation="makePayment"
+ variable="makePaymentRequestMessage"
+ createInstance="yes"/>
+
+ <!-- set up call to payments service -->
+ <assign name="assign1">
+ <copy>
+ <from>
+ <literal>
+ <authorize xmlns="http://www.example.org/CreditCardPayment/">
+ <CreditCard xmlns="">
+ <CreditCardType>Visa</CreditCardType>
+ <CreditCardNumber>12345678</CreditCardNumber>
+ <ExpMonth>2</ExpMonth>
+ <ExpYear>2010</ExpYear>
+ <CardOwner>
+ <Name>Empty</Name>
+ <Address>
+ <Street>1 The Road</Street>
+ <City>Winchester</City>
+ <State>Hampshire</State>
+ <ZipCode>AB1 2CD</ZipCode>
+ <HomePhone>12345678</HomePhone>
+ </Address>
+ </CardOwner>
+ </CreditCard>
+ <Amount xmlns="">0.0</Amount>
+ </authorize>
+ </literal>
+ </from>
+ <to>$authorizeRequestMessage.parameters</to>
+ </copy>
+ <copy>
+ <from>$makePaymentRequestMessage.parameters/CustomerId/text()</from>
+ <to>$authorizeRequestMessage.parameters/CreditCard/CardOwner/Name</to>
+ </copy>
+ <copy>
+ <from>$makePaymentRequestMessage.parameters/Amount/text()</from>
+ <to>$authorizeRequestMessage.parameters/Amount</to>
+ </copy>
+ </assign>
+
+ <invoke name="invokeCreditCardPayment"
+ operation="authorize"
+ inputVariable="authorizeRequestMessage"
+ outputVariable="authorizeResponseMessage"
+ partnerLink="creditCardPaymentPartnerLink"
+ portType="ccp:CreditCardPayment" />
+
+ <!-- set up call to email gateway service -->
+ <assign name="assign2">
+ <copy>
+ <from>
+ <literal>
+ <sendEmail xmlns="http://www.example.org/EmailGateway/">
+ <Email xmlns="">
+ <To>Default</To>
+ <Title>Payment Confirmation</Title>
+ <Body>Your payment has been confirmed</Body>
+ </Email>
+ </sendEmail>
+ </literal>
+ </from>
+ <to>$sendEmailRequestMessage.parameters</to>
+ </copy>
+ <copy>
+ <from>$makePaymentRequestMessage.parameters/CustomerId/text()</from>
+ <to>$sendEmailRequestMessage.parameters/Email/To</to>
+ </copy>
+ </assign>
+
+ <!-- call the email gateway to send a confirmation -->
+ <invoke name="invokeEmailGateway"
+ operation="sendEmail"
+ inputVariable="sendEmailRequestMessage"
+ outputVariable="sendEmailResponseMessage"
+ partnerLink="emailGatewayPartnerLink"
+ portType="eg:EmailGateway" />
+
+ <!-- set up the response -->
+ <assign name="assign3">
+ <copy>
+ <from>
+ <literal>
+ <makePaymentResponse xmlns="http://www.example.org/PaymentProcess/">
+ <Status xmlns="">OK</Status>
+ </makePaymentResponse>
+ </literal>
+ </from>
+ <to>$makePaymentResponseMessage.parameters</to>
+ </copy>
+ </assign>
+
+
+ <reply name="end"
+ partnerLink="paymentProcessPartnerLink"
+ portType="pp:PaymentProcess"
+ operation="makePayment"
+ variable="makePaymentResponseMessage">
+ </reply>
+ </sequence>
+</process>
Added: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.componentType
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.componentType?rev=727401&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.componentType (added)
+++ tuscany/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.componentType Wed Dec 17 06:43:22 2008
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+ <service name="paymentProcessPartnerLink">
+ <interface.wsdl interface="http://www.example.org/PaymentProcess/#wsdl.interface(PaymentProcess)" />
+ </service>
+
+ <reference name="creditCardPaymentPartnerLink">
+ <interface.wsdl interface="http://www.example.org/CreditCardPayment/#wsdl.interface(CreditCardPayment)" />
+ </reference>
+
+ <reference name="emailGatewayPartnerLink">
+ <interface.wsdl interface="http://www.example.org/EmailGateway/#wsdl.interface(EmailGateway)" />
+ </reference>
+
+</componentType>
+
\ No newline at end of file
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.componentType
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.componentType
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sandbox/travelsample/paymentprocess-contribution/resources/paymentprocess.componentType
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/sandbox/travelsample/scatours-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/scatours-contribution/pom.xml?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/scatours-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/scatours-contribution/pom.xml Wed Dec 17 06:43:22 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-scatours-contribution</artifactId>
@@ -32,43 +32,43 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-data-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-common-contribution</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-currency-contribution</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-travelcatalog-contribution</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-tripbooking-contribution</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-shoppingcart-contribution</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/sandbox/travelsample/shoppingcart-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shoppingcart-contribution/pom.xml?rev=727401&r1=727400&r2=727401&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/shoppingcart-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/shoppingcart-contribution/pom.xml Wed Dec 17 06:43:22 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-shoppingcart-contribution</artifactId>
@@ -32,31 +32,31 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-data-api</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-common-contribution</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-currency-contribution</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-tripbooking-contribution</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
</dependency>
<dependency>