Author: richard.opalka(a)jboss.com Date: 2008-06-13 04:51:19 -0400 (Fri, 13 Jun 2008) New Revision: 7517 Added: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/ stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/pom.xml stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/ stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/ stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/ stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/ stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/jbossws-default-deploy.conf stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsconsume.bat stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsconsume.sh stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsprovide.bat stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsprovide.sh Removed: stack/cxf/branches/jbossws-cxf-3.0.2/src/main/distro/jbossws-default-deploy.conf stack/cxf/branches/jbossws-cxf-3.0.2/src/main/etc/ Modified: stack/cxf/branches/jbossws-cxf-3.0.2/build.xml stack/cxf/branches/jbossws-cxf-3.0.2/pom.xml stack/cxf/branches/jbossws-cxf-3.0.2/src/main/distro/build.xml stack/cxf/branches/jbossws-cxf-3.0.2/src/main/scripts/assembly-bin-dist.xml stack/cxf/branches/jbossws-cxf-3.0.2/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2231] introduced resources module + applied necessary refactoring Modified: stack/cxf/branches/jbossws-cxf-3.0.2/build.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/build.xml 2008-06-13 08:34:41 UTC (rev 7516) +++ stack/cxf/branches/jbossws-cxf-3.0.2/build.xml 2008-06-13 08:51:19 UTC (rev 7517) @@ -31,7 +31,7 @@ <import file="${stack.distro.dir}/build-deploy.xml"/> <import file="${stack.distro.dir}/jbossws-deploy-macros.xml"/> - <property name="jbossws.default.deploy.conf" value="${stack.distro.dir}/jbossws-default-deploy.conf"/> + <property name="jbossws.default.deploy.conf" value="${stack.dir}/modules/resources/src/main/resources/bin/jbossws-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> <!-- ================================================================== --> Added: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/pom.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/pom.xml 2008-06-13 08:51:19 UTC (rev 7517) @@ -0,0 +1,17 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBoss Web Services - Stack CXF Resources</name> + <artifactId>jbossws-cxf-resources</artifactId> + <packaging>jar</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf</artifactId> + <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + +</project> Property changes on: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/jbossws-default-deploy.conf =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/jbossws-default-deploy.conf (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/jbossws-default-deploy.conf 2008-06-13 08:51:19 UTC (rev 7517) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsconsume.bat (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsconsume.bat 2008-06-13 08:51:19 UTC (rev 7517) @@ -0,0 +1,58 @@ +@echo off + +rem $Id$ + +@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 %* Property changes on: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsconsume.bat ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsconsume.sh (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsconsume.sh 2008-06-13 08:51:19 UTC (rev 7517) @@ -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 "$@" Property changes on: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsconsume.sh ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsprovide.bat (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsprovide.bat 2008-06-13 08:51:19 UTC (rev 7517) @@ -0,0 +1,60 @@ +@echo off + +rem $Id$ + +@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 %* Property changes on: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsprovide.bat ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsprovide.sh (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsprovide.sh 2008-06-13 08:51:19 UTC (rev 7517) @@ -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 "$@" Property changes on: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/bin/wsprovide.sh ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/branches/jbossws-cxf-3.0.2/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/pom.xml 2008-06-13 08:34:41 UTC (rev 7516) +++ stack/cxf/branches/jbossws-cxf-3.0.2/pom.xml 2008-06-13 08:51:19 UTC (rev 7517) @@ -41,6 +41,7 @@ <module>modules/server</module> <module>modules/client</module> <module>modules/management</module> + <module>modules/resources</module> </modules> <!-- Properties --> Modified: stack/cxf/branches/jbossws-cxf-3.0.2/src/main/distro/build.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/src/main/distro/build.xml 2008-06-13 08:34:41 UTC (rev 7516) +++ stack/cxf/branches/jbossws-cxf-3.0.2/src/main/distro/build.xml 2008-06-13 08:51:19 UTC (rev 7517) @@ -25,7 +25,7 @@ <property name="tests.output.dir" value="${output.dir}"/> <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> - <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> + <property name="jbossws.default.deploy.conf" value="${basedir}/../../../modules/resources/src/main/resources/bin/jbossws-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> <!-- Check if ant.properties is available --> Deleted: stack/cxf/branches/jbossws-cxf-3.0.2/src/main/distro/jbossws-default-deploy.conf =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/src/main/distro/jbossws-default-deploy.conf 2008-06-13 08:34:41 UTC (rev 7516) +++ stack/cxf/branches/jbossws-cxf-3.0.2/src/main/distro/jbossws-default-deploy.conf 2008-06-13 08:51:19 UTC (rev 7517) @@ -1 +0,0 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar \ No newline at end of file Modified: stack/cxf/branches/jbossws-cxf-3.0.2/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/src/main/scripts/assembly-bin-dist.xml 2008-06-13 08:34:41 UTC (rev 7516) +++ stack/cxf/branches/jbossws-cxf-3.0.2/src/main/scripts/assembly-bin-dist.xml 2008-06-13 08:51:19 UTC (rev 7517) @@ -31,12 +31,18 @@ <includes> <include>build-deploy.xml</include> <include>build-setup.xml</include> - <include>jbossws-default-deploy.conf</include> <include>jbossws-deploy-macros.xml</include> <include>build-project-gen.xml</include> <include>user-project-build.xml</include> </includes> </fileSet> + <fileSet> + <directory>modules/resources/src/main/resources/bin</directory> + <outputDirectory>build</outputDirectory> + <includes> + <include>jbossws-default-deploy.conf</include> + </includes> + </fileSet> <!-- docs --> <fileSet> <directory>src/main/distro</directory> Modified: stack/cxf/branches/jbossws-cxf-3.0.2/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-13 08:34:41 UTC (rev 7516) +++ stack/cxf/branches/jbossws-cxf-3.0.2/src/main/scripts/assembly-deploy-artifacts.xml 2008-06-13 08:51:19 UTC (rev 7517) @@ -101,10 +101,9 @@ <fileSets> - - <!-- bin --> + <!-- bin --> <fileSet> - <directory>src/main/etc</directory> + <directory>modules/resources/src/main/resources/bin</directory> <outputDirectory>bin</outputDirectory> <includes> <include>wsconsume.*</include> @@ -112,7 +111,7 @@ </includes> </fileSet> - <!-- resources --> + <!-- resources --> <fileSet> <directory>modules/server/target/resources</directory> <outputDirectory>resources</outputDirectory>