[jbossws-commits] JBossWS SVN: r3364 - in trunk/integration: native/src/main/etc and 5 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Jun 1 10:24:52 EDT 2007
Author: heiko.braun at jboss.com
Date: 2007-06-01 10:24:52 -0400 (Fri, 01 Jun 2007)
New Revision: 3364
Modified:
trunk/integration/native/ant-import/build-distro.xml
trunk/integration/native/src/main/etc/bindist-build.xml
trunk/integration/spi/etc/wsconsume.sh
trunk/integration/spi/etc/wsprovide.sh
trunk/integration/sunri/ant-import/build-distro.xml
trunk/integration/sunri/src/main/etc/bindist-build.xml
trunk/integration/xfire/ant-import/build-distro.xml
trunk/integration/xfire/src/main/etc/bindist-build.xml
Log:
Allow tools execution from distribution
Modified: trunk/integration/native/ant-import/build-distro.xml
===================================================================
--- trunk/integration/native/ant-import/build-distro.xml 2007-06-01 13:30:00 UTC (rev 3363)
+++ trunk/integration/native/ant-import/build-distro.xml 2007-06-01 14:24:52 UTC (rev 3364)
@@ -21,13 +21,14 @@
<property name="bindist.dir" value="${native.output.dir}/jbossws-native-${version.id}"/>
<property name="bindist.build.dir" value="${bindist.dir}/build"/>
+ <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
<property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
<property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
<property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
<delete dir="${bindist.dir}"/>
<mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.lib.dir}/thirdparty"/>
+ <mkdir dir="${bindist.bin.dir}"/>
<mkdir dir="${bindist.docs.dir}"/>
<mkdir dir="${bindist.tests.dir}"/>
@@ -53,10 +54,6 @@
<fileset dir="${spi.dir}/ant-import">
<include name="macros-deploy-spi.xml"/>
</fileset>
- <fileset dir="${spi.dir}/etc">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </fileset>
<fileset dir="${int.xfire.dir}/ant-import">
<include name="macros-deploy-xfire.xml"/>
</fileset>
@@ -65,6 +62,14 @@
</fileset>
</copy>
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${spi.dir}/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
+
<!-- docs -->
<copy todir="${bindist.docs.dir}">
<fileset dir="${build.dir}/etc">
@@ -75,8 +80,11 @@
<!-- lib -->
<copy todir="${bindist.lib.dir}" overwrite="true">
<fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
+ <include name="jbossws-spi.jar"/>
</fileset>
+ <fileset dir="${spi.dir}/thirdparty">
+ <include name="getopt.jar"/>
+ </fileset>
<fileset dir="${int.jboss42.dir}/output/lib">
<include name="jbossws-jboss42.jar"/>
</fileset>
@@ -96,8 +104,6 @@
<include name="jbossws-native50.sar"/>
<include name="jbossws-native50-deployer.zip"/>
</fileset>
- </copy>
- <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true">
<fileset dir="${core.dir}/thirdparty">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -106,7 +112,7 @@
<include name="jaxws-rt.jar"/>
<include name="juddi-service.sar"/>
<include name="policy.jar"/>
- <include name="wsdl4j.jar"/>
+ <include name="wsdl4j.jar"/>
</fileset>
</copy>
Modified: trunk/integration/native/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-01 13:30:00 UTC (rev 3363)
+++ trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-01 14:24:52 UTC (rev 3364)
@@ -18,6 +18,7 @@
<!-- ================================================================== -->
<property name="build.dir" value="${basedir}/build"/>
+ <property name="bin.dir" value="${basedir}/bin"/>
<property name="docs.dir" value="${basedir}/docs"/>
<property name="lib.dir" value="${basedir}/lib"/>
<property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/>
@@ -132,11 +133,11 @@
jbosslibs="${lib.dir}"
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}/thirdparty"/>
+ thirdpartylibs="${lib.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
- spiscripts="${build.dir}"
+ spiscripts="${bin.dir}"
thirdpartylibs="${lib.dir}"/>
</target>
@@ -155,10 +156,10 @@
jbosslibs="${lib.dir}"
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}/thirdparty"/>
+ thirdpartylibs="${lib.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
- spiscripts="${lib.dir}"
+ spiscripts="${bin.dir}"
thirdpartylibs="${lib.dir}"/>
</target>
Modified: trunk/integration/spi/etc/wsconsume.sh
===================================================================
--- trunk/integration/spi/etc/wsconsume.sh 2007-06-01 13:30:00 UTC (rev 3363)
+++ trunk/integration/spi/etc/wsconsume.sh 2007-06-01 14:24:52 UTC (rev 3364)
@@ -1,6 +1,12 @@
#!/bin/sh
-# $Id: wsgen.sh 2158 2007-01-27 06:20:59Z jason.greene at jboss.com $
+#
+# Invoke wsconsume with dynamic classpath
+# depending on the deployed stack and the location
+#
+# @author Heiko.Braun at jboss.com
+# @version $Id: $
+#
DIRNAME=`dirname $0`
PROGNAME=`basename $0`
@@ -46,49 +52,66 @@
# Setup the java endorsed dirs
JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
-# is it a JBossWS-native or SunRI installation?
-if [ -a $JBOSS_HOME/client/jbossws-client.jar ]; then
+###
+# Setup the LIBDIR
+# This script maybe used form within the jbossws distribution
+# or instaled under JBOSS_HOME/bin
+###
+
+PARENT=`cd $DIRNAME/..; pwd`
+if [ -d $PARENT/client ]; then
+ LIBDIR=$JBOSS_HOME/client
+else
+ LIBDIR=$PARENT/lib
+fi
+
+# Is it a JBossWS-native or SunRI installation?
+if [ -a $LIBDIR/jbossws-client.jar ]; then
JBOSSWS_NATIVE="true"
fi
-#
+###
# Setup the wsconsume classpath
# The classpath is dynamically build depending on the stack that
# is deployed. See $JBOSSWS_NATIVE above.
-#
+###
# shared libs
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JAVA_HOME/lib/tools.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/activation.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/getopt.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/wstx.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/mail.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/activation.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/getopt.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/wstx.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossall-client.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/log4j.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/mail.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-spi.jar"
# shared jaxws libs
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxws-tools.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxws-rt.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/stax-api.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-tools.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-rt.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-api.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-impl.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-xjc.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-api.jar"
# stack specific dependencies
if [ "x$JBOSSWS_NATIVE" = "x" ]; then
echo "Seems to be a Sun-RI stack deployed"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-sunri-client.jar"
+ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-sunri-client.jar"
else
echo "Seems to be a JBossWS-Native stack deployed"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
- WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
+ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/javassist.jar"
+ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-xml-binding.jar"
+ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-client.jar"
+ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxws.jar"
+ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar"
+ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-saaj.jar"
fi
+###
+# Execute the JVM
+###
+
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
@@ -97,7 +120,6 @@
JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
fi
-# Execute the JVM
"$JAVA" $JAVA_OPTS \
-Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
-Dlog4j.configuration=wstools-log4j.xml \
Modified: trunk/integration/spi/etc/wsprovide.sh
===================================================================
--- trunk/integration/spi/etc/wsprovide.sh 2007-06-01 13:30:00 UTC (rev 3363)
+++ trunk/integration/spi/etc/wsprovide.sh 2007-06-01 14:24:52 UTC (rev 3364)
@@ -1,6 +1,12 @@
#!/bin/sh
-# $Id: wsprovide.sh 3101 2007-05-16 08:26:33Z heiko.braun at jboss.com $
+#
+# Invoke wsprovide with dynamic classpath
+# depending on the deployed stack and the location
+#
+# @author Heiko.Braun at jboss.com
+# @version $Id: $
+#
DIRNAME=`dirname $0`
PROGNAME=`basename $0`
@@ -46,56 +52,73 @@
# Setup the java endorsed dirs
JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
+###
+# Setup the LIBDIR
+# This script maybe used form within the jbossws distribution
+# or instaled under JBOSS_HOME/bin
+###
+
+PARENT=`cd $DIRNAME/..; pwd`
+if [ -d $PARENT/client ]; then
+ LIBDIR=$JBOSS_HOME/client
+else
+ LIBDIR=$PARENT/lib
+fi
+
# is it a JBossWS-native or SunRI installation?
-if [ -a $JBOSS_HOME/client/jbossws-client.jar ]; then
+if [ -a $LIBDIR/jbossws-client.jar ]; then
JBOSSWS_NATIVE="true"
fi
-#
+###
# Setup the wsprovide classpath
# The classpath is dynamically build depending on the stack that
# is deployed. See $JBOSSWS_NATIVE above.
-#
+###
# shared libs
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JAVA_HOME/lib/tools.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/activation.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/getopt.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-spi.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/activation.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/getopt.jar"
# TODO: verify jbossall-client.jar dependency. It might be just logging
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/mail.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/log4j.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/mail.jar"
# shared jaxws libs
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxws-tools.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxws-rt.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-api.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-impl.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-xjc.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-tools.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-rt.jar"
# stack specific dependencies
if [ "x$JBOSSWS_NATIVE" = "x" ]; then
echo "Seems to be a Sun-RI stack deployed"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-sunri-client.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxws-api.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jsr181-api.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/saaj-impl.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-sunri-client.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jsr181-api.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-api.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-impl.jar"
else
echo "Seems to be a JBossWS-Native stack deployed"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/policy.jar"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-xml-binding.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/javassist.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-client.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxws.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-saaj.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/policy.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wsdl4j.jar"
fi
+###
+# Execute the JVM
+###
+
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
@@ -104,7 +127,6 @@
JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
fi
-# Execute the JVM
"$JAVA" $JAVA_OPTS \
-Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
-Dlog4j.configuration=wstools-log4j.xml \
Modified: trunk/integration/sunri/ant-import/build-distro.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-distro.xml 2007-06-01 13:30:00 UTC (rev 3363)
+++ trunk/integration/sunri/ant-import/build-distro.xml 2007-06-01 14:24:52 UTC (rev 3364)
@@ -23,6 +23,7 @@
<ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
<property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/>
+ <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
<property name="bindist.build.dir" value="${bindist.dir}/build"/>
<property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
<property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
@@ -30,7 +31,7 @@
<delete dir="${bindist.dir}"/>
<mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.lib.dir}/thirdparty"/>
+ <mkdir dir="${bindist.bin.dir}"/>
<mkdir dir="${bindist.docs.dir}"/>
<mkdir dir="${bindist.tests.dir}"/>
@@ -55,11 +56,7 @@
</fileset>
<fileset dir="${spi.dir}/ant-import">
<include name="macros-deploy-spi.xml"/>
- </fileset>
- <fileset dir="${spi.dir}/etc">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </fileset>
+ </fileset>
<fileset dir="${int.xfire.dir}/ant-import">
<include name="macros-deploy-xfire.xml"/>
</fileset>
@@ -68,6 +65,14 @@
</fileset>
</copy>
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${spi.dir}/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
+
<!-- docs -->
<copy todir="${bindist.docs.dir}">
<fileset dir="${build.dir}/etc">
@@ -80,6 +85,9 @@
<fileset dir="${spi.dir}/output/lib">
<include name="jbossws-spi.jar"/>
</fileset>
+ <fileset dir="${spi.dir}/thirdparty">
+ <include name="getopt.jar"/>
+ </fileset>
<fileset dir="${int.jboss42.dir}/output/lib">
<include name="jbossws-jboss42.jar"/>
</fileset>
@@ -91,9 +99,8 @@
<include name="jbossws-sunri42.sar"/>
<include name="jbossws-sunri50.sar"/>
<include name="jbossws-sunri50-deployer.zip"/>
+ <include name="jbossws-sunri-client.jar"/>
</fileset>
- </copy>
- <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true">
<fileset dir="${int.sunri.dir}/thirdparty"/>
</copy>
Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-01 13:30:00 UTC (rev 3363)
+++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-06-01 14:24:52 UTC (rev 3364)
@@ -50,6 +50,7 @@
<available property="jboss42.available" file="${jboss42.available.file}"/>
<import file="${basedir}/build/build-testsuite.xml"/>
+ <import file="${basedir}/build/macros-deploy-spi.xml"/>
<import file="${basedir}/build/macros-deploy-native.xml"/>
<import file="${basedir}/build/macros-deploy-sunri.xml"/>
<import file="${basedir}/build/macros-deploy-xfire.xml"/>
@@ -139,7 +140,7 @@
spilibs="${lib.dir}"
jbosslibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}/thirdparty"/>
+ thirdpartylibs="${lib.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
@@ -161,7 +162,7 @@
spilibs="${lib.dir}"
jbosslibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}/thirdparty"/>
+ thirdpartylibs="${lib.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
Modified: trunk/integration/xfire/ant-import/build-distro.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-distro.xml 2007-06-01 13:30:00 UTC (rev 3363)
+++ trunk/integration/xfire/ant-import/build-distro.xml 2007-06-01 14:24:52 UTC (rev 3364)
@@ -13,96 +13,110 @@
<project>
- <!-- ================================================================== -->
- <!-- Binary distribution JBossWS/XFire -->
- <!-- ================================================================== -->
-
- <target name="binary-dist" depends="jars" description="Build the binary distribution">
-
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
- <ant antfile="${int.sunri.dir}/build.xml" target="thirdparty" inheritall="false"/>
-
- <property name="bindist.dir" value="${xfire.output.dir}/jbossws-xfire-${version.id}"/>
- <property name="bindist.build.dir" value="${bindist.dir}/build"/>
- <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
- <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
- <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
+ <!-- ================================================================== -->
+ <!-- Binary distribution JBossWS/XFire -->
+ <!-- ================================================================== -->
- <delete dir="${bindist.dir}"/>
- <mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.lib.dir}/thirdparty/client"/>
- <mkdir dir="${bindist.docs.dir}"/>
- <mkdir dir="${bindist.tests.dir}"/>
-
- <!-- root -->
- <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example"/>
- <copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bindist-build.xml"/>
- <copy todir="${bindist.dir}" file="${xfire.dir}/version.properties"/>
-
- <!-- build -->
- <copy todir="${bindist.build.dir}">
- <fileset dir="${build.dir}">
- <include name="version.properties"/>
- </fileset>
- <fileset dir="${build.dir}/ant-import">
- <include name="build-testsuite.xml"/>
- </fileset>
- <fileset dir="${int.native.dir}/ant-import">
- <include name="macros-deploy-native.xml"/>
- </fileset>
- <fileset dir="${int.sunri.dir}/ant-import">
- <include name="macros-deploy-sunri.xml"/>
- </fileset>
- <fileset dir="${int.xfire.dir}/ant-import">
- <include name="macros-deploy-xfire.xml"/>
- </fileset>
- <fileset dir="${testsuite.dir}/ant-import">
- <include name="build-jars-jaxws.xml"/>
- </fileset>
- </copy>
-
- <!-- docs -->
- <copy todir="${bindist.docs.dir}">
- <fileset dir="${build.dir}/etc">
- <include name="JBossORG-EULA.txt"/>
- </fileset>
- </copy>
-
- <!-- lib -->
- <copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="${int.xfire.dir}/output/lib">
- <include name="jbossws-context.war"/>
- <include name="jbossws-xfire42.sar"/>
- <include name="jbossws-xfire50.sar"/>
- <include name="jbossws-xfire50-deployer.zip"/>
- </fileset>
- </copy>
- <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true">
- <fileset dir="${int.xfire.dir}/thirdparty"/>
- </copy>
- <copy todir="${bindist.lib.dir}/thirdparty/client" overwrite="true">
- <fileset dir="${int.sunri.dir}/thirdparty"/>
- </copy>
-
- <!-- tests -->
- <copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${testsuite.dir}/src"/>
- <fileset dir="${int.xfire.dir}/src/test"/>
- </copy>
-
- <zip destfile="${xfire.output.dir}/jbossws-xfire-${version.id}.zip">
- <fileset dir="${xfire.output.dir}" includes="jbossws-xfire-${version.id}/**"/>
- </zip>
- </target>
-
+ <target name="binary-dist" depends="jars" description="Build the binary distribution">
+
+ <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${int.sunri.dir}/build.xml" target="thirdparty" inheritall="false"/>
+
+ <property name="bindist.dir" value="${xfire.output.dir}/jbossws-xfire-${version.id}"/>
+ <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
+ <property name="bindist.build.dir" value="${bindist.dir}/build"/>
+ <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
+ <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
+ <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
+
+ <delete dir="${bindist.dir}"/>
+ <mkdir dir="${bindist.build.dir}"/>
+ <mkdir dir="${bindist.bin.dir}"/>
+ <mkdir dir="${bindist.lib.dir}/thirdparty/client"/>
+ <mkdir dir="${bindist.docs.dir}"/>
+ <mkdir dir="${bindist.tests.dir}"/>
+
+ <!-- root -->
+ <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example"/>
+ <copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bindist-build.xml"/>
+ <copy todir="${bindist.dir}" file="${xfire.dir}/version.properties"/>
+
+ <!-- build -->
+ <copy todir="${bindist.build.dir}">
+ <fileset dir="${build.dir}">
+ <include name="version.properties"/>
+ </fileset>
+ <fileset dir="${build.dir}/ant-import">
+ <include name="build-testsuite.xml"/>
+ </fileset>
+ <fileset dir="${int.native.dir}/ant-import">
+ <include name="macros-deploy-native.xml"/>
+ </fileset>
+ <fileset dir="${int.sunri.dir}/ant-import">
+ <include name="macros-deploy-sunri.xml"/>
+ </fileset>
+ <fileset dir="${spi.dir}/ant-import">
+ <include name="macros-deploy-spi.xml"/>
+ </fileset>
+ <fileset dir="${int.xfire.dir}/ant-import">
+ <include name="macros-deploy-xfire.xml"/>
+ </fileset>
+ <fileset dir="${testsuite.dir}/ant-import">
+ <include name="build-jars-jaxws.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${spi.dir}/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
+
+ <!-- docs -->
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${build.dir}/etc">
+ <include name="JBossORG-EULA.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- lib -->
+ <copy todir="${bindist.lib.dir}" overwrite="true">
+ <fileset dir="${spi.dir}/output/lib">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="${spi.dir}/thirdparty">
+ <include name="getopt.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss50.dir}/output/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="${int.xfire.dir}/output/lib">
+ <include name="jbossws-context.war"/>
+ <include name="jbossws-xfire42.sar"/>
+ <include name="jbossws-xfire50.sar"/>
+ <include name="jbossws-xfire50-deployer.zip"/>
+ </fileset>
+
+ <!-- TODO: Verify this doesnt clash -->
+ <fileset dir="${int.xfire.dir}/thirdparty"/>
+ <fileset dir="${int.sunri.dir}/thirdparty"/>
+ </copy>
+
+ <!-- tests -->
+ <copy todir="${bindist.tests.dir}" overwrite="true">
+ <fileset dir="${testsuite.dir}/src"/>
+ <fileset dir="${int.xfire.dir}/src/test"/>
+ </copy>
+
+ <zip destfile="${xfire.output.dir}/jbossws-xfire-${version.id}.zip">
+ <fileset dir="${xfire.output.dir}" includes="jbossws-xfire-${version.id}/**"/>
+ </zip>
+ </target>
+
</project>
Modified: trunk/integration/xfire/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-06-01 13:30:00 UTC (rev 3363)
+++ trunk/integration/xfire/src/main/etc/bindist-build.xml 2007-06-01 14:24:52 UTC (rev 3364)
@@ -12,188 +12,200 @@
<!-- $Id$ -->
<project default="main" basedir="." name="JBossWS/XFire">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="build.dir" value="${basedir}/build"/>
- <property name="docs.dir" value="${basedir}/docs"/>
- <property name="lib.dir" value="${basedir}/lib"/>
- <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/>
- <property name="tests.dir" value="${basedir}/tests"/>
- <property name="tests.output.dir" value="${tests.dir}/output"/>
-
- <property file="${basedir}/ant.properties"/>
- <property file="${basedir}/version.properties"/>
- <property file="${build.dir}/version.properties"/>
-
- <property name="jboss50.lib" value="${jboss50.home}/lib"/>
- <property name="jboss50.client" value="${jboss50.home}/client"/>
- <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
- <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
- <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
- <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
-
- <property name="jboss42.lib" value="${jboss42.home}/lib"/>
- <property name="jboss42.client" value="${jboss42.home}/client"/>
- <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
- <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
- <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
- <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
-
- <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
- <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
-
- <available property="jboss50.available" file="${jboss50.available.file}"/>
- <available property="jboss42.available" file="${jboss42.available.file}"/>
-
- <import file="${basedir}/build/build-testsuite.xml"/>
- <import file="${basedir}/build/macros-deploy-native.xml"/>
- <import file="${basedir}/build/macros-deploy-sunri.xml"/>
- <import file="${basedir}/build/macros-deploy-xfire.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
-
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="jboss.home" value="${jboss42.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
- <!-- Define excludesfile -->
- <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
- </target>
-
- <target name="tests-init" depends="prepare,tests-classpath">
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
- <!--
- Cannot use XFire client
- [JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap
- -->
-
- <path id="sunri.classpath">
- <pathelement location="${thirdparty.dir}/client/FastInfoset.jar"/>
- <pathelement location="${thirdparty.dir}/client/http.jar"/>
- <pathelement location="${thirdparty.dir}/client/jaxws-api.jar"/>
- <pathelement location="${thirdparty.dir}/client/jaxws-rt.jar"/>
- <pathelement location="${thirdparty.dir}/client/jaxws-tools.jar"/>
- <pathelement location="${thirdparty.dir}/client/jsr173_api.jar"/>
- <pathelement location="${thirdparty.dir}/client/jsr181-api.jar"/>
- <pathelement location="${thirdparty.dir}/client/jsr250-api.jar"/>
- <pathelement location="${thirdparty.dir}/client/resolver.jar"/>
- <pathelement location="${thirdparty.dir}/client/saaj-api.jar"/>
- <pathelement location="${thirdparty.dir}/client/saaj-impl.jar"/>
- <pathelement location="${thirdparty.dir}/client/sjsxp.jar"/>
- <pathelement location="${thirdparty.dir}/client/stax-ex.jar"/>
- <pathelement location="${thirdparty.dir}/client/streambuffer.jar"/>
- <pathelement location="${thirdparty.dir}/client/wstx.jar"/>
- </path>
-
- <path id="xfire.classpath">
- <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
- <pathelement location="${thirdparty.dir}/jdom.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
- <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
- <pathelement location="${thirdparty.dir}/xfire-all.jar"/>
- <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/>
- </path>
-
- <path id="ws.stack.classpath">
- <path refid="sunri.classpath"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${lib.dir}/jbossws-spi.jar"/>
- </path>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init">
- <macro-copy-resources srcdir="${tests.dir}"/>
- </target>
-
- <target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
- </target>
-
- <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
-
- <!-- ================================================================== -->
- <!-- Deployment -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/xfire to jboss50 -->
- <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/xfire to jboss50">
- <macro-undeploy-native50/>
- <macro-undeploy-sunri50/>
- <macro-deploy-xfire50
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}/thirdparty"/>
- </target>
-
- <!-- Remove jbossws/xfire from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
- <macro-undeploy-xfire50/>
- </target>
-
- <!-- Deploy jbossws/xfire to jboss42 -->
- <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/xfire to jboss42">
- <macro-undeploy-native42/>
- <macro-undeploy-sunri42/>
- <macro-deploy-xfire42
- spilibs="${lib.dir}"
- jbosslibs="${lib.dir}"
- stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}/thirdparty"/>
- </target>
-
- <!-- Remove jbossws/xfire from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
- <macro-undeploy-xfire42/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- </target>
-
- <target name="main" depends="most" description="Executes the default target (most)."/>
-
- <target name="most" depends="tests-main" description="Builds almost everything."/>
-
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="bin.dir" value="${basedir}/bin"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+ <property name="tests.output.dir" value="${tests.dir}/output"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+ <property file="${build.dir}/version.properties"/>
+
+ <property name="jboss50.lib" value="${jboss50.home}/lib"/>
+ <property name="jboss50.client" value="${jboss50.home}/client"/>
+ <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
+ <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
+ <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
+ <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+
+ <property name="jboss42.lib" value="${jboss42.home}/lib"/>
+ <property name="jboss42.client" value="${jboss42.home}/client"/>
+ <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
+ <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
+ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+
+ <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+
+ <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+
+ <available property="jboss50.available" file="${jboss50.available.file}"/>
+ <available property="jboss42.available" file="${jboss42.available.file}"/>
+
+ <import file="${basedir}/build/build-testsuite.xml"/>
+ <import file="${basedir}/build/macros-deploy-spi.xml"/>
+ <import file="${basedir}/build/macros-deploy-native.xml"/>
+ <import file="${basedir}/build/macros-deploy-sunri.xml"/>
+ <import file="${basedir}/build/macros-deploy-xfire.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss50.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss42.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+
+ <!-- Define excludesfile -->
+ <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+
+ </target>
+
+ <target name="tests-init" depends="prepare,tests-classpath">
+
+ <!--
+ Cannot use XFire client
+ [JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap
+ -->
+
+ <path id="sunri.classpath">
+ <pathelement location="${thirdparty.dir}/client/FastInfoset.jar"/>
+ <pathelement location="${thirdparty.dir}/client/http.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jaxws-rt.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jaxws-tools.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jsr173_api.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jsr181-api.jar"/>
+ <pathelement location="${thirdparty.dir}/client/jsr250-api.jar"/>
+ <pathelement location="${thirdparty.dir}/client/resolver.jar"/>
+ <pathelement location="${thirdparty.dir}/client/saaj-api.jar"/>
+ <pathelement location="${thirdparty.dir}/client/saaj-impl.jar"/>
+ <pathelement location="${thirdparty.dir}/client/sjsxp.jar"/>
+ <pathelement location="${thirdparty.dir}/client/stax-ex.jar"/>
+ <pathelement location="${thirdparty.dir}/client/streambuffer.jar"/>
+ <pathelement location="${thirdparty.dir}/client/wstx.jar"/>
+ </path>
+
+ <path id="xfire.classpath">
+ <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jdom.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
+ <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
+ <pathelement location="${thirdparty.dir}/xfire-all.jar"/>
+ <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/>
+ </path>
+
+ <path id="ws.stack.classpath">
+ <path refid="sunri.classpath"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ <pathelement location="${lib.dir}/jbossws-spi.jar"/>
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources">
+ <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws/xfire to jboss50 -->
+ <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/xfire to jboss50">
+ <macro-undeploy-native50/>
+ <macro-undeploy-sunri50/>
+ <macro-deploy-xfire50
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"/>
+ </target>
+
+ <!-- Remove jbossws/xfire from jboss50 -->
+ <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
+ <macro-undeploy-xfire50/>
+ <macro-undeploy-spi/>
+ </target>
+
+ <!-- Deploy jbossws/xfire to jboss42 -->
+ <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/xfire to jboss42">
+ <macro-undeploy-native42/>
+ <macro-undeploy-sunri42/>
+ <macro-deploy-xfire42
+ spilibs="${lib.dir}"
+ jbosslibs="${lib.dir}"
+ stacklibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+ <macro-deploy-spi
+ spilibs="${lib.dir}"
+ spiscripts="${bin.dir}"
+ thirdpartylibs="${lib.dir}"/>
+ </target>
+
+ <!-- Remove jbossws/xfire from jboss42 -->
+ <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
+ <macro-undeploy-xfire42/>
+ <macro-undeploy-spi/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ </target>
+
+ <target name="main" depends="most" description="Executes the default target (most)."/>
+
+ <target name="most" depends="tests-main" description="Builds almost everything."/>
+
</project>
More information about the jbossws-commits
mailing list