[jbossws-commits] JBossWS SVN: r3333 - in trunk: integration/native/ant-import and 7 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-05-31 09:36:07 -0400 (Thu, 31 May 2007) New Revision: 3333 Added: trunk/integration/spi/ant-import/build-deploy.xml trunk/integration/spi/etc/ trunk/integration/spi/etc/wsconsume.bat trunk/integration/spi/etc/wsconsume.sh trunk/integration/spi/etc/wsprovide.bat trunk/integration/spi/etc/wsprovide.sh Removed: trunk/build/etc/wsconsume.bat trunk/build/etc/wsconsume.sh trunk/build/etc/wsprovide.bat trunk/build/etc/wsprovide.sh trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/ Modified: trunk/integration/native/ant-import/build-deploy.xml trunk/integration/native/ant-import/macros-deploy-native.xml trunk/integration/spi/build.xml trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/sunri/ant-import/macros-deploy-sunri.xml trunk/integration/sunri/build.xml Log: Publish SPI tools artefacts from intergation/spi Deleted: trunk/build/etc/wsconsume.bat =================================================================== --- trunk/build/etc/wsconsume.bat 2007-05-31 13:35:21 UTC (rev 3332) +++ trunk/build/etc/wsconsume.bat 2007-05-31 13:36:07 UTC (rev 3333) @@ -1,55 +0,0 @@ -@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 %* Deleted: trunk/build/etc/wsconsume.sh =================================================================== --- trunk/build/etc/wsconsume.sh 2007-05-31 13:35:21 UTC (rev 3332) +++ trunk/build/etc/wsconsume.sh 2007-05-31 13:36:07 UTC (rev 3333) @@ -1,85 +0,0 @@ -#!/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/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/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" - -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxws-rt.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxws-tools.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" - -# 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.wsf.spi.tools.cmd.WSConsume "$@" Deleted: trunk/build/etc/wsprovide.bat =================================================================== --- trunk/build/etc/wsprovide.bat 2007-05-31 13:35:21 UTC (rev 3332) +++ trunk/build/etc/wsprovide.bat 2007-05-31 13:36:07 UTC (rev 3333) @@ -1,49 +0,0 @@ -@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 %* Deleted: trunk/build/etc/wsprovide.sh =================================================================== --- trunk/build/etc/wsprovide.sh 2007-05-31 13:35:21 UTC (rev 3332) +++ trunk/build/etc/wsprovide.sh 2007-05-31 13:36:07 UTC (rev 3333) @@ -1,78 +0,0 @@ -#!/bin/sh - -# $Id: wsprovide.sh 3101 2007-05-16 08:26:33Z heiko.braun(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" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.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.wsf.spi.tools.cmd.WSProvide "$@" Modified: trunk/integration/native/ant-import/build-deploy.xml =================================================================== --- trunk/integration/native/ant-import/build-deploy.xml 2007-05-31 13:35:21 UTC (rev 3332) +++ trunk/integration/native/ant-import/build-deploy.xml 2007-05-31 13:36:07 UTC (rev 3333) @@ -23,35 +23,37 @@ <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws to jboss50"> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <macro-deploy-native50 + <ant antfile="${spi.dir}/build.xml" target="deploy-jboss50" inheritall="false"/> + <macro-deploy-native50 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss50.dir}/output/lib" corelibs="${core.dir}/output/lib" stacklibs="${int.native.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"> - <copy-tasks> + <!--copy-tasks> <copy todir="${jboss50.home}/bin" overwrite="true"> <fileset dir="${build.dir}/etc"> <include name="*.bat"/> <include name="*.sh"/> </fileset> </copy> - </copy-tasks> + </copy-tasks--> </macro-deploy-native50> </target> <!-- Remove jbossws from jboss50 --> <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> - <macro-undeploy-native50> - <delete-tasks> + <ant antfile="${spi.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <macro-undeploy-native50> + <!--delete-tasks> <delete> <fileset dir="${jboss50.home}/bin"> <include name="ws*.sh"/> <include name="ws*.bat"/> </fileset> </delete> - </delete-tasks> + </delete-tasks--> </macro-undeploy-native50> </target> Modified: trunk/integration/native/ant-import/macros-deploy-native.xml =================================================================== --- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-05-31 13:35:21 UTC (rev 3332) +++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-05-31 13:36:07 UTC (rev 3333) @@ -27,9 +27,9 @@ <sequential> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="@{spilibs}"> + <!--fileset dir="@{spilibs}"> <include name="jbossws-spi.jar"/> - </fileset> + </fileset--> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss50.jar"/> </fileset> @@ -55,9 +55,9 @@ </fileset> </copy> <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{spilibs}"> + <!--fileset dir="@{spilibs}"> <include name="jbossws-spi.jar"/> - </fileset> + </fileset--> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss50.jar"/> </fileset> @@ -87,7 +87,7 @@ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> <delete> <fileset dir="${jboss50.home}/client"> - <include name="jbossws-spi.jar"/> + <!--include name="jbossws-spi.jar"/--> <include name="jbossws-jboss50.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> @@ -126,9 +126,9 @@ <sequential> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="@{spilibs}"> + <!--fileset dir="@{spilibs}"> <include name="jbossws-spi.jar"/> - </fileset> + </fileset--> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss42.jar"/> </fileset> @@ -149,9 +149,9 @@ </fileset> </copy> <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{spilibs}"> + <!--fileset dir="@{spilibs}"> <include name="jbossws-spi.jar"/> - </fileset> + </fileset--> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss42.jar"/> </fileset> @@ -178,7 +178,7 @@ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> <delete> <fileset dir="${jboss42.home}/client"> - <include name="jbossws-spi.jar"/> + <!--include name="jbossws-spi.jar"/--> <include name="jbossws-jboss42.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> Added: trunk/integration/spi/ant-import/build-deploy.xml =================================================================== --- trunk/integration/spi/ant-import/build-deploy.xml (rev 0) +++ trunk/integration/spi/ant-import/build-deploy.xml 2007-05-31 13:36:07 UTC (rev 3333) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- ================================================================== --> + <!-- Deployment JBoss50 --> + <!-- ================================================================== --> + + <target name="_deploy-common"> + <copy todir="${jboss50.home}/client"> + <fileset dir="${spi.dir}/output/lib/"> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <fileset dir="${spi.dir}/output/lib/"> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/bin" overwrite="true"> + <fileset dir="${spi.dir}/etc"> + <include name="wsconsume.bat"/> + <include name="wsconsume.sh"/> + <include name="wsprovide.bat"/> + <include name="wsprovide.sh"/> + </fileset> + </copy> + + <chmod dir="${jboss50.home}/bin" perm="+x" includes="**/*.sh"/> + </target> + + <target name="_undeploy-common"> + <delete> + + <fileset dir="${jboss50.home}/client"> + <include name="jbossws-spi.jar"/> + </fileset> + + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + + <!--include name="jbossws-spi.jar"/--> + <fileset dir="${jboss50.home}/bin"> + <include name="ws*.sh"/> + <include name="ws*.bat"/> + </fileset> + </delete> + </target> + + <!-- Deploy jbossws to jboss50 --> + <target name="deploy-jboss50" description="Deploy jbossws to jboss50"> + <antcall target="_deploy-common"/> + </target> + + <!-- Remove jbossws from jboss50 --> + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> + <antcall target="_undeploy-common"/> + </target> + + <!-- Deploy jbossws to jboss42 --> + <target name="deploy-jboss42" description="Deploy jbossws to jboss42"> + <antcall target="_deploy-common"/> + </target> + + <!-- Remove jbossws from jboss42 --> + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42"> + <antcall target="_undeploy-common"/> + </target> + +</project> Property changes on: trunk/integration/spi/ant-import/build-deploy.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/spi/build.xml =================================================================== --- trunk/integration/spi/build.xml 2007-05-31 13:35:21 UTC (rev 3332) +++ trunk/integration/spi/build.xml 2007-05-31 13:36:07 UTC (rev 3333) @@ -14,7 +14,8 @@ <project default="main" basedir="../.."> <import file="${basedir}/build/ant-import/build-setup.xml"/> - + + <import file="${spi.dir}/ant-import/build-deploy.xml"/> <import file="${spi.dir}/ant-import/build-release.xml"/> <import file="${spi.dir}/ant-import/build-thirdparty.xml"/> Copied: trunk/integration/spi/etc/wsconsume.bat (from rev 3302, trunk/build/etc/wsconsume.bat) =================================================================== --- trunk/integration/spi/etc/wsconsume.bat (rev 0) +++ trunk/integration/spi/etc/wsconsume.bat 2007-05-31 13:36:07 UTC (rev 3333) @@ -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: trunk/integration/spi/etc/wsconsume.sh (from rev 3302, trunk/build/etc/wsconsume.sh) =================================================================== --- trunk/integration/spi/etc/wsconsume.sh (rev 0) +++ trunk/integration/spi/etc/wsconsume.sh 2007-05-31 13:36:07 UTC (rev 3333) @@ -0,0 +1,105 @@ +#!/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 . +#AVA_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" + +# is it a JBossWS-native or SunRI installation? +if [ -a $JBOSS_HOME/client/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" + +# 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" + +# 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" +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" +fi + +# 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.wsf.spi.tools.cmd.WSConsume "$@" Copied: trunk/integration/spi/etc/wsprovide.bat (from rev 3302, trunk/build/etc/wsprovide.bat) =================================================================== --- trunk/integration/spi/etc/wsprovide.bat (rev 0) +++ trunk/integration/spi/etc/wsprovide.bat 2007-05-31 13:36:07 UTC (rev 3333) @@ -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: trunk/integration/spi/etc/wsprovide.sh (from rev 3302, trunk/build/etc/wsprovide.sh) =================================================================== --- trunk/integration/spi/etc/wsprovide.sh (rev 0) +++ trunk/integration/spi/etc/wsprovide.sh 2007-05-31 13:36:07 UTC (rev 3333) @@ -0,0 +1,78 @@ +#!/bin/sh + +# $Id: wsprovide.sh 3101 2007-05-16 08:26:33Z heiko.braun(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" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.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.wsf.spi.tools.cmd.WSProvide "$@" Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2007-05-31 13:35:21 UTC (rev 3332) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2007-05-31 13:36:07 UTC (rev 3333) @@ -233,6 +233,7 @@ out.println(" -s, --source=<directory> The directory to put Java source"); out.println(" -q, --quiet Be somewhat more quiet"); out.println(" -t, --show-traces Show full exception stack traces"); - out.flush(); + out.println(" -l, --load-provider Load the provider and exit (debug utility)"); + out.flush(); } } Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-31 13:35:21 UTC (rev 3332) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-31 13:36:07 UTC (rev 3333) @@ -23,7 +23,8 @@ <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <macro-deploy-sunri50 + <ant antfile="${spi.dir}/build.xml" target="deploy-jboss50" inheritall="false"/> + <macro-deploy-sunri50 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss50.dir}/output/lib" stacklibs="${int.sunri.dir}/output/lib" @@ -32,7 +33,8 @@ <!-- Remove from jboss50 --> <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> - <macro-undeploy-sunri50/> + <ant antfile="${spi.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <macro-undeploy-sunri50/> </target> <!-- Deploy to jboss42 --> Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-31 13:35:21 UTC (rev 3332) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-31 13:36:07 UTC (rev 3333) @@ -30,9 +30,9 @@ <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> </fileset> - <fileset dir="@{spilibs}"> + <!--fileset dir="@{spilibs}"> <include name="jbossws-spi.jar"/> - </fileset> + </fileset--> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss50.jar"/> </fileset> @@ -44,14 +44,19 @@ </fileset> </copy> <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{spilibs}"> + <!--fileset dir="@{spilibs}"> <include name="jbossws-spi.jar"/> - </fileset> + </fileset--> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss50.jar"/> </fileset> </copy> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <copy todir="${jboss50.home}/client"> + <fileset dir="@{stacklibs}"> + <include name="jbossws-sunri-client.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-sunri50-deployer.zip&quot;/&gt; <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){stacklibs}/jbossws-sunri50.sar&quot;/&gt; @@ -64,11 +69,12 @@ <sequential> <delete> <fileset dir="${jboss50.home}/client"> - <include name="jbossws-spi.jar"/> + <!--include name="jbossws-spi.jar"/--> <include name="jbossws-jboss50.jar"/> - </fileset> + <include name="jbossws-sunri-client.jar"/> + </fileset> <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jbossws-spi.jar"/> + <!--include name="jbossws-spi.jar"/--> <include name="jbossws-jboss50.jar"/> </fileset> </delete> @@ -89,9 +95,9 @@ <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> </fileset> - <fileset dir="@{spilibs}"> + <!--fileset dir="@{spilibs}"> <include name="jbossws-spi.jar"/> - </fileset> + </fileset--> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss42.jar"/> </fileset> @@ -103,14 +109,19 @@ </fileset> </copy> <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{spilibs}"> + <!--fileset dir="@{spilibs}"> <include name="jbossws-spi.jar"/> - </fileset> + </fileset--> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss42.jar"/> </fileset> </copy> - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <copy todir="${jboss42.home}/client"> + <fileset dir="@{stacklibs}"> + <include name="jbossws-sunri-client.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){stacklibs}/jbossws-sunri42.sar&quot;/&gt; </sequential> </macrodef> @@ -120,11 +131,12 @@ <sequential> <delete> <fileset dir="${jboss42.home}/client"> - <include name="jbossws-spi.jar"/> + <!--include name="jbossws-spi.jar"/--> <include name="jbossws-jboss42.jar"/> - </fileset> + <include name="jbossws-sunri-client.jar"/> + </fileset> <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> - <include name="jbossws-spi.jar"/> + <!--include name="jbossws-spi.jar"/--> <include name="jbossws-jboss42.jar"/> </fileset> </delete> Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-05-31 13:35:21 UTC (rev 3332) +++ trunk/integration/sunri/build.xml 2007-05-31 13:36:07 UTC (rev 3333) @@ -114,13 +114,22 @@ <mkdir dir="${sunri.output.lib.dir}"/> <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri.jar" manifest="${sunri.output.etc.dir}/default.mf"> <fileset dir="${sunri.output.classes.dir}"> - <include name="org/jboss/wsf/stack/sunri50/**"/> - <include name="org/jboss/wsf/stack/sunri/**"/> - </fileset> - <metainf dir="${sunri.resources.dir}/jbossws-sunri.jar"/> + <exclude name="org/jboss/wsf/stack/sunri/sunri/tools/**"/> + <include name="org/jboss/wsf/stack/sunri50/**"/> + <include name="org/jboss/wsf/stack/sunri/metadata/**"/> + <include name="org/jboss/wsf/stack/sunri/*"/> + </fileset> </jar> - - <!-- Build jbossws-context.war --> + + <!-- jbossws-sunri-client.jar --> + <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri-client.jar" manifest="${sunri.output.etc.dir}/default.mf"> + <fileset dir="${sunri.output.classes.dir}"> + <include name="org/jboss/wsf/stack/sunri/tools/**"/> + </fileset> + <metainf dir="${sunri.resources.dir}/jbossws-sunri-client.jar"/> + </jar> + + <!-- Build jbossws-context.war --> <war warfile="${sunri.output.lib.dir}/jbossws-context.war" webxml="${sunri.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> <fileset dir="${sunri.resources.dir}/jbossws-context.war"> <include name="index.html"/>