From d11cbfda813c7c6b32c06ddb33242fe3c82514eb Mon Sep 17 00:00:00 2001 From: nash Date: Mon, 22 Feb 2010 06:04:23 +0000 Subject: Make the JAX-WS runtime available when running the travel sample on JDK 5 (TUSCANY-3467) git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@912490 13f79535-47bb-0310-9956-ffa450edef68 --- .../clients/currency-converter-ws-jaxws/build.xml | 22 ++- .../clients/currency-converter-ws-jaxws/pom.xml | 9 +- .../travelsample/distribution/jaxws/pom.xml | 72 ++++++++++ .../tutorials/travelsample/distribution/pom.xml | 1 + .../distribution/src/main/assembly/bin-jaxws.xml | 36 +++++ .../distribution/src/main/components/bin-jaxws.xml | 46 +++++++ .../src/main/resources/build-clients.xml | 6 +- .../src/main/resources/build-services.xml | 6 +- .../services/creditcard-payment-jaxws/build.xml | 26 +++- .../services/creditcard-payment-jaxws/pom.xml | 9 +- .../services/smsgateway-jaxws/build.xml | 26 +++- .../travelsample/services/smsgateway-jaxws/pom.xml | 9 +- .../travelsample/util/jaxws-runtime/pom.xml | 148 +++++++++++++++++++++ .../trunk/tutorials/travelsample/util/pom.xml | 1 + 14 files changed, 395 insertions(+), 22 deletions(-) create mode 100644 sca-java-1.x/trunk/tutorials/travelsample/distribution/jaxws/pom.xml create mode 100644 sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-jaxws.xml create mode 100644 sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-jaxws.xml create mode 100644 sca-java-1.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml (limited to 'sca-java-1.x/trunk') diff --git a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/build.xml index 04eae98f06..116f2999ba 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/build.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/build.xml @@ -34,11 +34,31 @@ - + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml index d4193a9829..e2ffe7a09d 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml @@ -71,11 +71,10 @@ 2.2 - - ${scatours.selfContained} - ../lib/ - scatours.CurrencyConverterWSClient - + + ../util/scatours-util-jaxws-runtime.jar + scatours.CurrencyConverterWSClient + diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/jaxws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/jaxws/pom.xml new file mode 100644 index 0000000000..08c654a1a4 --- /dev/null +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/jaxws/pom.xml @@ -0,0 +1,72 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + scatours + 1.0-SNAPSHOT + ../../pom.xml + + 1.0-SNAPSHOT + + + scatours-distribution-jaxws + Apache Tuscany SCA Tours Distribution JAX-WS Dependencies for JDK 5 + pom + + + + org.apache.tuscany.sca + scatours-util-jaxws-runtime + 1.0-SNAPSHOT + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + distribution-package + package + + single + + + ../target + + ../src/main/assembly/bin-jaxws.xml + + gnu + .. + ../target + apache-tuscany-scatours-${version} + true + true + + + + + + + diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml index b4b97bf52c..461f08cdb2 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml @@ -33,6 +33,7 @@ bundle + jaxws openejb diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-jaxws.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-jaxws.xml new file mode 100644 index 0000000000..b900b1bcb5 --- /dev/null +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-jaxws.xml @@ -0,0 +1,36 @@ + + + + + + true + tuscany-scatours-${version} + + dir + + + + + ../src/main/components/bin-jaxws.xml + + diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-jaxws.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-jaxws.xml new file mode 100644 index 0000000000..f139569c23 --- /dev/null +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-jaxws.xml @@ -0,0 +1,46 @@ + + + + + + + false + util + ${artifact.artifactId}.${artifact.extension} + false + + org.apache.tuscany.sca:scatours-util-jaxws-runtime + + runtime + + + + + false + jaxws + false + + org.apache.tuscany.sca:scatours-util-jaxws-runtime + + runtime + + + + diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml index 95b97ca0c6..98a3b2c345 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml @@ -44,7 +44,11 @@ - + + + + + diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml index 006410c3aa..6154f0b451 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml @@ -38,7 +38,11 @@ - + + + + + diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/build.xml index 515df819c3..266dbec28c 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/build.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/build.xml @@ -23,9 +23,31 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml index c95a32815a..958292698e 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml @@ -58,11 +58,10 @@ 2.2 - - ${scatours.selfContained} - ../lib/ - scatours.creditcard.CreditCardServiceBootstrap - + + ../util/scatours-util-jaxws-runtime.jar + scatours.creditcard.CreditCardServiceBootstrap + diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/build.xml index be9830cc1b..6c57e2420b 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/build.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/build.xml @@ -23,9 +23,31 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml index 233460e54f..a833c03b9e 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml @@ -58,11 +58,10 @@ 2.2 - - ${scatours.selfContained} - ../lib/ - com.tuscanyscatours.smsgateway.SMSGatewayServiceBootstrap - + + ../util/scatours-util-jaxws-runtime.jar + com.tuscanyscatours.smsgateway.SMSGatewayServiceBootstrap + diff --git a/sca-java-1.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml new file mode 100644 index 0000000000..7f02dc408e --- /dev/null +++ b/sca-java-1.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml @@ -0,0 +1,148 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + scatours + 1.0-SNAPSHOT + ../../pom.xml + + 1.0-SNAPSHOT + scatours-util-jaxws-runtime + Apache Tuscany SCA Tours JAX-WS Runtime Dependencies for JDK 5 + + + + + default + + true + + + + com.sun.xml.ws + jaxws-rt + 2.1.7 + runtime + + + + com.sun.xml.bind + jaxb-impl + + + javax.activation + activation + + + javax.xml.stream + stax-api + + + javax.xml.ws + jaxws-api + + + junit + junit + + + org.codehaus.woodstox + wstx-asl + + + + com.sun.org.apache.xml.internal + resolver + + + org.jvnet + mimepull + + + + + + com.sun.net.httpserver + http + 20070405 + runtime + + + + javax.xml.soap + saaj-api + 1.3 + runtime + + + + javax.activation + activation + + + + + + + + + selfcontained + + + com.sun.xml.ws + jaxws-rt + 2.1.7 + runtime + + + + com.sun.net.httpserver + http + 20070405 + runtime + + + + + + + ${artifactId} + + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + + true + ../jaxws/ + + + + + + + + diff --git a/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml index 60d2a08ba9..7f987f9afd 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml @@ -37,6 +37,7 @@ true + jaxws-runtime launcher-common openejb-runtime -- cgit v1.2.3