diff options
Diffstat (limited to '')
14 files changed, 114 insertions, 70 deletions
diff --git a/sandbox/travelsample/shared-contributions/calendar-contribution/pom.xml b/sandbox/travelsample/shared-contributions/calendar-contribution/pom.xml index 165ffa20b5..ac4004355c 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.4</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</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/sandbox/travelsample/shared-contributions/car-contribution/pom.xml b/sandbox/travelsample/shared-contributions/car-contribution/pom.xml index 7cfcf79d97..9728629bfe 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.4</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</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> diff --git a/sandbox/travelsample/shared-contributions/common-contribution/pom.xml b/sandbox/travelsample/shared-contributions/common-contribution/pom.xml index 6563b8d6ab..1a876f2539 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.4</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</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> diff --git a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/pom.xml b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/pom.xml index 137ed29d5b..edf5b6cc21 100644 --- a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/pom.xml +++ b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <!--relativePath>../../pom.xml</relativePath--> </parent> <artifactId>scatours-creditcard-payment-jaxb-contribution</artifactId> @@ -32,41 +32,41 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-api</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-impl</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-jetty</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/sandbox/travelsample/shared-contributions/currency-contribution/pom.xml b/sandbox/travelsample/shared-contributions/currency-contribution/pom.xml index f358d94f98..9897d0dcb8 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.4</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</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml b/sandbox/travelsample/shared-contributions/emailgateway-contribution/pom.xml index 302c9398b9..87d39db135 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.4</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</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-jetty</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/sandbox/travelsample/shared-contributions/flight-contribution/pom.xml b/sandbox/travelsample/shared-contributions/flight-contribution/pom.xml index b324946692..87420897e3 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.4</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</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> diff --git a/sandbox/travelsample/shared-contributions/hotel-contribution/pom.xml b/sandbox/travelsample/shared-contributions/hotel-contribution/pom.xml index b9c7483699..4d985fdf51 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.4</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</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> diff --git a/sandbox/travelsample/shared-contributions/pom.xml b/sandbox/travelsample/shared-contributions/pom.xml index 648c067f92..dec2e0b4a1 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</version> + <version>1.5-SNAPSHOT</version> <!--relativePath>../pom.xml</relativePath--> </parent> <artifactId>tuscany-scatours-common-contributions</artifactId> @@ -49,6 +49,7 @@ <module>tripbooking-contribution</module> <module>trip-contribution</module> <module>scatours-contribution</module> + <module>payment-java-contribution</module> </modules> </profile> diff --git a/sandbox/travelsample/shared-contributions/scatours-contribution/pom.xml b/sandbox/travelsample/shared-contributions/scatours-contribution/pom.xml index 816fbe11b4..6a29b5d00c 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.4</version> + <version>1.5-SNAPSHOT</version> <!--relativePath>../../pom.xml</relativePath--> </parent> <artifactId>scatours-scatours-contribution</artifactId> @@ -32,50 +32,50 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca-api</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-currency-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-travelcatalog-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-tripbooking-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-shoppingcart-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-paymentprocess-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> --> diff --git a/sandbox/travelsample/shared-contributions/shoppingcart-contribution/pom.xml b/sandbox/travelsample/shared-contributions/shoppingcart-contribution/pom.xml index 248c757067..0b90382703 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.4</version> + <version>1.5-SNAPSHOT</version> <!--relativePath>../../pom.xml</relativePath--> </parent> <artifactId>scatours-shoppingcart-contribution</artifactId> @@ -32,34 +32,32 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca-api</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-currency-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> - - <!-- + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>scatours-paymentprocess-contribution</artifactId> - <version>1.4</version> + <artifactId>scatours-payment-java-contribution</artifactId> + <version>1.5-SNAPSHOT</version> </dependency> - --> <dependency> <groupId>junit</groupId> @@ -72,5 +70,50 @@ <build> <finalName>${artifactId}</finalName> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>target/jaxws-source</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxws-maven-plugin</artifactId> + <version>1.9</version> + <executions> + <execution> + <id>payment</id> + <phase>generate-sources</phase> + <goals> + <goal>wsimport</goal> + </goals> + <configuration> + <packageName>payment</packageName> + <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory> + <wsdlFiles> + <wsdlFile>Payment.wsdl</wsdlFile> + </wsdlFiles> + <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> + <verbose>false</verbose> + <xnocompile>true</xnocompile> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> </project> diff --git a/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml b/sandbox/travelsample/shared-contributions/travelcatalog-contribution/pom.xml index 0622458c17..54e521d76b 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.4</version> + <version>1.5-SNAPSHOT</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.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-currency-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-tripbooking-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> diff --git a/sandbox/travelsample/shared-contributions/trip-contribution/pom.xml b/sandbox/travelsample/shared-contributions/trip-contribution/pom.xml index 4f2cb813fb..3c257ac4b1 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.4</version> + <version>1.5-SNAPSHOT</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.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> diff --git a/sandbox/travelsample/shared-contributions/tripbooking-contribution/pom.xml b/sandbox/travelsample/shared-contributions/tripbooking-contribution/pom.xml index 23cffc631f..66f006a670 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.4</version> + <version>1.5-SNAPSHOT</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.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-common-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-currency-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-shoppingcart-contribution</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </dependency> <dependency> |