[jbossws-commits] JBossWS SVN: r9669 - in stack/metro/trunk: modules/resources/src/main/resources/resources and 2 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Mar 24 06:19:34 EDT 2009
Author: richard.opalka at jboss.com
Date: 2009-03-24 06:19:34 -0400 (Tue, 24 Mar 2009)
New Revision: 9669
Added:
stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2151] providing wsrunclient shell scripts for metro
Added: stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat (rev 0)
+++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-03-24 10:19:34 UTC (rev 9669)
@@ -0,0 +1,68 @@
+ at echo off
+
+ at if not "%ECHO%" == "" echo %ECHO%
+ at 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
+if "%JBOSS_HOME%" = "" set JBOSS_HOME=%DIRNAME%\..
+
+rem Setup the java endorsed dirs
+set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
+
+rem Setup the tool classpath
+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/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/jboss-xml-binding.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/policy.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/xmlsec.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
+
+rem Stack specific libs
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-metro-client.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/mimepull.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/saaj-impl.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/xws-security.jar
+
+rem Execute the JVM
+"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS%
+:EOF
Added: stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh (rev 0)
+++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-03-24 10:19:34 UTC (rev 9669)
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+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
+
+while [ $# -ge 1 ]; do
+ case $1 in
+ "-classpath") WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$2"; shift;;
+ *) args=$args" $1";;
+ esac
+ shift
+done
+
+# 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 tool classpath
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/activation.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/jbossall-client.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-common.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/FastInfoset.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/policy.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/xmlsec.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
+
+# Stack specific dependencies
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-metro-client.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxws-api.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jsr181-api.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mimepull.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/saaj-impl.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/xws-security.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"`
+ WSRUNCLIENT_CLASSPATH=`cygpath --path --windows "$WSRUNCLIENT_CLASSPATH"`
+ JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
+fi
+
+# Execute the JVM
+"$JAVA" $JAVA_OPTS \
+ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
+ -classpath "$WSRUNCLIENT_CLASSPATH" \
+ $args
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-03-24 10:06:56 UTC (rev 9668)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-03-24 10:19:34 UTC (rev 9669)
@@ -21,6 +21,8 @@
<include name="**/wsconsume.sh"/>
<include name="**/wsprovide.bat"/>
<include name="**/wsprovide.sh"/>
+ <include name="**/wsrunclient.bat"/>
+ <include name="**/wsrunclient.sh"/>
</patternset>
<patternset id="jbossws.client.patternset">
@@ -36,6 +38,7 @@
<include name="**/jbossws-metro-wsit-rt.jar"/>
<include name="**/jbossws-metro-wsit-tools.jar"/>
<include name="**/jbossws-spi.jar"/>
+ <include name="**/mimepull.jar"/>
<include name="**/policy.jar"/>
<include name="**/streambuffer.jar"/>
<include name="**/stax-api.jar"/>
@@ -46,6 +49,7 @@
<include name="**/stax-api.jar"/>
<include name="**/wsdl4j.jar"/>
<include name="**/wstx.jar"/>
+ <include name="**/xws-security.jar"/>
</patternset>
<patternset id="jbossws.lib.patternset">
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-24 10:06:56 UTC (rev 9668)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-24 10:19:34 UTC (rev 9669)
@@ -63,7 +63,3 @@
# [JBWS-2532] Fix MTOM/XOP Content Type Testcase failure
org/jboss/test/ws/jaxws/jbws2419/**
-
-# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
-org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
-
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-24 10:06:56 UTC (rev 9668)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-24 10:19:34 UTC (rev 9669)
@@ -50,7 +50,3 @@
# [JBWS-2532] Fix MTOM/XOP Content Type Testcase failure
org/jboss/test/ws/jaxws/jbws2419/**
-
-# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
-org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
-
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-24 10:06:56 UTC (rev 9668)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-24 10:19:34 UTC (rev 9669)
@@ -47,7 +47,3 @@
# [JBWS-2532] Fix MTOM/XOP Content Type Testcase failure
org/jboss/test/ws/jaxws/jbws2419/**
-
-# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
-org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
-
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-24 10:06:56 UTC (rev 9668)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-24 10:19:34 UTC (rev 9669)
@@ -47,7 +47,3 @@
# [JBWS-2532] Fix MTOM/XOP Content Type Testcase failure
org/jboss/test/ws/jaxws/jbws2419/**
-
-# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
-org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
-
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-24 10:06:56 UTC (rev 9668)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-24 10:19:34 UTC (rev 9669)
@@ -47,7 +47,3 @@
# [JBWS-2532] Fix MTOM/XOP Content Type Testcase failure
org/jboss/test/ws/jaxws/jbws2419/**
-
-# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
-org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
-
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-24 10:06:56 UTC (rev 9668)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-24 10:19:34 UTC (rev 9669)
@@ -147,7 +147,8 @@
<outputDirectory>bin</outputDirectory>
<includes>
<include>wsconsume.*</include>
- <include>wsprovide.*</include>
+ <include>wsprovide.*</include>
+ <include>wsrunclient.*</include>
</includes>
</fileSet>
More information about the jbossws-commits
mailing list