[jbossws-commits] JBossWS SVN: r3517 - in branches/jbossws-2.0: integration/spi and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-06-09 05:03:28 -0400 (Sat, 09 Jun 2007) New Revision: 3517 Added: branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.bat branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.bat branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh Removed: branches/jbossws-2.0/integration/spi/etc/ branches/jbossws-2.0/jbossws-core/src/main/etc/wspublish.sh Modified: branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml branches/jbossws-2.0/integration/spi/build.xml branches/jbossws-2.0/jbossws-core/build.xml Log: Fix script/resources deployment Modified: branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml =================================================================== --- branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-08 19:55:32 UTC (rev 3516) +++ branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-09 09:03:28 UTC (rev 3517) @@ -92,6 +92,7 @@ <copy todir="${bindist.lib.dir}" overwrite="true"> <fileset dir="${spi.dir}/output/lib"> <include name="jbossws-spi.jar"/> + <include name="jbossws-spi-scripts.zip"/> </fileset> <fileset dir="${spi.dir}/thirdparty"> <include name="getopt.jar"/> @@ -111,6 +112,7 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-core.jar"/> <include name="jbossws-client.jar"/> + <include name="jbossws-resources.zip"/> </fileset> <fileset dir="${int.native.dir}/output/lib"> <include name="jbossws-context.war"/> Modified: branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml =================================================================== --- branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-08 19:55:32 UTC (rev 3516) +++ branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-09 09:03:28 UTC (rev 3517) @@ -27,8 +27,7 @@ jbosslibs="${int.jboss50.dir}/output/lib" corelibs="${core.dir}/output/lib" stacklibs="${int.native.dir}/output/lib" - thirdpartylibs="${core.dir}/thirdparty" - corescripts="${core.dir}/src/main/etc"/> + thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-spi spilibs="${spi.dir}/output/lib" @@ -74,8 +73,7 @@ jbosslibs="${int.jboss40.dir}/output/lib" corelibs="${core.dir}/output/lib" stacklibs="${int.native.dir}/output/lib" - thirdpartylibs="${core.dir}/thirdparty" - corescripts="${core.dir}/src/main/etc"/> + thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-spi spilibs="${spi.dir}/output/lib" Modified: branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml =================================================================== --- branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-08 19:55:32 UTC (rev 3516) +++ branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-09 09:03:28 UTC (rev 3517) @@ -23,10 +23,14 @@ <attribute name="corelibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> - <attribute name="corescripts"/> <sequential> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <!-- BIN RESOURCES --> + <unzip dest="${jboss50.home}/bin" src=&quot;(a){spilibs}/jbossws-spi-scripts.zip&quot;/&gt; + <unzip dest="${jboss50.home}/bin" src=&quot;(a){corelibs}/jbossws-resources.zip&quot;/&gt; + <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/> + <!-- CLIENT JARS --> <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="@{jbosslibs}"> @@ -66,33 +70,30 @@ <include name="jboss-saaj.jar"/> </fileset> </copy> - + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src=&quot;(a){stacklibs}/jbossws-native50-deployer.zip&quot;/&gt; <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native50.sar&quot;/&gt; <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file=&quot;(a){stacklibs}/jbossws-context.war&quot; overwrite="true"/> - <!-- Deploy juddi-service.sar --> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - <copy todir="${jboss50.home}/bin" overwrite="true"> - <fileset dir="@{corescripts}"> - <include name="wspublish.sh"/> - <include name="wsrunclient.bat"/> - <include name="wsrunclient.sh"/> - <include name="wstools.bat"/> - <include name="wstools.sh"/> - </fileset> - </copy> - <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/> </sequential> </macrodef> <macrodef name="macro-undeploy-native50"> <sequential> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <delete> - + <!-- BIN RESOURCES --> + <fileset dir="${jboss50.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + <!-- CLIENT JARS --> <fileset dir="${jboss50.home}/client"> <include name="jaxb-api.jar"/> @@ -122,17 +123,7 @@ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> - <!-- Undeploy juddi-service.sar --> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <delete> - <fileset dir="${jboss50.home}/bin"> - <include name="wspublish.sh"/> - <include name="wsrunclient.bat"/> - <include name="wsrunclient.sh"/> - <include name="wstools.bat"/> - <include name="wstools.sh"/> - </fileset> - </delete> </sequential> </macrodef> @@ -142,7 +133,6 @@ <attribute name="corelibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> - <attribute name="corescripts"/> <sequential> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> @@ -158,6 +148,11 @@ </fileset> </copy> + <!-- BIN RESOURCES --> + <unzip dest="${jboss42.home}/bin" src=&quot;(a){spilibs}/jbossws-spi-scripts.zip&quot;/&gt; + <unzip dest="${jboss42.home}/bin" src=&quot;(a){corelibs}/jbossws-resources.zip&quot;/&gt; + <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/> + <!-- CLIENT JARS --> <copy todir="${jboss42.home}/client" overwrite="true"> <fileset dir="@{jbosslibs}"> @@ -185,20 +180,9 @@ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native42.sar&quot;/&gt; - <!-- Deploy juddi-service.sar --> <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - <copy todir="${jboss42.home}bin" overwrite="true"> - <fileset dir="@{corescripts}"> - <include name="wspublish.sh"/> - <include name="wsrunclient.bat"/> - <include name="wsrunclient.sh"/> - <include name="wstools.bat"/> - <include name="wstools.sh"/> - </fileset> - </copy> - <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/> - + </sequential> </macrodef> @@ -212,6 +196,14 @@ <include name="jaxb-api.jar"/> </fileset> + <!-- BIN RESOURCES --> + <fileset dir="${jboss42.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + <!-- CLIENT JARS --> <fileset dir="${jboss42.home}/client"> <include name="jaxb-api.jar"/> @@ -246,17 +238,7 @@ </fileset> </delete> <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <!-- Undeploy juddi-service.sar --> <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <delete> - <fileset dir="${jboss42.home}/bin"> - <include name="wspublish.sh"/> - <include name="wsrunclient.bat"/> - <include name="wsrunclient.sh"/> - <include name="wstools.bat"/> - <include name="wstools.sh"/> - </fileset> - </delete> </sequential> </macrodef> @@ -266,10 +248,14 @@ <attribute name="corelibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> - <attribute name="corescripts"/> <sequential> <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> + <!-- BIN RESOURCES --> + <unzip dest="${jboss40.home}/bin" src=&quot;(a){spilibs}/jbossws-spi-scripts.zip&quot;/&gt; + <unzip dest="${jboss40.home}/bin" src=&quot;(a){corelibs}/jbossws-resources.zip&quot;/&gt; + <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/> + <!-- CLIENT JARS --> <copy todir="${jboss40.home}/client" overwrite="true"> <fileset dir="@{jbosslibs}"> @@ -307,20 +293,9 @@ <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native40.sar&quot;/&gt; - <!-- Deploy juddi-service.sar --> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - <copy todir="${jboss40.home}/bin" overwrite="true"> - <fileset dir="@{corescripts}"> - <include name="wspublish.sh"/> - <include name="wsrunclient.bat"/> - <include name="wsrunclient.sh"/> - <include name="wstools.bat"/> - <include name="wstools.sh"/> - </fileset> - </copy> - <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/> - + </sequential> </macrodef> @@ -345,6 +320,14 @@ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> <delete> + <!-- BIN RESOURCES --> + <fileset dir="${jboss40.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + <!-- CLIENT JARS --> <fileset dir="${jboss40.home}/client"> <include name="jaxb-api.jar"/> @@ -378,19 +361,9 @@ </fileset> </delete> <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <!-- Undeploy juddi-service.sar --> <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <!-- Remove only, do not deploy --> <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> - <delete> - <fileset dir="${jboss40.home}/bin"> - <include name="wspublish.sh"/> - <include name="wsrunclient.bat"/> - <include name="wsrunclient.sh"/> - <include name="wstools.bat"/> - <include name="wstools.sh"/> - </fileset> - </delete> </sequential> </macrodef> Modified: branches/jbossws-2.0/integration/spi/build.xml =================================================================== --- branches/jbossws-2.0/integration/spi/build.xml 2007-06-08 19:55:32 UTC (rev 3516) +++ branches/jbossws-2.0/integration/spi/build.xml 2007-06-09 09:03:28 UTC (rev 3517) @@ -71,9 +71,7 @@ <target name="compile-etc" depends="init"> <mkdir dir="${spi.output.etc.dir}"/> <copy todir="${spi.output.etc.dir}" filtering="yes"> - <fileset dir="${spi.etc.dir}"> - <include name="component-info.xml"/> - </fileset> + <fileset dir="${spi.etc.dir}"/> <fileset dir="${build.dir}/etc"> <include name="default.mf"/> </fileset> @@ -111,15 +109,23 @@ </fileset> </jar> - <!-- Build jbossws-src.zip --> + <!-- Build jbossws-spi-scripts.zip --> + <zip zipfile="${spi.output.lib.dir}/jbossws-spi-scripts.zip" > + <fileset dir="${spi.output.etc.dir}"> + <include name="wsconsume.bat"/> + <include name="wsprovide.bat"/> + </fileset> + <zipfileset dir="${spi.output.etc.dir}" filemode="755"> + <include name="wsconsume.sh"/> + <include name="wsprovide.sh"/> + </zipfileset> + </zip> + + <!-- Build jbossws-spi-src.zip --> <zip zipfile="${spi.output.lib.dir}/jbossws-spi-src.zip" > <fileset dir="${spi.java.dir}"/> </zip> - <!-- Build jbossws-spi-scripts.zip --> - <zip zipfile="${spi.output.lib.dir}/jbossws-spi-scripts.zip" > - <fileset dir="${spi.dir}/etc"/> - </zip> </target> <!-- ================================================================== --> Copied: branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.bat (from rev 3513, branches/jbossws-2.0/integration/spi/etc/wsconsume.bat) =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.bat (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.bat 2007-06-09 09:03:28 UTC (rev 3517) @@ -0,0 +1,55 @@ +@echo off + +rem $Id: wsgen.bat 2158 2007-01-27 06:20:59Z jason.greene(a)jboss.com $ + +@if not "%ECHO%" == "" echo %ECHO% +@if "%OS%" == "Windows_NT" setlocal + +set DIRNAME=.\ +if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% +set PROGNAME=run.bat +if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% + +rem Read all command line arguments + +REM +REM The %ARGS% env variable commented out in favor of using %* to include +REM all args in java command line. See bug #840239. [jpl] +REM +REM set ARGS= +REM :loop +REM if [%1] == [] goto endloop +REM set ARGS=%ARGS% %1 +REM shift +REM goto loop +REM :endloop + +set JAVA=%JAVA_HOME%\bin\java +set JBOSS_HOME=%DIRNAME%\.. +rem Setup the java endorsed dirs +set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed + +rem Setup the wstools classpath +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JAVA_HOME%/lib/tools.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/activation.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-rt.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-tools.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/mail.jar + +rem Execute the JVM +"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %* Copied: branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh (from rev 3513, branches/jbossws-2.0/integration/spi/etc/wsconsume.sh) =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/etc/wsconsume.sh 2007-06-09 09:03:28 UTC (rev 3517) @@ -0,0 +1,127 @@ +#!/bin/sh + +# +# Invoke wsconsume with dynamic classpath +# depending on the deployed stack and the location +# +# @author Heiko.Braun(a)jboss.com +# @version $Id: $ +# + +DIRNAME=`dirname $0` +PROGNAME=`basename $0` + +# OS specific support (must be 'true' or 'false'). +cygwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JBOSS_HOME" ] && + JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Setup JBOSS_HOME +if [ "x$JBOSS_HOME" = "x" ]; then + # get the full path (without any relative bits) + JBOSS_HOME=`cd $DIRNAME/..; pwd` +fi +export JBOSS_HOME + +# Setup the JVM +if [ "x$JAVA" = "x" ]; then + if [ "x$JAVA_HOME" != "x" ]; then + JAVA="$JAVA_HOME/bin/java" + else + JAVA="java" + fi +fi + +#JPDA options. Uncomment and modify as appropriate to enable remote debugging . +#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y $JAVA_OPTS" + +# Setup JBoss sepecific properties +JAVA_OPTS="$JAVA_OPTS" + +# 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 installed 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:$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:$LIBDIR/jaxws-tools.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-rt.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-api.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" + +# stack specific dependencies +if [ "x$JBOSSWS_NATIVE" = "x" ]; then + echo "Seems to be a Sun-RI stack deployed" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-sunri-client.jar" +else + echo "Seems to be a JBossWS-Native stack deployed" + 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"` + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + WSCONSUME_CLASSPATH=`cygpath --path --windows "$WSCONSUME_CLASSPATH"` + JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` +fi + +"$JAVA" $JAVA_OPTS \ + -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ + -Dlog4j.configuration=wstools-log4j.xml \ + -classpath "$WSCONSUME_CLASSPATH" \ + org.jboss.wsf.spi.tools.cmd.WSConsume "$@" Copied: branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.bat (from rev 3513, branches/jbossws-2.0/integration/spi/etc/wsprovide.bat) =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.bat (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.bat 2007-06-09 09:03:28 UTC (rev 3517) @@ -0,0 +1,49 @@ +@echo off + +rem $Id: wsprovide.bat 3101 2007-05-16 08:26:33Z heiko.braun(a)jboss.com $ + +@if not "%ECHO%" == "" echo %ECHO% +@if "%OS%" == "Windows_NT" setlocal + +set DIRNAME=.\ +if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% +set PROGNAME=run.bat +if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% + +rem Read all command line arguments + +REM +REM The %ARGS% env variable commented out in favor of using %* to include +REM all args in java command line. See bug #840239. [jpl] +REM +REM set ARGS= +REM :loop +REM if [%1] == [] goto endloop +REM set ARGS=%ARGS% %1 +REM shift +REM goto loop +REM :endloop + +set JAVA=%JAVA_HOME%\bin\java +set JBOSS_HOME=%DIRNAME%\.. +rem Setup the java endorsed dirs +set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed + +rem Setup the wstools classpath +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/activation.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/mail.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar + +rem Execute the JVM +"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %* Copied: branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh (from rev 3513, branches/jbossws-2.0/integration/spi/etc/wsprovide.sh) =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/etc/wsprovide.sh 2007-06-09 09:03:28 UTC (rev 3517) @@ -0,0 +1,134 @@ +#!/bin/sh + +# +# Invoke wsprovide with dynamic classpath +# depending on the deployed stack and the location +# +# @author Heiko.Braun(a)jboss.com +# @version $Id: $ +# + +DIRNAME=`dirname $0` +PROGNAME=`basename $0` + +# OS specific support (must be 'true' or 'false'). +cygwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JBOSS_HOME" ] && + JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Setup JBOSS_HOME +if [ "x$JBOSS_HOME" = "x" ]; then + # get the full path (without any relative bits) + JBOSS_HOME=`cd $DIRNAME/..; pwd` +fi +export JBOSS_HOME + +# Setup the JVM +if [ "x$JAVA" = "x" ]; then + if [ "x$JAVA_HOME" != "x" ]; then + JAVA="$JAVA_HOME/bin/java" + else + JAVA="java" + fi +fi + +#JPDA options. Uncomment and modify as appropriate to enable remote debugging . +#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y $JAVA_OPTS" + +# Setup JBoss sepecific properties +JAVA_OPTS="$JAVA_OPTS" + +# 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 installed 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 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:$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:$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:$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:$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:$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"` + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + WSPROVIDE_CLASSPATH=`cygpath --path --windows "$WSPROVIDE_CLASSPATH"` + JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` +fi + +"$JAVA" $JAVA_OPTS \ + -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ + -Dlog4j.configuration=wstools-log4j.xml \ + -classpath "$WSPROVIDE_CLASSPATH" \ + org.jboss.wsf.spi.tools.cmd.WSProvide "$@" Modified: branches/jbossws-2.0/jbossws-core/build.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/build.xml 2007-06-08 19:55:32 UTC (rev 3516) +++ branches/jbossws-2.0/jbossws-core/build.xml 2007-06-09 09:03:28 UTC (rev 3517) @@ -178,20 +178,16 @@ <include name="standard-*-config.xml"/> </fileset> <fileset dir="${core.output.etc.dir}"> - <include name="wsprovide.bat"/> - <include name="wsconsume.bat"/> <include name="wsrunclient.bat"/> <include name="wstools.bat"/> </fileset> <zipfileset dir="${core.output.etc.dir}" filemode="755"> - <include name="wsprovide.sh"/> - <include name="wsconsume.sh"/> <include name="wsrunclient.sh"/> <include name="wstools.sh"/> </zipfileset> </zip> - <!-- Build jbossws-src.zip --> + <!-- Build jbossws-core-src.zip --> <zip zipfile="${core.output.lib.dir}/jbossws-core-src.zip" > <fileset dir="${core.java.dir}"/> </zip> Deleted: branches/jbossws-2.0/jbossws-core/src/main/etc/wspublish.sh =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/etc/wspublish.sh 2007-06-08 19:55:32 UTC (rev 3516) +++ branches/jbossws-2.0/jbossws-core/src/main/etc/wspublish.sh 2007-06-09 09:03:28 UTC (rev 3517) @@ -1,73 +0,0 @@ -#!/bin/sh - -# $Id: wspublish.sh 2157 2007-01-27 06:03:58Z jason.greene(a)jboss.com $ - -DIRNAME=`dirname $0` -PROGNAME=`basename $0` - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$TOMCAT_HOME" ] && - TOMCAT_HOME=`cygpath --unix "$TOMCAT_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi -export TOMCAT_HOME - -# Setup the JVM -if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - JAVA="$JAVA_HOME/bin/java" - else - JAVA="java" - fi -fi - -#JPDA options. Uncomment and modify as appropriate to enable remote debugging . -#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" - -# Setup JBoss sepecific properties -JAVA_OPTS="$JAVA_OPTS" - -# Setup the WSPUBLISH classpath -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/jbossws-thirdparty.jar" -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/jbossws-core.jar" -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/log4j.jar" -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/servlet-api.jar" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - TOMCAT_HOME=`cygpath --path --windows "$TOMCAT_HOME"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - WSPUBLISH_CLASSPATH=`cygpath --path --windows "$WSPUBLISH_CLASSPATH"` -fi - -# Display our environment -echo "=========================================================================" -echo "" -echo " WSPUBLISH Environment" -echo "" -echo " TOMCAT_HOME: $TOMCAT_HOME" -echo "" -echo " JAVA: $JAVA" -echo "" -echo " JAVA_OPTS: $JAVA_OPTS" -echo "" -#echo " CLASSPATH: $WSPUBLISH_CLASSPATH" -#echo "" -echo "=========================================================================" -echo "" - -# Execute the JVM -"$JAVA" $JAVA_OPTS \ - -classpath "$WSPUBLISH_CLASSPATH" \ - org.jboss.ws.tools.wspublish -dest $TOMCAT_HOME/webapps "$@" -