You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/02/22 07:04:24 UTC

svn commit: r912490 - in /tuscany/sca-java-1.x/trunk/tutorials/travelsample: clients/currency-converter-ws-jaxws/ distribution/ distribution/jaxws/ distribution/src/main/assembly/ distribution/src/main/components/ distribution/src/main/resources/ servi...

Author: nash
Date: Mon Feb 22 06:04:23 2010
New Revision: 912490

URL: http://svn.apache.org/viewvc?rev=912490&view=rev
Log:
Make the JAX-WS runtime available when running the travel sample on JDK 5 (TUSCANY-3467)

Added:
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/jaxws/   (with props)
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/jaxws/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-jaxws.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-jaxws.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/jaxws-runtime/   (with props)
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml
Modified:
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/build.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/build.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/build.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/build.xml?rev=912490&r1=912489&r2=912490&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/build.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/build.xml Mon Feb 22 06:04:23 2010
@@ -34,11 +34,31 @@
         <ant dir="../../launchers/currency-converter-ws" target="run"/>
     </target>
 
-    <target name="run">
+    <target name="run" depends="is-jdk6, jaxws-jdk6, jaxws-jdk5">
         <java classname="scatours.CurrencyConverterWSClient" fork="true" failonerror="true">
             <classpath>
                 <pathelement location="target/${ant.project.name}.jar"/>
+                <path refid="jaxws-path"/>
             </classpath>
         </java>
     </target>
+
+    <!-- check to see if we are running on JDK 6 -->
+    <target name="is-jdk6">
+        <condition property="jdk6">
+            <available classname="javax.xml.ws.Service"/>
+        </condition>
+    </target>
+
+    <!-- JDK 6 contains JAX-WS so we don't need it on the classpath -->
+    <target name="jaxws-jdk6" if="jdk6">
+        <path id="jaxws-path"/>
+    </target>
+
+    <!-- on JDK 5 we need to add the JAX-WS runtime to the classpath -->
+    <target name="jaxws-jdk5" unless="jdk6">
+        <path id="jaxws-path">
+            <fileset dir="${env.JAXWS_HOME}/lib"/>
+        </path>
+    </target>
 </project>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml?rev=912490&r1=912489&r2=912490&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml Mon Feb 22 06:04:23 2010
@@ -71,11 +71,10 @@
                 <version>2.2</version>
                 <configuration>
                     <archive>
-                        <manifest>
-                            <addClasspath>${scatours.selfContained}</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
-                            <mainClass>scatours.CurrencyConverterWSClient</mainClass>
-                        </manifest>
+                        <manifestEntries>
+                            <Class-Path>../util/scatours-util-jaxws-runtime.jar</Class-Path>
+                            <Main-Class>scatours.CurrencyConverterWSClient</Main-Class>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>

Propchange: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/jaxws/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 22 06:04:23 2010
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml

Added: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/jaxws/pom.xml?rev=912490&view=auto
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/jaxws/pom.xml (added)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/jaxws/pom.xml Mon Feb 22 06:04:23 2010
@@ -0,0 +1,72 @@
+<?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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>scatours</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <version>1.0-SNAPSHOT</version>
+
+    <!-- This module brings in the JAX-WS runtime dependencies that are needed when running on JDK 5. -->
+    <artifactId>scatours-distribution-jaxws</artifactId>
+    <name>Apache Tuscany SCA Tours Distribution JAX-WS Dependencies for JDK 5</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-util-jaxws-runtime</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>distribution-package</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>../target</outputDirectory>
+                            <descriptors>
+                                <descriptor>../src/main/assembly/bin-jaxws.xml</descriptor>
+                            </descriptors>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                            <archiveBaseDirectory>..</archiveBaseDirectory>
+                            <outputDirectory>../target</outputDirectory>
+                            <finalName>apache-tuscany-scatours-${version}</finalName>
+                            <appendAssemblyId>true</appendAssemblyId>
+                            <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml?rev=912490&r1=912489&r2=912490&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml Mon Feb 22 06:04:23 2010
@@ -33,6 +33,7 @@
 
     <modules>
         <module>bundle</module>
+        <module>jaxws</module>
         <module>openejb</module>
     </modules>
 </project>

Added: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-jaxws.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-jaxws.xml?rev=912490&view=auto
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-jaxws.xml (added)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-jaxws.xml Mon Feb 22 06:04:23 2010
@@ -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>

Added: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-jaxws.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-jaxws.xml?rev=912490&view=auto
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-jaxws.xml (added)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-jaxws.xml Mon Feb 22 06:04:23 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml?rev=912490&r1=912489&r2=912490&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml Mon Feb 22 06:04:23 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml?rev=912490&r1=912489&r2=912490&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml Mon Feb 22 06:04:23 2010
@@ -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>
 

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/build.xml?rev=912490&r1=912489&r2=912490&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/build.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/build.xml Mon Feb 22 06:04:23 2010
@@ -23,9 +23,31 @@
     <!-- The "run" target starts a JAX-WS service endpoint for a simple
        credit card payment service.  This endpoint does not appear to be
        used currently anywhere else in the travel application. -->
-    <target name="run">
+    <target name="run" depends="is-jdk6, jaxws-jdk6, jaxws-jdk5">
         <java classname="scatours.creditcard.CreditCardServiceBootstrap" fork="true">
-            <classpath location="target/${ant.project.name}.jar"/>
+            <classpath>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <path refid="jaxws-path"/>
+            </classpath>
         </java>
     </target>
+
+    <!-- check to see if we are running on JDK 6 -->
+    <target name="is-jdk6">
+        <condition property="jdk6">
+            <available classname="javax.xml.ws.Endpoint"/>
+        </condition>
+    </target>
+
+    <!-- JDK 6 contains JAX-WS so we don't need it on the classpath -->
+    <target name="jaxws-jdk6" if="jdk6">
+        <path id="jaxws-path"/>
+    </target>
+
+    <!-- on JDK 5 we need to add the JAX-WS runtime to the classpath -->
+    <target name="jaxws-jdk5" unless="jdk6">
+        <path id="jaxws-path">
+            <fileset dir="${env.JAXWS_HOME}/lib"/>
+        </path>
+    </target>
 </project>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml?rev=912490&r1=912489&r2=912490&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml Mon Feb 22 06:04:23 2010
@@ -58,11 +58,10 @@
                 <version>2.2</version>
                 <configuration>
                     <archive>
-                        <manifest>
-                            <addClasspath>${scatours.selfContained}</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
-                            <mainClass>scatours.creditcard.CreditCardServiceBootstrap</mainClass>
-                        </manifest>
+                        <manifestEntries>
+                            <Class-Path>../util/scatours-util-jaxws-runtime.jar</Class-Path>
+                            <Main-Class>scatours.creditcard.CreditCardServiceBootstrap</Main-Class>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/build.xml?rev=912490&r1=912489&r2=912490&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/build.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/build.xml Mon Feb 22 06:04:23 2010
@@ -23,9 +23,31 @@
     <!-- The "run" target starts a JAX-WS service endpoint for the
        SMS gateway service.  This endpoint is used by the "run" target
        of the notification-ws launcher. -->
-    <target name="run">
+    <target name="run" depends="is-jdk6, jaxws-jdk6, jaxws-jdk5">
         <java classname="com.tuscanyscatours.smsgateway.SMSGatewayServiceBootstrap" fork="true">
-            <classpath location="target/${ant.project.name}.jar"/>
+            <classpath>
+                <pathelement location="target/${ant.project.name}.jar"/>
+                <path refid="jaxws-path"/>
+            </classpath>
         </java>
     </target>
+
+    <!-- check to see if we are running on JDK 6 -->
+    <target name="is-jdk6">
+        <condition property="jdk6">
+            <available classname="javax.xml.ws.Endpoint"/>
+        </condition>
+    </target>
+
+    <!-- JDK 6 contains JAX-WS so we don't need it on the classpath -->
+    <target name="jaxws-jdk6" if="jdk6">
+        <path id="jaxws-path"/>
+    </target>
+
+    <!-- on JDK 5 we need to add the JAX-WS runtime to the classpath -->
+    <target name="jaxws-jdk5" unless="jdk6">
+        <path id="jaxws-path">
+            <fileset dir="${env.JAXWS_HOME}/lib"/>
+        </path>
+    </target>
 </project>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml?rev=912490&r1=912489&r2=912490&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml Mon Feb 22 06:04:23 2010
@@ -58,11 +58,10 @@
                 <version>2.2</version>
                 <configuration>
                     <archive>
-                        <manifest>
-                            <addClasspath>${scatours.selfContained}</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
-                            <mainClass>com.tuscanyscatours.smsgateway.SMSGatewayServiceBootstrap</mainClass>
-                        </manifest>
+                        <manifestEntries>
+                            <Class-Path>../util/scatours-util-jaxws-runtime.jar</Class-Path>
+                            <Main-Class>com.tuscanyscatours.smsgateway.SMSGatewayServiceBootstrap</Main-Class>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>

Propchange: tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/jaxws-runtime/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 22 06:04:23 2010
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml

Added: tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml?rev=912490&view=auto
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml (added)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml Mon Feb 22 06:04:23 2010
@@ -0,0 +1,148 @@
+<?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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>scatours</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <version>1.0-SNAPSHOT</version>
+    <artifactId>scatours-util-jaxws-runtime</artifactId>
+    <name>Apache Tuscany SCA Tours JAX-WS Runtime Dependencies for JDK 5</name>
+
+    <profiles>
+        <profile>
+            <!-- The default profile produces a subset distribution which excludes
+               libraries that are present in the Tuscany SCA binary distro. -->
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.sun.xml.ws</groupId>
+                    <artifactId>jaxws-rt</artifactId>
+                    <version>2.1.7</version>
+                    <scope>runtime</scope>
+                    <exclusions>
+                        <!-- exclude the following because they are part of the Tuscany SCA binary distro -->
+                        <exclusion>
+                            <groupId>com.sun.xml.bind</groupId>
+                            <artifactId>jaxb-impl</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>javax.activation</groupId>
+                            <artifactId>activation</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>javax.xml.stream</groupId>
+                            <artifactId>stax-api</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>javax.xml.ws</groupId>
+                            <artifactId>jaxws-api</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>junit</groupId>
+                            <artifactId>junit</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.codehaus.woodstox</groupId>
+                            <artifactId>wstx-asl</artifactId>
+                        </exclusion>
+                        <!-- exclude the following because they aren't needed by the travel sample -->
+                        <exclusion>
+                            <groupId>com.sun.org.apache.xml.internal</groupId>
+                            <artifactId>resolver</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.jvnet</groupId>
+                            <artifactId>mimepull</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+
+                <dependency>
+                    <groupId>com.sun.net.httpserver</groupId>
+                    <artifactId>http</artifactId>
+                    <version>20070405</version>
+                    <scope>runtime</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                    <version>1.3</version>
+                    <scope>runtime</scope>
+                    <exclusions>
+                        <!-- exclude the following because it is part of the Tuscany SCA binary distro -->
+                        <exclusion>
+                            <groupId>javax.activation</groupId>
+                            <artifactId>activation</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <!-- Use mvn -Pselfcontained to produce a self-contained distribution
+               with all library dependencies included. -->
+            <id>selfcontained</id>
+            <dependencies>
+                <dependency>
+                    <groupId>com.sun.xml.ws</groupId>
+                    <artifactId>jaxws-rt</artifactId>
+                    <version>2.1.7</version>
+                    <scope>runtime</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>com.sun.net.httpserver</groupId>
+                    <artifactId>http</artifactId>
+                    <version>20070405</version>
+                    <scope>runtime</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>../jaxws/</classpathPrefix>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>       
+    </build>
+
+</project>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml?rev=912490&r1=912489&r2=912490&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml Mon Feb 22 06:04:23 2010
@@ -37,6 +37,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
+                <module>jaxws-runtime</module>
                 <module>launcher-common</module>
                 <module>openejb-runtime</module>
             </modules>