Author: heiko.braun(a)jboss.com Date: 2008-06-04 06:04:12 -0400 (Wed, 04 Jun 2008) New Revision: 7322 Added: stack/cxf/trunk/src/main/etc/ stack/cxf/trunk/src/main/etc/wsconsume.bat stack/cxf/trunk/src/main/etc/wsconsume.sh stack/cxf/trunk/src/main/etc/wsprovide.bat stack/cxf/trunk/src/main/etc/wsprovide.sh Modified: stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: JBWS-2067: tools scripts for each stack Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2008-06-04 10:02:41 UTC (rev 7321) +++ stack/cxf/trunk/modules/management/pom.xml 2008-06-04 10:04:12 UTC (rev 7322) @@ -22,17 +22,10 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> <scope>runtime</scope> - </dependency> + </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> - <classifier>scripts</classifier> - <scope>runtime</scope> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> <classifier>testsuite</classifier> <scope>runtime</scope> <type>zip</type> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2008-06-04 10:02:41 UTC (rev 7321) +++ stack/cxf/trunk/modules/server/pom.xml 2008-06-04 10:04:12 UTC (rev 7322) @@ -28,12 +28,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <classifier>scripts</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-04 10:02:41 UTC (rev 7321) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-04 10:04:12 UTC (rev 7322) @@ -101,9 +101,6 @@ # [JBWS-2165] Fix xop tests with maven build org/jboss/test/ws/jaxws/samples/xop/** -# [JBWS-2164] Fix tools tests with maven build -org/jboss/test/ws/jaxws/smoke/tools/** - # [JBWS-2163] wsconsume for maven build org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-04 10:02:41 UTC (rev 7321) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-04 10:04:12 UTC (rev 7322) @@ -101,9 +101,6 @@ # [JBWS-2165] Fix xop tests with maven build org/jboss/test/ws/jaxws/samples/xop/** -# [JBWS-2164] Fix tools tests with maven build -org/jboss/test/ws/jaxws/smoke/tools/** - # [JBWS-2163] wsconsume for maven build org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-04 10:02:41 UTC (rev 7321) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-04 10:04:12 UTC (rev 7322) @@ -109,9 +109,6 @@ # [JBWS-2165] Fix xop tests with maven build org/jboss/test/ws/jaxws/samples/xop/** -# [JBWS-2164] Fix tools tests with maven build -org/jboss/test/ws/jaxws/smoke/tools/** - # [JBWS-2163] wsconsume for maven build org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-04 10:02:41 UTC (rev 7321) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-04 10:04:12 UTC (rev 7322) @@ -116,9 +116,6 @@ # [JBWS-2165] Fix xop tests with maven build org/jboss/test/ws/jaxws/samples/xop/** -# [JBWS-2164] Fix tools tests with maven build -org/jboss/test/ws/jaxws/smoke/tools/** - # [JBWS-2163] wsconsume for maven build org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2008-06-04 10:02:41 UTC (rev 7321) +++ stack/cxf/trunk/pom.xml 2008-06-04 10:04:12 UTC (rev 7322) @@ -77,18 +77,11 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> <version>${jbossws.framework.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> <version>${version}</version> - <classifier>scripts</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <version>${version}</version> <classifier>testsuite</classifier> <type>zip</type> </dependency> Added: stack/cxf/trunk/src/main/etc/wsconsume.bat =================================================================== --- stack/cxf/trunk/src/main/etc/wsconsume.bat (rev 0) +++ stack/cxf/trunk/src/main/etc/wsconsume.bat 2008-06-04 10:04:12 UTC (rev 7322) @@ -0,0 +1,58 @@ +@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 shared libs +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JAVA_HOME%/lib/tools.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/activation.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/mail.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-framework.jar + +rem shared jaxws libs +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-tools.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-rt.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-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/streambuffer.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-ex.jar + +rem stack specific libs +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-metro-client.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 %* Added: stack/cxf/trunk/src/main/etc/wsconsume.sh =================================================================== --- stack/cxf/trunk/src/main/etc/wsconsume.sh (rev 0) +++ stack/cxf/trunk/src/main/etc/wsconsume.sh 2008-06-04 10:04:12 UTC (rev 7322) @@ -0,0 +1,110 @@ +#!/bin/sh + +# +# @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 + +### +# Setup the wsconsume classpath +### + +# 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" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-common.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-framework.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" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/streambuffer.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-ex.jar" + +# Stack specific dependencies +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-metro-client.jar" + +### +# 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 "$@" Added: stack/cxf/trunk/src/main/etc/wsprovide.bat =================================================================== --- stack/cxf/trunk/src/main/etc/wsprovide.bat (rev 0) +++ stack/cxf/trunk/src/main/etc/wsprovide.bat 2008-06-04 10:04:12 UTC (rev 7322) @@ -0,0 +1,60 @@ +@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 shared libs +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JAVA_HOME%/lib/tools.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-framework.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/activation.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/mail.jar + +rem shared jaxws libs +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/jaxb-xjc.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-tools.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-rt.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/streambuffer.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/stax-ex.jar + +rem stack specific libs +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-metro-client.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-impl.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 %* Added: stack/cxf/trunk/src/main/etc/wsprovide.sh =================================================================== --- stack/cxf/trunk/src/main/etc/wsprovide.sh (rev 0) +++ stack/cxf/trunk/src/main/etc/wsprovide.sh 2008-06-04 10:04:12 UTC (rev 7322) @@ -0,0 +1,114 @@ +#!/bin/sh + +# +# @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 + +### +# 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/jbossws-common.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-framework.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/activation.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/getopt.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/log4j.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/mail.jar" + +# shared jaxws libs +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$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" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/streambuffer.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/stax-ex.jar" + +# stack specific dependencies +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-metro-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" + +### +# 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: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-04 10:02:41 UTC (rev 7321) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-04 10:04:12 UTC (rev 7322) @@ -67,17 +67,8 @@ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <includeDependencies>false</includeDependencies> <unpack>false</unpack> - <dependencySets> + <dependencySets> <dependencySet> - <outputDirectory>bin</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>true</unpack> - <includes> - <include>*:jbossws-framework:zip:scripts</include> - </includes> - </dependencySet> - <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> @@ -108,9 +99,21 @@ </moduleSet> </moduleSets> - <!-- resources --> + <fileSets> + + <!-- bin --> <fileSet> + <directory>src/main/etc</directory> + <outputDirectory>bin</outputDirectory> + <includes> + <include>wsconsume.*</include> + <include>wsprovide.*</include> + </includes> + </fileSet> + + <!-- resources --> + <fileSet> <directory>modules/server/target/resources</directory> <outputDirectory>resources</outputDirectory> <includes>