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

4 files changed, 92 insertions, 2 deletions

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 @@
+<?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.

+-->

+<assembly>

+    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->

+    <id></id>

+    <includeBaseDirectory>true</includeBaseDirectory>

+    <baseDirectory>tuscany-scatours-${version}</baseDirectory>

+    <formats>

+        <format>dir</format>

+<!--

+        <format>tar.gz</format>

+        <format>zip</format>

+-->

+    </formats>

+

+    <componentDescriptors>

+        <componentDescriptor>../src/main/components/bin-jaxws.xml</componentDescriptor>

+    </componentDescriptors>

+</assembly>

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 @@
+<!--

+    * 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.

+-->

+<component>

+

+    <dependencySets>

+        <!-- Add scatours-util-jaxws-runtime.jar to the util directory -->

+        <dependencySet>

+            <useProjectArtifact>false</useProjectArtifact>

+            <outputDirectory>util</outputDirectory>

+            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>

+            <unpack>false</unpack>

+            <includes>

+                <include>org.apache.tuscany.sca:scatours-util-jaxws-runtime</include>

+            </includes>

+            <scope>runtime</scope>

+        </dependencySet>

+

+        <!-- Add the JAX-WS runtime dependencies to the jaxws directory -->

+        <dependencySet>

+            <useProjectArtifact>false</useProjectArtifact>

+            <outputDirectory>jaxws</outputDirectory>

+            <unpack>false</unpack>

+            <excludes>

+                <exclude>org.apache.tuscany.sca:scatours-util-jaxws-runtime</exclude>

+            </excludes>

+            <scope>runtime</scope>

+        </dependencySet>

+    </dependencySets>

+

+</component>

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 @@
 

     <target name="run-currency-converter-ws-jaxws">

         <java classname="scatours.CurrencyConverterWSClient" fork="true" failonerror="true">

-            <classpath location="scatours-client-currency-converter-ws-jaxws.jar"/>

+            <classpath>

+                <pathelement location="scatours-client-currency-converter-ws-jaxws.jar"/>

+                <!-- The following is used to bring in additional dependencies of the JAX-WS runtime. -->

+                <path refid="scatours.tuscany-manifest"/>

+            </classpath>

         </java>

     </target>

 </project>

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 @@
 

     <target name="run-smsgateway-jaxws">

         <java classname="com.tuscanyscatours.smsgateway.SMSGatewayServiceBootstrap" fork="true">

-            <classpath location="scatours-service-smsgateway-jaxws.jar"/>

+            <classpath>

+                <pathelement location="scatours-service-smsgateway-jaxws.jar"/>

+                <!-- The following is used to bring in additional dependencies of the JAX-WS runtime. -->

+                <path refid="scatours.tuscany-manifest"/>

+            </classpath>

         </java>

     </target>