diff options
Diffstat (limited to 'sandbox/travelsample/shared-contributions')
16 files changed, 74 insertions, 70 deletions
diff --git a/sandbox/travelsample/shared-contributions/calendar-contribution/pom.xml b/sandbox/travelsample/shared-contributions/calendar-contribution/pom.xml index ac4004355c..165ffa20b5 100644 --- a/sandbox/travelsample/shared-contributions/calendar-contribution/pom.xml +++ b/sandbox/travelsample/shared-contributions/calendar-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.4</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.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> <scope>runtime</scope> </dependency> diff --git a/sandbox/travelsample/shared-contributions/car-contribution/pom.xml b/sandbox/travelsample/shared-contributions/car-contribution/pom.xml index 06c29b25db..5e3061aa32 100644 --- a/sandbox/travelsample/shared-contributions/car-contribution/pom.xml +++ b/sandbox/travelsample/shared-contributions/car-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.4</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.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> diff --git a/sandbox/travelsample/shared-contributions/common-contribution/pom.xml b/sandbox/travelsample/shared-contributions/common-contribution/pom.xml index e0b024b666..86185e1b1c 100644 --- a/sandbox/travelsample/shared-contributions/common-contribution/pom.xml +++ b/sandbox/travelsample/shared-contributions/common-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.4</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.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> diff --git a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/pom.xml b/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/pom.xml index 46902b1fc9..9260c856b9 100644 --- a/sandbox/travelsample/shared-contributions/creditcardpayment-contribution/pom.xml +++ b/sandbox/travelsample/shared-contributions/creditcardpayment-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.4</version> <!--relativePath>../../pom.xml</relativePath--> </parent> <artifactId>scatours-creditcardpayment-contribution</artifactId> @@ -32,34 +32,34 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-embedded</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</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.4</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.4</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-jetty</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> <scope>runtime</scope> </dependency> diff --git a/sandbox/travelsample/shared-contributions/currency-contribution/pom.xml b/sandbox/travelsample/shared-contributions/currency-contribution/pom.xml index 738c3d7f61..c14e804973 100644 --- a/sandbox/travelsample/shared-contributions/currency-contribution/pom.xml +++ b/sandbox/travelsample/shared-contributions/currency-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.4</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.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> <scope>runtime</scope> </dependency> diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml b/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml index 5514e9130f..798cb7329e 100644 --- a/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml +++ b/sandbox/travelsample/shared-contributions/emailgateway-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.4</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.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</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.4</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.4</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-jetty</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> <scope>runtime</scope> </dependency> diff --git a/sandbox/travelsample/shared-contributions/flight-contribution/pom.xml b/sandbox/travelsample/shared-contributions/flight-contribution/pom.xml index 8782ab83d3..92248b2df0 100644 --- a/sandbox/travelsample/shared-contributions/flight-contribution/pom.xml +++ b/sandbox/travelsample/shared-contributions/flight-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.4</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.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> diff --git a/sandbox/travelsample/shared-contributions/hotel-contribution/pom.xml b/sandbox/travelsample/shared-contributions/hotel-contribution/pom.xml index 4b49632937..1e68fd9ea9 100644 --- a/sandbox/travelsample/shared-contributions/hotel-contribution/pom.xml +++ b/sandbox/travelsample/shared-contributions/hotel-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.4</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.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> diff --git a/sandbox/travelsample/shared-contributions/pom.xml b/sandbox/travelsample/shared-contributions/pom.xml index 583c42a4fc..73159492e5 100644 --- a/sandbox/travelsample/shared-contributions/pom.xml +++ b/sandbox/travelsample/shared-contributions/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> <!--relativePath>../pom.xml</relativePath--> </parent> <artifactId>tuscany-scatours-common-contributions</artifactId> diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/pom.xml b/sandbox/travelsample/shared-contributions/scatours-contribution/pom.xml index 500d23f4b8..7b55e0864f 100644 --- a/sandbox/travelsample/shared-contributions/scatours-contribution/pom.xml +++ b/sandbox/travelsample/shared-contributions/scatours-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.4</version> <!--relativePath>../../pom.xml</relativePath--> </parent> <artifactId>scatours-scatours-contribution</artifactId> @@ -32,50 +32,52 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca-api</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-currency-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-travelcatalog-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-tripbooking-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-shoppingcart-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> - + + <!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-paymentprocess-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> + --> <dependency> <groupId>junit</groupId> diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursImpl.java b/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursImpl.java index c0f7bec6ea..bfbf05ce02 100644 --- a/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursImpl.java +++ b/sandbox/travelsample/shared-contributions/scatours-contribution/src/scatours/SCAToursImpl.java @@ -34,7 +34,7 @@ import org.osoa.sca.annotations.Service; import scatours.common.TripItem; import scatours.common.TripLeg; -import scatours.paymentprocess.PaymentProcess; +//import scatours.paymentprocess.PaymentProcess; import scatours.shoppingcart.ShoppingCart; import scatours.travelcatalog.TravelCatalogSearch; import scatours.tripbooking.TripBooking; diff --git a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/pom.xml b/sandbox/travelsample/shared-contributions/shoppingcart-contribution/pom.xml index 79621c1370..e0867a02b5 100644 --- a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/pom.xml +++ b/sandbox/travelsample/shared-contributions/shoppingcart-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.4</version> <!--relativePath>../../pom.xml</relativePath--> </parent> <artifactId>scatours-shoppingcart-contribution</artifactId> @@ -32,32 +32,34 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca-api</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-currency-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> - + + <!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-paymentprocess-contribution</artifactId> - <version>1.5-SNAPSHOT</version> - </dependency> + <version>1.4</version> + </dependency> + --> <dependency> <groupId>junit</groupId> diff --git a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/scatours/shoppingcart/ShoppingCartImpl.java b/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/scatours/shoppingcart/ShoppingCartImpl.java index 5b6bc4007c..31b273bf47 100644 --- a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/scatours/shoppingcart/ShoppingCartImpl.java +++ b/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/scatours/shoppingcart/ShoppingCartImpl.java @@ -34,7 +34,7 @@ import org.osoa.sca.annotations.Service; import scatours.common.TripItem; -import scatours.paymentprocess.PaymentProcess; +//import scatours.paymentprocess.PaymentProcess; /** * An implementation of the Trip service diff --git a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml index c82a50c012..7d92cd2d11 100644 --- a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml +++ b/sandbox/travelsample/shared-contributions/travelcatalog-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.4</version> <!--relativePath>../../pom.xml</relativePath--> </parent> <artifactId>scatours-travelcatalog-contribution</artifactId> @@ -32,31 +32,31 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca-api</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-currency-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-tripbooking-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> diff --git a/sandbox/travelsample/shared-contributions/trip-contribution/pom.xml b/sandbox/travelsample/shared-contributions/trip-contribution/pom.xml index e858b5cf1e..e051ad885a 100644 --- a/sandbox/travelsample/shared-contributions/trip-contribution/pom.xml +++ b/sandbox/travelsample/shared-contributions/trip-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.4</version> <!--relativePath>../../pom.xml</relativePath--> </parent> <artifactId>scatours-trip-contribution</artifactId> @@ -32,19 +32,19 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca-api</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> diff --git a/sandbox/travelsample/shared-contributions/tripbooking-contribution/pom.xml b/sandbox/travelsample/shared-contributions/tripbooking-contribution/pom.xml index b0e7b2fef7..f90a8c4652 100644 --- a/sandbox/travelsample/shared-contributions/tripbooking-contribution/pom.xml +++ b/sandbox/travelsample/shared-contributions/tripbooking-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.4</version> <!--relativePath>../../pom.xml</relativePath--> </parent> <artifactId>scatours-tripbooking-contribution</artifactId> @@ -32,31 +32,31 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca-api</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-currency-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-shoppingcart-contribution</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </dependency> <dependency> |