Author: thomas.diesler(a)jboss.com Date: 2007-05-08 21:36:28 -0400 (Tue, 08 May 2007) New Revision: 3006 Added: trunk/build/etc/component-info.xml trunk/build/etc/wsconsume.bat trunk/build/etc/wsconsume.sh trunk/build/etc/wsprovide.bat trunk/build/etc/wsprovide.sh trunk/build/etc/wspublish.sh trunk/build/etc/wsrunclient.bat trunk/build/etc/wsrunclient.sh trunk/build/etc/wstools.bat trunk/build/etc/wstools.sh Removed: trunk/build/etc/component-info/jbossws-jboss50.xml trunk/build/etc/component-info/jbossws.xml Modified: trunk/build/ant-import/build-release.xml Log: Use jbossws-resources.zip Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-05-08 23:31:05 UTC (rev 3005) +++ trunk/build/ant-import/build-release.xml 2007-05-09 01:36:28 UTC (rev 3006) @@ -47,16 +47,16 @@ <mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/> <copy todir="${jboss.repository.dir}/jbossws/${repository.id}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-integration.jar"/> <include name="jbossws-client.jar"/> <include name="jbossws-core.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-core-src.zip"/> + <include name="jbossws-resources.zip"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> Deleted: trunk/build/etc/component-info/jbossws-jboss50.xml =================================================================== --- trunk/build/etc/component-info/jbossws-jboss50.xml 2007-05-08 23:31:05 UTC (rev 3005) +++ trunk/build/etc/component-info/jbossws-jboss50.xml 2007-05-09 01:36:28 UTC (rev 3006) @@ -1,30 +0,0 @@ -<project name="jboss/jbossws-jboss50"> - - <component id="jboss/jbossws-jboss50" - description="JBossWS an implementation of J2EE Web Services" - version=&quot;@repository.id(a)&quot; - licenseType="lgpl"> - - <artifact id="jbossws50.sar"/> - <artifact id="jbossws50-deployer.zip"/> - <artifact id="jbossws50-src.zip"/> - - <import componentref="jboss/jbossws"> - <compatible version=&quot;@repository.id(a)&quot;/&gt; - </import> - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb-jboss50@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer-jboss50@"/> - </import> - <import componentref="jboss/remoting"> - <compatible version="@jboss-remoting-jboss50@"/> - </import> - - <export> - </export> - - </component> - -</project> Deleted: trunk/build/etc/component-info/jbossws.xml =================================================================== --- trunk/build/etc/component-info/jbossws.xml 2007-05-08 23:31:05 UTC (rev 3005) +++ trunk/build/etc/component-info/jbossws.xml 2007-05-09 01:36:28 UTC (rev 3006) @@ -1,51 +0,0 @@ -<project name="jboss/jbossws"> - - <component id="jboss/jbossws" - description="JBossWS an implementation of J2EE Web Services" - version=&quot;@repository.id(a)&quot; - licenseType="lgpl"> - - <artifact id="jbossws-integration.jar"/> - <artifact id="jbossws-client.jar"/> - <artifact id="jbossws-core.jar"/> - <artifact id="jbossws-core-src.zip"/> - <artifact id="jboss-jaxrpc.jar"/> - <artifact id="jboss-jaxws.jar"/> - <artifact id="jboss-saaj.jar"/> - - <import componentref="apache-xmlsec"> - <compatible version="@apache-xmlsec@"/> - <compatible version="@apache-xmlsec@-brew"/> - </import> - <import componentref="ibm-wsdl4j"> - <compatible version="@ibm-wsdl4j@"/> - <compatible version="@ibm-wsdl4j@-brew"/> - </import> - <import componentref="javassist"> - <compatible version="@javassist@"/> - <compatible version="@javassist@-brew"/> - </import> - <import componentref="jbpm/bpel"> - <compatible version="@jbpm-bpel@"/> - </import> - <import componentref="jboss/jbossws-wsconsume-impl"> - <compatible version="@jbossws-wsconsume-impl@"/> - </import> - <import componentref="stax-api"> - <compatible version="@stax-api@"/> - </import> - <import componentref="sun-jaxb"> - <compatible version="@sun-jaxb@"/> - </import> - - <export> - <include input="jbossws-integration.jar"/> - <include input="jbossws-core.jar"/> - <include input="jboss-jaxrpc.jar"/> - <include input="jboss-jaxws.jar"/> - <include input="jboss-saaj.jar"/> - </export> - - </component> - -</project> Added: trunk/build/etc/component-info.xml =================================================================== --- trunk/build/etc/component-info.xml (rev 0) +++ trunk/build/etc/component-info.xml 2007-05-09 01:36:28 UTC (rev 3006) @@ -0,0 +1,50 @@ +<project name="jboss/jbossws"> + + <component id="jboss/jbossws" + description="JBossWS an implementation of J2EE Web Services" + version=&quot;@repository.id(a)&quot; + licenseType="lgpl"> + + <artifact id="jbossws-client.jar"/> + <artifact id="jbossws-core.jar"/> + <artifact id="jboss-jaxrpc.jar"/> + <artifact id="jboss-jaxws.jar"/> + <artifact id="jboss-saaj.jar"/> + <artifact id="jbossws-core-src.zip"/> + <artifact id="jbossws-resources.zip"/> + + <import componentref="apache-xmlsec"> + <compatible version="@apache-xmlsec@"/> + <compatible version="@apache-xmlsec@-brew"/> + </import> + <import componentref="ibm-wsdl4j"> + <compatible version="@ibm-wsdl4j@"/> + <compatible version="@ibm-wsdl4j@-brew"/> + </import> + <import componentref="javassist"> + <compatible version="@javassist@"/> + <compatible version="@javassist@-brew"/> + </import> + <import componentref="jbpm/bpel"> + <compatible version="@jbpm-bpel@"/> + </import> + <import componentref="jboss/jbossws-wsconsume-impl"> + <compatible version="@jbossws-wsconsume-impl@"/> + </import> + <import componentref="stax-api"> + <compatible version="@stax-api@"/> + </import> + <import componentref="sun-jaxb"> + <compatible version="@sun-jaxb@"/> + </import> + + <export> + <include input="jbossws-core.jar"/> + <include input="jboss-jaxrpc.jar"/> + <include input="jboss-jaxws.jar"/> + <include input="jboss-saaj.jar"/> + </export> + + </component> + +</project> Property changes on: trunk/build/etc/component-info.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/build/etc/wsconsume.bat =================================================================== --- trunk/build/etc/wsconsume.bat (rev 0) +++ trunk/build/etc/wsconsume.bat 2007-05-09 01:36:28 UTC (rev 3006) @@ -0,0 +1,53 @@ +@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/jbossws-wsconsume-impl.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.ws.tools.jaxws.command.wsconsume %* Added: trunk/build/etc/wsconsume.sh =================================================================== --- trunk/build/etc/wsconsume.sh (rev 0) +++ trunk/build/etc/wsconsume.sh 2007-05-09 01:36:28 UTC (rev 3006) @@ -0,0 +1,82 @@ +#!/bin/sh + +# $Id: wsgen.sh 2158 2007-01-27 06:20:59Z 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 "$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=n $JAVA_OPTS" + +# Setup JBoss sepecific properties +JAVA_OPTS="$JAVA_OPTS" + +# Setup the java endorsed dirs +JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" + +# Setup the wstools classpath +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JAVA_HOME/lib/tools.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/wstx.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-wsconsume-impl.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/javassist.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/stax-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/jbossall-client.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:$JBOSS_HOME/client/log4j.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/mail.jar" + +# 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 + +# Execute the JVM +"$JAVA" $JAVA_OPTS \ + -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ + -Dlog4j.configuration=wstools-log4j.xml \ + -classpath "$WSCONSUME_CLASSPATH" \ + org.jboss.ws.tools.jaxws.command.wsconsume "$@" Added: trunk/build/etc/wsprovide.bat =================================================================== --- trunk/build/etc/wsprovide.bat (rev 0) +++ trunk/build/etc/wsprovide.bat 2007-05-09 01:36:28 UTC (rev 3006) @@ -0,0 +1,48 @@ +@echo off + +rem $Id: wsprovide.bat 2464 2007-02-23 21:51:05Z 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 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 + +rem Execute the JVM +"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.ws.tools.jaxws.command.wsprovide %* Added: trunk/build/etc/wsprovide.sh =================================================================== --- trunk/build/etc/wsprovide.sh (rev 0) +++ trunk/build/etc/wsprovide.sh 2007-05-09 01:36:28 UTC (rev 3006) @@ -0,0 +1,77 @@ +#!/bin/sh + +# $Id: wsprovide.sh 2361 2007-02-14 14:52:02Z 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 "$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=n $JAVA_OPTS" + +# Setup JBoss sepecific properties +JAVA_OPTS="$JAVA_OPTS" + +# Setup the java endorsed dirs +JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" + +# Setup the wstools classpath +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/activation.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/getopt.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/javassist.jar" +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/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/log4j.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/mail.jar" + +# 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 + +# Execute the JVM +"$JAVA" $JAVA_OPTS \ + -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ + -Dlog4j.configuration=wstools-log4j.xml \ + -classpath "$WSPROVIDE_CLASSPATH" \ + org.jboss.ws.tools.jaxws.command.wsprovide "$@" Added: trunk/build/etc/wspublish.sh =================================================================== --- trunk/build/etc/wspublish.sh (rev 0) +++ trunk/build/etc/wspublish.sh 2007-05-09 01:36:28 UTC (rev 3006) @@ -0,0 +1,73 @@ +#!/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 "$@" + Added: trunk/build/etc/wsrunclient.bat =================================================================== --- trunk/build/etc/wsrunclient.bat (rev 0) +++ trunk/build/etc/wsrunclient.bat 2007-05-09 01:36:28 UTC (rev 3006) @@ -0,0 +1,61 @@ +@echo off + +rem $Id: wsprovide.bat 2325 2007-02-09 22:14:15Z 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% + + +if not [%1] == [] goto start + echo %PROGNAME% is a command line tool that invokes a JBossWS JAX-WS Web Service client. + echo It builds the correct classpath and endorsed libs for you. Feel free to use + echo the code for this script to make your own shell scripts. It is open source + echo after all. + echo. + echo usage: %PROGNAME% [-classpath ^<additional class path^>] ^<java-main-class^> [arguments...] + goto EOF +:start +set ARGS= +:loop +if [%1] == [] goto endloop + if not %1 == -classpath goto argset + set WSRUNCLIENT_CLASSPATH=%2 + shift + shift + goto loop + :argset + set ARGS=%ARGS% %1 + shift + goto loop +: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 WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/activation.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-j2ee.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_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 "%WSRUNCLIENT_CLASSPATH%" %ARGS% +:EOF Added: trunk/build/etc/wsrunclient.sh =================================================================== --- trunk/build/etc/wsrunclient.sh (rev 0) +++ trunk/build/etc/wsrunclient.sh 2007-05-09 01:36:28 UTC (rev 3006) @@ -0,0 +1,99 @@ +#!/bin/sh + +# $Id: wsprovide 2325 2007-02-09 22:14:15Z jason.greene(a)jboss.com $ +DIRNAME=`dirname $0` +PROGNAME=`basename $0` + +if [ $# -eq 0 ]; then + echo "$PROGNAME is a command line tool that invokes a JBossWS JAX-WS Web Service client." + echo "It builds the correct classpath and endorsed libs for you. Feel free to use" + echo "the code for this script to make your own shell scripts. It is open source" + echo "after all." + echo + echo "usage: $PROGNAME [-classpath <additional class path>] <java-main-class> [arguments...]" + exit 1; +fi + +# 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=n $JAVA_OPTS" + +# Setup JBoss sepecific properties +JAVA_OPTS="$JAVA_OPTS" + +# Setup the java endorsed dirs +JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" + +# Setup the wstools classpath +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/activation.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/getopt.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/javassist.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-j2ee.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-ejb3x.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wstx.jar" + +while [ $# -ge 1 ]; do + case $1 in + "-classpath") WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$2"; shift;; + *) args="$args \"$1\"";; + esac + shift +done + +# 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"` + WSRUNCLIENT_CLASSPATH=`cygpath --path --windows "$WSRUNCLIENT_CLASSPATH"` + JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` +fi + +# Execute the JVM +eval "$JAVA" $JAVA_OPTS \ + -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ + -Dlog4j.configuration=wstools-log4j.xml \ + -classpath "$WSRUNCLIENT_CLASSPATH" \ + "$args" Added: trunk/build/etc/wstools.bat =================================================================== --- trunk/build/etc/wstools.bat (rev 0) +++ trunk/build/etc/wstools.bat 2007-05-09 01:36:28 UTC (rev 3006) @@ -0,0 +1,62 @@ +@echo off + +rem $Id: wstools.bat 2156 2007-01-27 05:59:35Z 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 WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/activation.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossretro-rt.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-backport-concurrent.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws14-client.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/mail.jar + +rem Display our environment +echo =========================================================================" +echo . +echo WSTools Environment +echo . +echo JBOSS_HOME: %JBOSS_HOME% +echo . +echo JAVA: %JAVA% +echo . +echo JAVA_OPTS: %JAVA_OPTS% +echo . +rem echo CLASSPATH: %WSTOOLS_CLASSPATH% +rem echo . +echo =========================================================================" +echo . + +rem Execute the JVM +"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSTOOLS_CLASSPATH%" org.jboss.ws.tools.WSTools %* + Added: trunk/build/etc/wstools.sh =================================================================== --- trunk/build/etc/wstools.sh (rev 0) +++ trunk/build/etc/wstools.sh 2007-05-09 01:36:28 UTC (rev 3006) @@ -0,0 +1,90 @@ +#!/bin/sh + +# $Id: wstools.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 "$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=n $JAVA_OPTS" + +# Setup JBoss sepecific properties +JAVA_OPTS="$JAVA_OPTS" + +# Setup the java endorsed dirs +JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" + +# Setup the wstools classpath +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/activation.jar" +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/javassist.jar" +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossretro-rt.jar" +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-backport-concurrent.jar" +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws14-client.jar" +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/log4j.jar" +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/mail.jar" + +# 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"` + WSTOOLS_CLASSPATH=`cygpath --path --windows "$WSTOOLS_CLASSPATH"` + JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` +fi + +# Display our environment +echo "=========================================================================" +echo "" +echo " WSTools Environment" +echo "" +echo " JBOSS_HOME: $JBOSS_HOME" +echo "" +echo " JAVA: $JAVA" +echo "" +echo " JAVA_OPTS: $JAVA_OPTS" +echo "" +#echo " CLASSPATH: $WSTOOLS_CLASSPATH" +#echo "" +echo "=========================================================================" +echo "" + +# Execute the JVM +"$JAVA" $JAVA_OPTS \ + -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ + -Dlog4j.configuration=wstools-log4j.xml \ + -classpath "$WSTOOLS_CLASSPATH" \ + org.jboss.ws.tools.WSTools "$@"