April 2009 - jbossws-commits - Jboss List Archives

JBossWS SVN: r9750 - stack/cxf/trunk/modules/resources/src/main/resources/bin.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-04-06 09:38:38 -0400 (Mon, 06 Apr 2009) New Revision: 9750 Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh Log: fixing comment Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-04-06 13:36:35 UTC (rev 9749) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-04-06 13:38:38 UTC (rev 9750) @@ -82,5 +82,5 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/xml-resolver.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar -rem Execute the JVM +rem Execute the command "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %* Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-04-06 13:36:35 UTC (rev 9749) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-04-06 13:38:38 UTC (rev 9750) @@ -116,10 +116,6 @@ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/xml-resolver.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/wsdl4j.jar" -### -# Execute the JVM -### - # For Cygwin, switch paths to Windows format before running java if $cygwin; then JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` @@ -128,6 +124,7 @@ JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` fi +# Execute the command "$JAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -classpath "$WSCONSUME_CLASSPATH" \ Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-04-06 13:36:35 UTC (rev 9749) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-04-06 13:38:38 UTC (rev 9750) @@ -94,5 +94,5 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar -rem Execute the JVM +rem Execute the command "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %* Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-04-06 13:36:35 UTC (rev 9749) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-04-06 13:38:38 UTC (rev 9750) @@ -130,10 +130,6 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wsdl4j.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wstx.jar" -### -# Execute the JVM -### - # For Cygwin, switch paths to Windows format before running java if $cygwin; then JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` @@ -142,6 +138,7 @@ JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` fi +# Execute the command "$JAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -classpath "$WSPROVIDE_CLASSPATH" \ Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-04-06 13:36:35 UTC (rev 9749) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-04-06 13:38:38 UTC (rev 9750) @@ -1,108 +1,108 @@ -@echo off - -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=.\ -if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% -set PROGNAME=run.bat -if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% - -if not [%1] == [] goto start - echo %PROGNAME% is a command line tool that invokes a JBossWS JAX-WS Web Service client. - echo It builds the correct classpath and endorsed libs for you. Feel free to use - echo the code for this script to make your own shell scripts. It is open source - echo after all. - echo. - echo usage: %PROGNAME% [-classpath ^<additional class path^>] ^<java-main-class^> [arguments...] - goto EOF -:start -set ARGS= -:loop -if [%1] == [] goto endloop - if not %1 == -classpath goto argset - set WSRUNCLIENT_CLASSPATH=%2 - shift - shift - goto loop - :argset - set ARGS=%ARGS% %1 - shift - goto loop -:endloop - -set JAVA=%JAVA_HOME%\bin\java -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-framework.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/stax-api.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/xmlsec.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar - -rem stack specific libs -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/asm.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-cxf-client.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-api.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-common-utilities.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-corba.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-http.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-xml.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-object.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-soap.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-core.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-databinding-jaxb.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-frontend-jaxws.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-frontend-jaxrs.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-frontend-simple.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-javascript.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-management.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http-jetty.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-jms.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-local.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-addr.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-policy.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-rm.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-java2ws.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-common.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-wstx-msv-validation.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-collections.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-lang.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-logging.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-ejb3x.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-beans.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-context.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-core.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/stax-api.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/XmlSchema.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/xml-resolver.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar - -rem Execute the JVM -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS% -:EOF +@echo off + +@if not "%ECHO%" == "" echo %ECHO% +@if "%OS%" == "Windows_NT" setlocal + +set DIRNAME=.\ +if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% +set PROGNAME=run.bat +if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% + +if not [%1] == [] goto start + echo %PROGNAME% is a command line tool that invokes a JBossWS JAX-WS Web Service client. + echo It builds the correct classpath and endorsed libs for you. Feel free to use + echo the code for this script to make your own shell scripts. It is open source + echo after all. + echo. + echo usage: %PROGNAME% [-classpath ^<additional class path^>] ^<java-main-class^> [arguments...] + goto EOF +:start +set ARGS= +:loop +if [%1] == [] goto endloop + if not %1 == -classpath goto argset + set WSRUNCLIENT_CLASSPATH=%2 + shift + shift + goto loop + :argset + set ARGS=%ARGS% %1 + shift + goto loop +:endloop + +set JAVA=%JAVA_HOME%\bin\java +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-framework.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/stax-api.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/xmlsec.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar + +rem stack specific libs +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/asm.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-cxf-client.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-api.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-common-utilities.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-corba.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-http.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-xml.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-object.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-soap.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-core.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-databinding-jaxb.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-frontend-jaxws.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-frontend-jaxrs.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-frontend-simple.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-javascript.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-management.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http-jetty.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-jms.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-local.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-addr.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-policy.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-rm.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-java2ws.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-common.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/cxf-wstx-msv-validation.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-collections.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-lang.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-logging.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-ejb3x.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-beans.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-context.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-core.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/stax-api.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/XmlSchema.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/xml-resolver.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar + +rem Execute the command +"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS% +:EOF Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-04-06 13:36:35 UTC (rev 9749) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-04-06 13:38:38 UTC (rev 9750) @@ -136,7 +136,7 @@ JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` fi -# Execute the JVM +# Execute the command "$JAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -classpath "$WSRUNCLIENT_CLASSPATH" \

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r9749 - stack/metro/trunk/modules/resources/src/main/resources/bin.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-04-06 09:36:35 -0400 (Mon, 06 Apr 2009) New Revision: 9749 Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh Log: fixing comment Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-04-06 13:31:02 UTC (rev 9748) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-04-06 13:36:35 UTC (rev 9749) @@ -40,5 +40,5 @@ rem Stack specific libs set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-metro-client.jar -rem Execute the JVM +rem Execute the command "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %* Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-04-06 13:31:02 UTC (rev 9748) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-04-06 13:36:35 UTC (rev 9749) @@ -86,6 +86,7 @@ JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` fi +# Execute the command "$JAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -classpath "$WSCONSUME_CLASSPATH" \ Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-04-06 13:31:02 UTC (rev 9748) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-04-06 13:36:35 UTC (rev 9749) @@ -42,5 +42,5 @@ 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 +rem Execute the command "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %* Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-04-06 13:31:02 UTC (rev 9748) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-04-06 13:36:35 UTC (rev 9749) @@ -88,6 +88,7 @@ JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` fi +# Execute the command "$JAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -classpath "$WSPROVIDE_CLASSPATH" \ Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-04-06 13:31:02 UTC (rev 9748) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-04-06 13:36:35 UTC (rev 9749) @@ -63,6 +63,6 @@ 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 +rem Execute the command "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS% :EOF Modified: stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-04-06 13:31:02 UTC (rev 9748) +++ stack/metro/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-04-06 13:36:35 UTC (rev 9749) @@ -96,7 +96,7 @@ JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` fi -# Execute the JVM +# Execute the command "$JAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -classpath "$WSRUNCLIENT_CLASSPATH" \

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r9748 - stack/native/trunk/modules/resources/src/main/resources/bin.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-04-06 09:31:02 -0400 (Mon, 06 Apr 2009) New Revision: 9748 Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh stack/native/trunk/modules/resources/src/main/resources/bin/wstools.bat stack/native/trunk/modules/resources/src/main/resources/bin/wstools.sh Log: fixing comment Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-04-06 13:19:46 UTC (rev 9747) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-04-06 13:31:02 UTC (rev 9748) @@ -9,7 +9,7 @@ if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% set JAVA=%JAVA_HOME%\bin\java -@if "%JBOSS_HOME%" == "" set JBOSS_HOME=%DIRNAME%\.. +if "%JBOSS_HOME%" == "" set JBOSS_HOME=%DIRNAME%\.. rem Setup the java endorsed dirs set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed @@ -46,5 +46,5 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-jaxrpc.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-saaj.jar -rem Execute the JVM +rem Execute the command "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %* Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-04-06 13:19:46 UTC (rev 9747) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-04-06 13:31:02 UTC (rev 9748) @@ -92,6 +92,7 @@ JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` fi +# Execute the command "$JAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -classpath "$WSCONSUME_CLASSPATH" \ Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-04-06 13:19:46 UTC (rev 9747) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-04-06 13:31:02 UTC (rev 9748) @@ -47,5 +47,5 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/policy.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar -rem Execute the JVM +rem Execute the command "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %* Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-04-06 13:19:46 UTC (rev 9747) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-04-06 13:31:02 UTC (rev 9748) @@ -93,6 +93,7 @@ JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` fi +# Execute the command "$JAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -classpath "$WSPROVIDE_CLASSPATH" \ Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-04-06 13:19:46 UTC (rev 9747) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-04-06 13:31:02 UTC (rev 9748) @@ -60,6 +60,6 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/xmlsec.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar -rem Execute the JVM +rem Execute the command "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS% :EOF Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-04-06 13:19:46 UTC (rev 9747) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-04-06 13:31:02 UTC (rev 9748) @@ -93,7 +93,7 @@ JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` fi -# Execute the JVM +# Execute the command "$JAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -classpath "$WSRUNCLIENT_CLASSPATH" \ Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wstools.bat =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wstools.bat 2009-04-06 13:19:46 UTC (rev 9747) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wstools.bat 2009-04-06 13:31:02 UTC (rev 9748) @@ -50,5 +50,5 @@ echo =========================================================================" echo . -rem Execute the JVM +rem Execute the command "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -classpath "%WSTOOLS_CLASSPATH%" org.jboss.ws.tools.WSTools %* Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wstools.sh =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/bin/wstools.sh 2009-04-06 13:19:46 UTC (rev 9747) +++ stack/native/trunk/modules/resources/src/main/resources/bin/wstools.sh 2009-04-06 13:31:02 UTC (rev 9748) @@ -89,7 +89,7 @@ echo "=========================================================================" echo "" -# Execute the JVM +# Execute the command "$JAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -classpath "$WSTOOLS_CLASSPATH" \

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r9747 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-04-06 09:19:46 -0400 (Mon, 06 Apr 2009) New Revision: 9747 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java Log: [JBWS-2327] fixing test case Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java 2009-04-06 13:18:05 UTC (rev 9746) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java 2009-04-06 13:19:46 UTC (rev 9747) @@ -3,8 +3,10 @@ import java.io.File; import java.io.BufferedReader; import java.io.FileReader; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; import org.jboss.wsf.test.JBossWSTest; @@ -18,8 +20,9 @@ private static final String FS = System.getProperty("file.separator"); private static final String PS = System.getProperty("path.separator"); + private static final boolean isUnix = ":".equals( PS ); private static final String SP = " "; - private static final String EXT = ":".equals( PS ) ? ".sh" : ".bat"; + private static final String EXT = isUnix ? ".sh" : ".bat"; private List<String> integrationJars; private String commandLineProperties; private String additionalClasspath; @@ -54,14 +57,16 @@ public void test() throws Exception { StringBuilder sb = new StringBuilder(); + Map<String, String> env = new HashMap<String, String>(); + env.put("WSRUNCLIENT_CLASSPATH", additionalClasspath); + env.put("JAVA_OPTS", commandLineProperties); + sb.append(jbossHome).append(FS).append("bin").append(FS).append("wsrunclient").append(EXT); - sb.append(SP).append("-classpath").append(SP).append(additionalClasspath); - sb.append(SP).append(commandLineProperties); sb.append(SP).append("junit.textui.TestRunner").append(SP); String commandWithoutTestParam = sb.toString(); for (String test : testsToExecute) { - executeCommand(commandWithoutTestParam + test, "wsrunclient"); + executeCommand(commandWithoutTestParam + test, null, "wsrunclient", env); // There's no need to verify the test output. // If test that is executed fails executeCommand will fail (because of SC != 0) // The same applies to wrongly configured wsrunclient classpath.

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r9746 - common/trunk/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-04-06 09:18:05 -0400 (Mon, 06 Apr 2009) New Revision: 9746 Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java Log: [JBWS-2327] extending JBossWSTest Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2009-04-04 07:40:06 UTC (rev 9745) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2009-04-06 13:18:05 UTC (rev 9746) @@ -30,6 +30,10 @@ import java.util.Arrays; import java.util.Hashtable; import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; import javax.management.MBeanServerConnection; import javax.naming.Context; @@ -40,7 +44,6 @@ import org.jboss.logging.Logger; import org.jboss.wsf.common.DOMWriter; -import org.jboss.wsf.common.IOUtils; import org.jboss.wsf.common.concurrent.CopyJob; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -73,7 +76,7 @@ */ public void executeCommand(String command) throws IOException { - this.executeCommand(command, null, null); + this.executeCommand(command, null, null, null); } /** @@ -84,7 +87,7 @@ */ public void executeCommand(String command, String message) throws IOException { - this.executeCommand(command, null, message); + this.executeCommand(command, null, message, null); } /** @@ -95,7 +98,7 @@ */ public void executeCommand(String command, OutputStream os) throws IOException { - this.executeCommand(command, os, null); + this.executeCommand(command, os, null, null); } /** @@ -107,11 +110,63 @@ */ public void executeCommand(String command, OutputStream os, String message) throws IOException { + this.executeCommand(command, os, message, null); + } + + /** + * Execute command in separate process, copy process input to os. If process will fail, display custom message in assertion. + * @param command command to execute + * @param os output stream to copy process input to. If null, System.out will be used + * @param message message to display if assertion fails + * @param env environment + * @throws IOException if I/O error occurs + */ + public void executeCommand(String command, OutputStream os, String message, Map<String, String> env) throws IOException + { if (command == null) throw new NullPointerException( "Command cannot be null" ); System.out.println("Executing command: " + command); - Process p = Runtime.getRuntime().exec(command); + log.debug("Executing command: " + command); + + StringTokenizer st = new StringTokenizer(command, " \t\r"); + List<String> tokenizedCommand = new LinkedList<String>(); + while (st.hasMoreTokens()) + { + // PRECONDITION: command doesn't contain whitespaces in the paths + tokenizedCommand.add(st.nextToken()); + } + + try + { + this.executeCommand(tokenizedCommand, os, message, env); + } + catch (IOException e) + { + log.warn("Make sure there are no whitespaces in command paths", e); + throw e; + } + } + + /** + * Execute command in separate process, copy process input to os. If process will fail, display custom message in assertion. + * @param command command to execute + * @param os output stream to copy process input to. If null, System.out will be used + * @param message message to display if assertion fails + * @param env environment + * @throws IOException if I/O error occurs + */ + private void executeCommand(List<String> command, OutputStream os, String message, Map<String, String> env) throws IOException + { + ProcessBuilder pb = new ProcessBuilder(command); + if (env != null) + { + for (String variable : env.keySet()) + { + pb.environment().put(variable, env.get(variable)); + } + } + Process p = pb.start(); CopyJob inputStreamJob = new CopyJob(p.getInputStream(), os == null ? System.out : os); CopyJob errorStreamJob = new CopyJob(p.getErrorStream(), System.err); // unfortunately the following threads are needed because of Windows behavior

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r9745 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-04-04 03:40:06 -0400 (Sat, 04 Apr 2009) New Revision: 9745 Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt Log: [JBWS-2074] enabling tests Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-04 07:30:36 UTC (rev 9744) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-04 07:40:06 UTC (rev 9745) @@ -9,8 +9,5 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -# [JBWS-2074] Resource injection in jaxws endpoints and handlers -org/jboss/test/ws/jaxws/jbws2074/** - # [JBWS-2217] Fix BPEL jaxrpc samples org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-04 07:30:36 UTC (rev 9744) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-04 07:40:06 UTC (rev 9745) @@ -9,8 +9,5 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -# [JBWS-2074] Resource injection in jaxws endpoints and handlers -org/jboss/test/ws/jaxws/jbws2074/** - # [JBWS-2217] Fix BPEL jaxrpc samples org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r9744 - in stack/native/tags/jbossws-native-3.1.1.CR1: modules/client and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-04-04 03:30:36 -0400 (Sat, 04 Apr 2009) New Revision: 9744 Modified: stack/native/tags/jbossws-native-3.1.1.CR1/modules/client/pom.xml stack/native/tags/jbossws-native-3.1.1.CR1/modules/core/pom.xml stack/native/tags/jbossws-native-3.1.1.CR1/modules/jaxrpc/pom.xml stack/native/tags/jbossws-native-3.1.1.CR1/modules/jaxws-ext/pom.xml stack/native/tags/jbossws-native-3.1.1.CR1/modules/jaxws/pom.xml stack/native/tags/jbossws-native-3.1.1.CR1/modules/management/pom.xml stack/native/tags/jbossws-native-3.1.1.CR1/modules/resources/pom.xml stack/native/tags/jbossws-native-3.1.1.CR1/modules/saaj/pom.xml stack/native/tags/jbossws-native-3.1.1.CR1/modules/testsuite/framework-tests/pom.xml stack/native/tags/jbossws-native-3.1.1.CR1/modules/testsuite/native-tests/pom.xml stack/native/tags/jbossws-native-3.1.1.CR1/modules/testsuite/pom.xml stack/native/tags/jbossws-native-3.1.1.CR1/pom.xml Log: fixing release tag Modified: stack/native/tags/jbossws-native-3.1.1.CR1/modules/client/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.1.CR1/modules/client/pom.xml 2009-04-04 06:45:28 UTC (rev 9743) +++ stack/native/tags/jbossws-native-3.1.1.CR1/modules/client/pom.xml 2009-04-04 07:30:36 UTC (rev 9744) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.CR1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.1.CR1/modules/core/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.1.CR1/modules/core/pom.xml 2009-04-04 06:45:28 UTC (rev 9743) +++ stack/native/tags/jbossws-native-3.1.1.CR1/modules/core/pom.xml 2009-04-04 07:30:36 UTC (rev 9744) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.CR1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.1.CR1/modules/jaxrpc/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.1.CR1/modules/jaxrpc/pom.xml 2009-04-04 06:45:28 UTC (rev 9743) +++ stack/native/tags/jbossws-native-3.1.1.CR1/modules/jaxrpc/pom.xml 2009-04-04 07:30:36 UTC (rev 9744) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.CR1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.1.CR1/modules/jaxws/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.1.CR1/modules/jaxws/pom.xml 2009-04-04 06:45:28 UTC (rev 9743) +++ stack/native/tags/jbossws-native-3.1.1.CR1/modules/jaxws/pom.xml 2009-04-04 07:30:36 UTC (rev 9744) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.CR1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.1.CR1/modules/jaxws-ext/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.1.CR1/modules/jaxws-ext/pom.xml 2009-04-04 06:45:28 UTC (rev 9743) +++ stack/native/tags/jbossws-native-3.1.1.CR1/modules/jaxws-ext/pom.xml 2009-04-04 07:30:36 UTC (rev 9744) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.CR1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.1.CR1/modules/management/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.1.CR1/modules/management/pom.xml 2009-04-04 06:45:28 UTC (rev 9743) +++ stack/native/tags/jbossws-native-3.1.1.CR1/modules/management/pom.xml 2009-04-04 07:30:36 UTC (rev 9744) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.CR1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.1.CR1/modules/resources/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.1.CR1/modules/resources/pom.xml 2009-04-04 06:45:28 UTC (rev 9743) +++ stack/native/tags/jbossws-native-3.1.1.CR1/modules/resources/pom.xml 2009-04-04 07:30:36 UTC (rev 9744) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.CR1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.1.CR1/modules/saaj/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.1.CR1/modules/saaj/pom.xml 2009-04-04 06:45:28 UTC (rev 9743) +++ stack/native/tags/jbossws-native-3.1.1.CR1/modules/saaj/pom.xml 2009-04-04 07:30:36 UTC (rev 9744) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.CR1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.1.CR1/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.1.CR1/modules/testsuite/framework-tests/pom.xml 2009-04-04 06:45:28 UTC (rev 9743) +++ stack/native/tags/jbossws-native-3.1.1.CR1/modules/testsuite/framework-tests/pom.xml 2009-04-04 07:30:36 UTC (rev 9744) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-testsuite</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.CR1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.1.CR1/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.1.CR1/modules/testsuite/native-tests/pom.xml 2009-04-04 06:45:28 UTC (rev 9743) +++ stack/native/tags/jbossws-native-3.1.1.CR1/modules/testsuite/native-tests/pom.xml 2009-04-04 07:30:36 UTC (rev 9744) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-testsuite</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.CR1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.1.CR1/modules/testsuite/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.1.CR1/modules/testsuite/pom.xml 2009-04-04 06:45:28 UTC (rev 9743) +++ stack/native/tags/jbossws-native-3.1.1.CR1/modules/testsuite/pom.xml 2009-04-04 07:30:36 UTC (rev 9744) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.CR1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.1.CR1/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.1.CR1/pom.xml 2009-04-04 06:45:28 UTC (rev 9743) +++ stack/native/tags/jbossws-native-3.1.1.CR1/pom.xml 2009-04-04 07:30:36 UTC (rev 9744) @@ -18,7 +18,7 @@ <artifactId>jbossws-native</artifactId> <packaging>pom</packaging> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.CR1</version>  <parent> @@ -29,9 +29,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/trunk</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url> </scm>  @@ -48,17 +48,17 @@  <properties> - <jbossws.common.version>1.0.10-SNAPSHOT</jbossws.common.version> - <jbossws.framework.version>3.1.1-SNAPSHOT</jbossws.framework.version> - <jbossws.spi.version>1.1.1-SNAPSHOT</jbossws.spi.version> - <jbossws.jboss423.version>3.1.1-SNAPSHOT</jbossws.jboss423.version> - <jbossws.jboss500.version>3.1.1-SNAPSHOT</jbossws.jboss500.version> - <jbossws.jboss501.version>3.1.1-SNAPSHOT</jbossws.jboss501.version> + <jbossws.common.version>1.0.10.CR1</jbossws.common.version> + <jbossws.framework.version>3.1.1.CR1</jbossws.framework.version> + <jbossws.spi.version>1.1.1.CR1</jbossws.spi.version> + <jbossws.jboss423.version>3.1.0.GA</jbossws.jboss423.version> + <jbossws.jboss500.version>3.1.0.GA</jbossws.jboss500.version> + <jbossws.jboss501.version>3.1.0.GA</jbossws.jboss501.version>     <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r9743 - in container/jboss50/branches: jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-04-04 02:45:28 -0400 (Sat, 04 Apr 2009) New Revision: 9743 Modified: container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java Log: [JBWS-2589] Some deployment failures prevent re-deployment. Modified: container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java =================================================================== --- container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java 2009-04-04 06:25:00 UTC (rev 9742) +++ container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java 2009-04-04 06:45:28 UTC (rev 9743) @@ -72,8 +72,8 @@ dep.addAttachment(DeploymentUnit.class, unit); } + unit.addAttachment(Deployment.class, dep); getDeploymentAspectManager().deploy(dep); - unit.addAttachment(Deployment.class, dep); } } Modified: container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java =================================================================== --- container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java 2009-04-04 06:25:00 UTC (rev 9742) +++ container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java 2009-04-04 06:45:28 UTC (rev 9743) @@ -72,8 +72,8 @@ dep.addAttachment(DeploymentUnit.class, unit); } + unit.addAttachment(Deployment.class, dep); getDeploymentAspectManager().deploy(dep); - unit.addAttachment(Deployment.class, dep); } }

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r9742 - stack/native/tags.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-04-04 02:25:00 -0400 (Sat, 04 Apr 2009) New Revision: 9742 Added: stack/native/tags/jbossws-native-3.1.1.CR1/ Log: creating release tag Copied: stack/native/tags/jbossws-native-3.1.1.CR1 (from rev 9741, stack/native/trunk)

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r9741 - framework/tags/jbossws-framework-3.1.1.CR1.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-04-04 02:19:24 -0400 (Sat, 04 Apr 2009) New Revision: 9741 Modified: framework/tags/jbossws-framework-3.1.1.CR1/pom.xml Log: fixing release tag Modified: framework/tags/jbossws-framework-3.1.1.CR1/pom.xml =================================================================== --- framework/tags/jbossws-framework-3.1.1.CR1/pom.xml 2009-04-04 06:16:56 UTC (rev 9740) +++ framework/tags/jbossws-framework-3.1.1.CR1/pom.xml 2009-04-04 06:19:24 UTC (rev 9741) @@ -7,7 +7,7 @@ <artifactId>jbossws-framework</artifactId> <packaging>jar</packaging> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.CR1</version>  <parent> @@ -18,15 +18,15 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/framework/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/framework/trunk</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/framework/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/framework/tags/jbossws-fra...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/framework/tags/jbossws-framew...</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/framework/tags/jbossws-framework...</url> </scm>  <properties> - <jbossws.common.version>1.0.10-SNAPSHOT</jbossws.common.version> - <jbossws.spi.version>1.1.1-SNAPSHOT</jbossws.spi.version> + <jbossws.common.version>1.0.10.CR1</jbossws.common.version> + <jbossws.spi.version>1.1.1.CR1</jbossws.spi.version> <jboss.common.version>1.2.1.GA</jboss.common.version> <jbossxb.version>1.0.0.SP1</jbossxb.version> </properties>

15 years, 11 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits April 2009