diff options
14 files changed, 395 insertions, 22 deletions
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 @@ <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>
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 @@ <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>
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 @@ +<?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>
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 @@ <modules> <module>bundle</module> + <module>jaxws</module> <module>openejb</module> </modules> </project> 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>
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 @@ <!-- 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>
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 @@ <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>
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 @@ <!-- 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>
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 @@ <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>
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 @@ +<?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>
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 @@ <activeByDefault>true</activeByDefault>
</activation>
<modules>
+ <module>jaxws-runtime</module>
<module>launcher-common</module>
<module>openejb-runtime</module>
</modules>
|