February 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r2325 - in trunk: build/ant-import and 11 other directories.

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-02-09 17:14:15 -0500 (Fri, 09 Feb 2007) New Revision: 2325 Added: trunk/build/etc/wsconsume trunk/build/etc/wsconsume.bat trunk/build/etc/wsprovide trunk/build/etc/wsprovide.bat trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/wsconsume.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/wsprovide.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/Locator.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WSContractConsumer.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WSContractProvider.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsconsume.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderFactoryImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WSContractConsumerFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WSContractProviderFactory.java Removed: trunk/build/etc/wsgen.bat trunk/build/etc/wsgen.sh trunk/build/etc/wsimport.bat trunk/build/etc/wsimport.sh trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/WSGenerate.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/WSImport.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/WSGenerate.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/WSImport.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/ProviderLocator.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WebServiceGenerator.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WebServiceImporter.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WebServiceGeneratorImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WebServiceGeneratorProviderImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WebServiceGeneratorProvider.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WebServiceImporterProvider.java Modified: trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/version.properties trunk/jbossws-core/build.xml trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jaxws/WebServiceGeneratorTestCase.java Log: rename tools Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/build/ant-import/build-release.xml 2007-02-09 22:14:15 UTC (rev 2325) @@ -151,10 +151,10 @@ <fileset dir="${etc.dir}"> <include name="wstools.bat"/> <include name="wstools.sh"/> - <include name="wsgen.bat"/> - <include name="wsgen.sh"/> - <include name="wsimport.bat"/> - <include name="wsimport.sh"/> + <include name="wsprovide.bat"/> + <include name="wsprovide"/> + <include name="wsconsume.bat"/> + <include name="wsconsume"/> </fileset> </copy> Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/build/ant-import/build-thirdparty.xml 2007-02-09 22:14:15 UTC (rev 2325) @@ -72,7 +72,7 @@ <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-sun-wsimport/${jbossws-sun-wsimport}/lib/jbossws-sun-wsimport.jar" dest="${thirdparty.dir}/jbossws-sun-wsimport.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/> <mkdir dir="${thirdparty.dir}/jbpm-bpel"/> <unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/> Copied: trunk/build/etc/wsconsume (from rev 2305, trunk/build/etc/wsimport.sh) =================================================================== --- trunk/build/etc/wsconsume (rev 0) +++ trunk/build/etc/wsconsume 2007-02-09 22:14:15 UTC (rev 2325) @@ -0,0 +1,81 @@ +#!/bin/sh + +# $Id: wsgen.sh 2158 2007-01-27 06:20:59Z jason.greene(a)jboss.com $ + +DIRNAME=`dirname $0` +PROGNAME=`basename $0` + +# OS specific support (must be 'true' or 'false'). +cygwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JBOSS_HOME" ] && + JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Setup JBOSS_HOME +if [ "x$JBOSS_HOME" = "x" ]; then + # get the full path (without any relative bits) + JBOSS_HOME=`cd $DIRNAME/..; pwd` +fi +export JBOSS_HOME + +# Setup the JVM +if [ "x$JAVA" = "x" ]; then + if [ "x$JAVA_HOME" != "x" ]; then + JAVA="$JAVA_HOME/bin/java" + else + JAVA="java" + fi +fi + +#JPDA options. Uncomment and modify as appropriate to enable remote debugging . +#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" + +# Setup JBoss sepecific properties +JAVA_OPTS="$JAVA_OPTS" + +# Setup the java endorsed dirs +JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" + +# Setup the wstools classpath +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JAVA_HOME/lib/tools.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/wstx.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-wsimport-impl.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/activation.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/getopt.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/javassist.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/log4j.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/mail.jar" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + WSCONSUME_CLASSPATH=`cygpath --path --windows "$WSCONSUME_CLASSPATH"` + JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` +fi + +# Execute the JVM +"$JAVA" $JAVA_OPTS \ + -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ + -Dlog4j.configuration=wstools-log4j.xml \ + -classpath "$WSCONSUME_CLASSPATH" \ + org.jboss.ws.tools.jaxws.command.wsconsume "$@" Copied: trunk/build/etc/wsconsume.bat (from rev 2303, trunk/build/etc/wsimport.bat) =================================================================== --- trunk/build/etc/wsconsume.bat (rev 0) +++ trunk/build/etc/wsconsume.bat 2007-02-09 22:14:15 UTC (rev 2325) @@ -0,0 +1,47 @@ +@echo off + +rem $Id: wsgen.bat 2158 2007-01-27 06:20:59Z jason.greene(a)jboss.com $ + +@if not "%ECHO%" == "" echo %ECHO% +@if "%OS%" == "Windows_NT" setlocal + +set DIRNAME=.\ +if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% +set PROGNAME=run.bat +if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% + +rem Read all command line arguments + +REM +REM The %ARGS% env variable commented out in favor of using %* to include +REM all args in java command line. See bug #840239. [jpl] +REM +REM set ARGS= +REM :loop +REM if [%1] == [] goto endloop +REM set ARGS=%ARGS% %1 +REM shift +REM goto loop +REM :endloop + +set JAVA=%JAVA_HOME%\bin\java +set JBOSS_HOME=%DIRNAME%\.. +rem Setup the java endorsed dirs +set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed + +rem Setup the wstools classpath +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/activation.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-wsimport-impl.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/mail.jar + +rem Execute the JVM +"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSCONSUME_CLASSPATH%" org.jboss.ws.tools.jaxws.command.wsconsume %* Deleted: trunk/build/etc/wsgen.bat =================================================================== --- trunk/build/etc/wsgen.bat 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/build/etc/wsgen.bat 2007-02-09 22:14:15 UTC (rev 2325) @@ -1,45 +0,0 @@ -@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 Setup the wstools classpath -set WSGEN_CLASSPATH=%WSGEN_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar -set WSGEN_CLASSPATH=%WSGEN_CLASSPATH%;%JBOSS_HOME%/client/activation.jar -set WSGEN_CLASSPATH=%WSGEN_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar -set WSGEN_CLASSPATH=%WSGEN_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar -set WSGEN_CLASSPATH=%WSGEN_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar -set WSGEN_CLASSPATH=%WSGEN_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar -set WSGEN_CLASSPATH=%WSGEN_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar -set WSGEN_CLASSPATH=%WSGEN_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -set WSGEN_CLASSPATH=%WSGEN_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar -set WSGEN_CLASSPATH=%WSGEN_CLASSPATH%;%JBOSS_HOME%/client/mail.jar - -rem Execute the JVM -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSGEN_CLASSPATH%" org.jboss.ws.tools.jaxws.WSGenerate %* Deleted: trunk/build/etc/wsgen.sh =================================================================== --- trunk/build/etc/wsgen.sh 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/build/etc/wsgen.sh 2007-02-09 22:14:15 UTC (rev 2325) @@ -1,77 +0,0 @@ -#!/bin/sh - -# $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=n $JAVA_OPTS" - -# Setup JBoss sepecific properties -JAVA_OPTS="$JAVA_OPTS" - -# Setup the java endorsed dirs -JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" - -# Setup the wstools classpath -WSGEN_CLASSPATH="$WSGEN_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" -WSGEN_CLASSPATH="$WSGEN_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSGEN_CLASSPATH="$WSGEN_CLASSPATH:$JBOSS_HOME/client/getopt.jar" -WSGEN_CLASSPATH="$WSGEN_CLASSPATH:$JBOSS_HOME/client/javassist.jar" -WSGEN_CLASSPATH="$WSGEN_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" -WSGEN_CLASSPATH="$WSGEN_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" -WSGEN_CLASSPATH="$WSGEN_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSGEN_CLASSPATH="$WSGEN_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" -WSGEN_CLASSPATH="$WSGEN_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" -WSGEN_CLASSPATH="$WSGEN_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" -WSGEN_CLASSPATH="$WSGEN_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" -WSGEN_CLASSPATH="$WSGEN_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSGEN_CLASSPATH="$WSGEN_CLASSPATH:$JBOSS_HOME/client/mail.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"` - WSGEN_CLASSPATH=`cygpath --path --windows "$WSGEN_CLASSPATH"` - JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` -fi - -# Execute the JVM -"$JAVA" $JAVA_OPTS \ - -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ - -Dlog4j.configuration=wstools-log4j.xml \ - -classpath "$WSGEN_CLASSPATH" \ - org.jboss.ws.tools.jaxws.WSGenerate "$@" Deleted: trunk/build/etc/wsimport.bat =================================================================== --- trunk/build/etc/wsimport.bat 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/build/etc/wsimport.bat 2007-02-09 22:14:15 UTC (rev 2325) @@ -1,47 +0,0 @@ -@echo off - -rem $Id: wsgen.bat 2158 2007-01-27 06:20:59Z jason.greene(a)jboss.com $ - -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=.\ -if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% -set PROGNAME=run.bat -if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% - -rem Read all command line arguments - -REM -REM The %ARGS% env variable commented out in favor of using %* to include -REM all args in java command line. See bug #840239. [jpl] -REM -REM set ARGS= -REM :loop -REM if [%1] == [] goto endloop -REM set ARGS=%ARGS% %1 -REM shift -REM goto loop -REM :endloop - -set JAVA=%JAVA_HOME%\bin\java -set JBOSS_HOME=%DIRNAME%\.. -rem Setup the java endorsed dirs -set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed - -rem Setup the wstools classpath -set WSIMPORT_CLASSPATH=%WSIMPORT_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar -set WSIMPORT_CLASSPATH=%WSIMPORT_CLASSPATH%;%JBOSS_HOME%/client/activation.jar -set WSIMPORT_CLASSPATH=%WSIMPORT_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar -set WSIMPORT_CLASSPATH=%WSIMPORT_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar -set WSIMPORT_CLASSPATH=%WSIMPORT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar -set WSIMPORT_CLASSPATH=%WSIMPORT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar -set WSIMPORT_CLASSPATH=%WSIMPORT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar -set WSIMPORT_CLASSPATH=%WSIMPORT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-sun-wsimport.jar -set WSIMPORT_CLASSPATH=%WSIMPORT_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar -set WSIMPORT_CLASSPATH=%WSIMPORT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -set WSIMPORT_CLASSPATH=%WSIMPORT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar -set WSIMPORT_CLASSPATH=%WSIMPORT_CLASSPATH%;%JBOSS_HOME%/client/mail.jar - -rem Execute the JVM -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSIMPORT_CLASSPATH%" org.jboss.ws.tools.jaxws.WSImport %* Deleted: trunk/build/etc/wsimport.sh =================================================================== --- trunk/build/etc/wsimport.sh 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/build/etc/wsimport.sh 2007-02-09 22:14:15 UTC (rev 2325) @@ -1,81 +0,0 @@ -#!/bin/sh - -# $Id: wsgen.sh 2158 2007-01-27 06:20:59Z jason.greene(a)jboss.com $ - -DIRNAME=`dirname $0` -PROGNAME=`basename $0` - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JBOSS_HOME" ] && - JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Setup JBOSS_HOME -if [ "x$JBOSS_HOME" = "x" ]; then - # get the full path (without any relative bits) - JBOSS_HOME=`cd $DIRNAME/..; pwd` -fi -export JBOSS_HOME - -# Setup the JVM -if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - JAVA="$JAVA_HOME/bin/java" - else - JAVA="java" - fi -fi - -#JPDA options. Uncomment and modify as appropriate to enable remote debugging . -#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" - -# Setup JBoss sepecific properties -JAVA_OPTS="$JAVA_OPTS" - -# Setup the java endorsed dirs -JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" - -# Setup the wstools classpath -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JAVA_HOME/lib/tools.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/wstx.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/jbossws-sun-wsimport.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/getopt.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/javassist.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSIMPORT_CLASSPATH="$WSIMPORT_CLASSPATH:$JBOSS_HOME/client/mail.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"` - WSIMPORT_CLASSPATH=`cygpath --path --windows "$WSIMPORT_CLASSPATH"` - JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` -fi - -# Execute the JVM -"$JAVA" $JAVA_OPTS \ - -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ - -Dlog4j.configuration=wstools-log4j.xml \ - -classpath "$WSIMPORT_CLASSPATH" \ - org.jboss.ws.tools.jaxws.WSImport "$@" Copied: trunk/build/etc/wsprovide (from rev 2305, trunk/build/etc/wsgen.sh) =================================================================== --- trunk/build/etc/wsprovide (rev 0) +++ trunk/build/etc/wsprovide 2007-02-09 22:14:15 UTC (rev 2325) @@ -0,0 +1,77 @@ +#!/bin/sh + +# $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=n $JAVA_OPTS" + +# Setup JBoss sepecific properties +JAVA_OPTS="$JAVA_OPTS" + +# Setup the java endorsed dirs +JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" + +# Setup the wstools classpath +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/activation.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/getopt.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/javassist.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/log4j.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/mail.jar" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + WSPROVIDE_CLASSPATH=`cygpath --path --windows "$WSPROVIDE_CLASSPATH"` + JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` +fi + +# Execute the JVM +"$JAVA" $JAVA_OPTS \ + -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ + -Dlog4j.configuration=wstools-log4j.xml \ + -classpath "$WSPROVIDE_CLASSPATH" \ + org.jboss.ws.tools.jaxws.command.wsprovide "$@" Copied: trunk/build/etc/wsprovide.bat (from rev 2303, trunk/build/etc/wsgen.bat) =================================================================== --- trunk/build/etc/wsprovide.bat (rev 0) +++ trunk/build/etc/wsprovide.bat 2007-02-09 22:14:15 UTC (rev 2325) @@ -0,0 +1,45 @@ +@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 Setup the wstools classpath +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/activation.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/mail.jar + +rem Execute the JVM +"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.ws.tools.jaxws.command.wsprovide %* Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/build/version.properties 2007-02-09 22:14:15 UTC (rev 2325) @@ -42,7 +42,7 @@ jboss-security=4.0.5.GA jboss-vfs=2.0.0.Beta2 jbossas-core-libs=4.0.5.GA -jbossws-sun-wsimport=2.0.0 +jbossws-wsconsume-impl=2.0.0 jbpm-bpel=1.1.Beta3 junit=3.8.1 oswego-concurrent=1.3.4 Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/jbossws-core/build.xml 2007-02-09 22:14:15 UTC (rev 2325) @@ -156,14 +156,14 @@ <include name="dtd/**"/> </fileset> <fileset dir="${etc.dir}"> - <include name="wsgen.bat"/> - <include name="wsimport.bat"/> + <include name="wsprovide.bat"/> + <include name="wsconsume.bat"/> <include name="wstools.bat"/> <include name="wstools-log4j.xml"/> </fileset> <zipfileset dir="${etc.dir}" filemode="755"> - <include name="wsgen.sh"/> - <include name="wsimport.sh"/> + <include name="wsprovide.sh"/> + <include name="wsconsume.sh"/> <include name="wstools.sh"/> </zipfileset> </jar> Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/WSGenerate.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/WSGenerate.java 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/WSGenerate.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -1,225 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.tools.jaxws; - -import gnu.getopt.Getopt; -import gnu.getopt.LongOpt; - -import java.io.File; -import java.io.PrintStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.List; - -import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.tools.jaxws.api.WebServiceGenerator; - -/** - * WSGenerate is a command line tool that generates portable JAX-WS artifacts - * for a service endpoint implementation. - * - * <pre> - * usage: wsgen [options] <endpoint class name> - * options: - * -h, --help Show this help message - * -k, --keep Keep/Generate Java source - * -w, --wsdl Enable WSDL file generation - * -c. --classpath The classpath that contains the endpoint - * -o, --output=<directory> The directory to put generated artifacts - * -r, --resource=<directory> The directory to put resource artifacts - * -s, --source=<directory> The directory to put Java source - * -q, --quiet Be somewhat more quiet - * -t, --show-traces Show full exception stack traces - * </pre> - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class WSGenerate -{ - private boolean generateSource = false; - private boolean generateWsdl = false; - private boolean quiet = false; - private boolean showTraces = false; - private ClassLoader loader = Thread.currentThread().getContextClassLoader(); - private File outputDir = new File("output"); - private File resourceDir = null; - private File sourceDir = null; - - public static String PROGRAM_NAME = System.getProperty("program.name", "wsgen"); - - public static void main(String[] args) - { - WSGenerate generate = new WSGenerate(); - String endpoint = generate.parseArguments(args); - System.exit(generate.generate(endpoint)); - } - - private String parseArguments(String[] args) - { - String shortOpts = "hwko:r:s:cqt"; - LongOpt[] longOpts = - { - new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), - new LongOpt("wsdl", LongOpt.NO_ARGUMENT, null, 'w'), - new LongOpt("keep", LongOpt.NO_ARGUMENT, null, 'k'), - new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'), - new LongOpt("resource", LongOpt.REQUIRED_ARGUMENT, null, 'r'), - new LongOpt("source", LongOpt.REQUIRED_ARGUMENT, null, 's'), - new LongOpt("classpath", LongOpt.REQUIRED_ARGUMENT, null, 'c'), - new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'), - new LongOpt("show-traces", LongOpt.NO_ARGUMENT, null, 't'), - }; - - Getopt getopt = new Getopt(PROGRAM_NAME, args, shortOpts, longOpts); - int c; - while ((c = getopt.getopt()) != -1) - { - switch (c) - { - case 'k': - generateSource = true; - break; - case 's': - sourceDir = new File(getopt.getOptarg()); - break; - case 'r': - resourceDir = new File(getopt.getOptarg()); - break; - case 'w': - generateWsdl = true; - break; - case 't': - showTraces = true; - break; - case 'o': - outputDir = new File(getopt.getOptarg()); - break; - case 'q': - quiet = true; - break; - case 'c': - processClassPath(getopt.getOptarg()); - break; - case 'h': - printHelp(); - System.exit(0); - case '?': - System.exit(1); - } - } - - int endpointPos = getopt.getOptind(); - if (endpointPos >= args.length) - { - System.err.println("Error: endpoint implementation was not specified!"); - printHelp(); - System.exit(1); - } - - return args[endpointPos]; - } - - - private int generate(String endpoint) - { - if (!JavaUtils.isLoaded(endpoint, loader)) - { - System.err.println("Error: Could not load class [" + endpoint + "]. Did you specify a valid --classpath?"); - return 1; - } - - WebServiceGenerator gen = WebServiceGenerator.newInstance(loader); - gen.setGenerateWsdl(generateWsdl); - gen.setGenerateSource(generateSource); - gen.setOutputDirectory(outputDir); - if (resourceDir != null) - gen.setResourceDirectory(resourceDir); - if (sourceDir != null) - gen.setSourceDirectory(sourceDir); - - if (! quiet) - gen.setMessageStream(System.out); - - try - { - gen.generate(endpoint); - return 0; - } - catch (Throwable t) - { - System.err.println("Error: Could not generate. (use --show-traces to see full traces)"); - if (!showTraces) - { - String message = t.getMessage(); - if (message == null) - message = t.getClass().getSimpleName(); - System.err.println("Error: " + message); - } - else - { - t.printStackTrace(System.err); - } - - } - - return 1; - } - - private void processClassPath(String classPath) - { - String[] entries = classPath.split(File.pathSeparator); - List<URL> urls= new ArrayList<URL>(entries.length); - for (String entry : entries) - { - try - { - urls.add(new File(entry).toURL()); - } - catch (MalformedURLException e) - { - System.err.println("Error: a classpath entry was malformed: " + entry); - } - } - loader = new URLClassLoader(urls.toArray(new URL[0]), loader); - } - - private static void printHelp() - { - PrintStream out = System.out; - out.println("WSGenerate generates portable JAX-WS artifacts for an endpoint implementation.\n"); - out.println("usage: " + PROGRAM_NAME + " [options] <endpoint class name>\n"); - out.println("options: "); - out.println(" -h, --help Show this help message"); - out.println(" -k, --keep Keep/Generate Java source"); - out.println(" -w, --wsdl Enable WSDL file generation"); - out.println(" -c. --classpath The classpath that contains the endpoint"); - out.println(" -o, --output=<directory> The directory to put generated artifacts"); - out.println(" -r, --resource=<directory> The directory to put resource artifacts"); - out.println(" -s, --source=<directory> The directory to put Java source"); - out.println(" -q, --quiet Be somewhat more quiet"); - out.println(" -t, --show-traces Show full exception stack traces"); - out.flush(); - } -} Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/WSImport.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/WSImport.java 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/WSImport.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -1,235 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.tools.jaxws; - -import gnu.getopt.Getopt; -import gnu.getopt.LongOpt; - -import java.io.File; -import java.io.PrintStream; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.jboss.ws.tools.jaxws.api.WebServiceImporter; - -/** - * WSImport is a command line tool that generates portable JAX-WS artifacts - * from a WSDL file. - * - * <pre> - * usage: wsimport [options] <wsdl-urlgt; - * options: - * -h, --help Show this help message - * -b, --binding=<file> One or more JAX-WS or JAXB binding files - * -k, --keep Keep/Generate Java source - * -c --catalog=<file> Oasis XML Catalog file for entity resolution - * -p --package=<name> The target package for generated source - * -w --wsdlLocation=<loc> Value to use for @(a)WebService.wsdlLocation - * -o, --output=<directory> The directory to put generated artifacts - * -s, --source=<directory> The directory to put Java source - * -q, --quiet Be somewhat more quiet - * -t, --show-traces Show full exception stack traces - * </pre> - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class WSImport -{ - private List<File> bindingFiles = new ArrayList<File>(); - private boolean generateSource = false; - private File catalog = null; - private String targetPackage = null; - private String wsdlLocation = null; - private boolean quiet = false; - private boolean showTraces = false; - private File outputDir = new File("output"); - private File sourceDir = null; - - public static String PROGRAM_NAME = System.getProperty("program.name", "wsimport"); - - public static void main(String[] args) - { - WSImport importer = new WSImport(); - URL wsdl = importer.parseArguments(args); - System.exit(importer.importServices(wsdl)); - } - - private URL parseArguments(String[] args) - { - String shortOpts = "hb:kc:p:w:o:s:qt"; - LongOpt[] longOpts = - { - new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), - new LongOpt("binding", LongOpt.REQUIRED_ARGUMENT, null, 'b'), - new LongOpt("keep", LongOpt.NO_ARGUMENT, null, 'k'), - new LongOpt("catalog", LongOpt.REQUIRED_ARGUMENT, null, 'c'), - new LongOpt("package", LongOpt.REQUIRED_ARGUMENT, null, 'p'), - new LongOpt("wsdlLocation", LongOpt.REQUIRED_ARGUMENT, null, 'w'), - new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'), - new LongOpt("source", LongOpt.REQUIRED_ARGUMENT, null, 's'), - new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'), - new LongOpt("show-traces", LongOpt.NO_ARGUMENT, null, 't'), - }; - - Getopt getopt = new Getopt(PROGRAM_NAME, args, shortOpts, longOpts); - int c; - while ((c = getopt.getopt()) != -1) - { - switch (c) - { - case 'b': - bindingFiles.add(new File(getopt.getOptarg())); - break; - case 'k': - generateSource = true; - break; - case 'c': - catalog = new File(getopt.getOptarg()); - break; - case 'p': - targetPackage = getopt.getOptarg(); - break; - case 'w': - wsdlLocation = getopt.getOptarg(); - break; - case 'o': - outputDir = new File(getopt.getOptarg()); - break; - case 's': - sourceDir = new File(getopt.getOptarg()); - break; - case 'q': - quiet = true; - break; - case 't': - showTraces = true; - break; - case 'h': - printHelp(); - System.exit(0); - case '?': - System.exit(1); - } - } - - int wsdlPos = getopt.getOptind(); - if (wsdlPos >= args.length) - { - System.err.println("Error: WSDL URL was not specified!"); - printHelp(); - System.exit(1); - } - - URL url = null; - try - { - try - { - url = new URL(args[wsdlPos]); - } - catch (MalformedURLException e) - { - File file = new File(args[wsdlPos]); - url = file.toURL(); - } - } - catch (MalformedURLException e) - { - System.err.println("Error: Invalid URI: " + args[wsdlPos]); - System.exit(1); - } - - return url; - } - - - private int importServices(URL wsdl) - { - WebServiceImporter importer = WebServiceImporter.newInstance(); - importer.setGenerateSource(generateSource); - importer.setOutputDirectory(outputDir); - if (sourceDir != null) - importer.setSourceDirectory(sourceDir); - - if (! quiet) - importer.setMessageStream(System.out); - - if (catalog != null) - importer.setCatalog(catalog); - - if (targetPackage != null) - importer.setTargetPackage(targetPackage); - - if (wsdlLocation != null) - importer.setWsdlLocation(wsdlLocation); - - if (bindingFiles != null && bindingFiles.size() > 0) - importer.setBindingFiles(bindingFiles); - - try - { - importer.importServices(wsdl); - return 0; - } - catch (Throwable t) - { - System.err.println("Error: Could not import. (use --show-traces to see full traces)"); - if (!showTraces) - { - String message = t.getMessage(); - if (message == null) - message = t.getClass().getSimpleName(); - System.err.println("Error: " + message); - } - else - { - t.printStackTrace(System.err); - } - - } - - return 1; - } - - private static void printHelp() - { - PrintStream out = System.out; - out.println("WSImport is a command line tool that generates portable JAX-WS artifacts from a WSDL file.\n"); - out.println("usage: " + PROGRAM_NAME + " [options] <wsdl-url>\n"); - out.println("options: "); - out.println(" -h, --help Show this help message"); - out.println(" -b, --binding=<file> One or more JAX-WS or JAXB binding files "); - out.println(" -k, --keep Keep/Generate Java source"); - out.println(" -c --catalog=<file> Oasis XML Catalog file for entity resolution"); - out.println(" -p --package=<name> The target package for generated source"); - out.println(" -w --wsdlLocation=<loc> Value to use for @WebService.wsdlLocation"); - out.println(" -o, --output=<directory> The directory to put generated artifacts"); - out.println(" -s, --source=<directory> The directory to put Java source"); - out.println(" -q, --quiet Be somewhat more quiet"); - out.println(" -t, --show-traces Show full exception stack traces"); - out.flush(); - } -} Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/WSGenerate.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/WSGenerate.java 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/WSGenerate.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -1,266 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.tools.jaxws.ant; - -import java.io.File; -import java.io.PrintStream; - -import org.apache.tools.ant.AntClassLoader; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.ExecuteJava; -import org.apache.tools.ant.taskdefs.LogOutputStream; -import org.apache.tools.ant.types.Commandline; -import org.apache.tools.ant.types.CommandlineJava; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Reference; -import org.jboss.ws.tools.jaxws.api.WebServiceGenerator; - -/** - * Ant task which invokes WebServiceGenerate. - * - * <table border="1"> - * <tr align="left" BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"><th>Attribute</th><th>Description</th><th>Default</th></tr> - * <tr><td>fork</td><td>Whether or not to run the generation task in a separate VM.</td><td>true</td></tr> - * <tr><td>keep</td><td>Keep/Enable Java source code generation.</td><td>false</td></tr> - * <tr><td>destdir</td><td>The output directory for generated artifacts.</td><td>"output"</td></tr> - * <tr><td>resourcedestdir</td><td>The output directory for resource artifacts (WSDL/XSD).</td><td>value of destdir</td></tr> - * <tr><td>sourcedir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr> - * <tr><td>genwsdl</td><td>Whether or not to generate WSDL.</td><td>false</td><tr> - * <tr><td>verbose</td><td>Enables more informational output about command progress.</td><td>false</td><tr> - * <tr><td>sei*</td><td>Service Endpoint Implementation.</td><td></td><tr> - * <tr><td>classpath</td><td>The classpath that contains the service endpoint implementation.</td><td>""</tr> - * </table> - * <b>* = required.</b> - * - * <p>Example: - * - * <pre> - * <target name="test-wsgen" depends="init"> - * <taskdef name="wsgen" classname="org.jboss.ws.tools.jaxws.ant.WSGenerate"> - * <classpath refid="core.classpath"/> - * </taskdef> - * <wsgen - * fork="false" - * keep="true" - * destdir="out" - * resourcedestdir="out-resource" - * sourcedestdir="out-source" - * genwsdl="true" - * verbose="true" - * sei="org.jboss.test.ws.jaxws.jsr181.soapbinding.DocWrappedServiceImpl"> - * <classpath> - * <pathelement path="${tests.output.dir}/classes"/> - * </classpath> - * </wsgen> - * </target> - * </pre> - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class WSGenerate extends Task -{ - private Path classpath = new Path(getProject()); - private CommandlineJava command = new CommandlineJava(); - private String sei = null; - private File destdir = null; - private File resourcedestdir = null; - private File sourcedestdir = null; - private boolean keep = false; - private boolean genwsdl = false; - private boolean verbose = false; - private boolean fork = false; - private boolean debug = false; - - // Not actually used right now - public void setDebug(boolean debug) - { - this.debug = debug; - } - - public Commandline.Argument createJvmarg() - { - return command.createVmArgument(); - } - - public void setClasspath(Path classpath) - { - this.classpath = classpath; - } - - public void setClasspathRef(Reference ref) - { - createClasspath().setRefid(ref); - } - - public Path createClasspath() - { - return classpath; - } - - public void setDestdir(File destdir) - { - this.destdir = destdir; - } - - public void setKeep(boolean keep) - { - this.keep = keep; - } - - public void setSei(String sei) - { - this.sei = sei; - } - - public void setFork(boolean fork) - { - this.fork = fork; - } - - public void setResourcedestdir(File resourcedestdir) - { - this.resourcedestdir = resourcedestdir; - } - - public void setSourcedestdir(File sourcedestdir) - { - this.sourcedestdir = sourcedestdir; - } - - public void setVerbose(boolean verbose) - { - this.verbose = verbose; - } - - public void setGenwsdl(boolean genwsdl) - { - this.genwsdl = genwsdl; - } - - private ClassLoader getClasspathLoader(ClassLoader parent) - { - return new AntClassLoader(parent, getProject(), classpath, false); - } - - public void executeNonForked() - { - ClassLoader prevCL = Thread.currentThread().getContextClassLoader(); - ClassLoader antLoader = this.getClass().getClassLoader(); - Thread.currentThread().setContextClassLoader(antLoader); - try - { - WebServiceGenerator gen = WebServiceGenerator.newInstance(); - gen.setClassLoader(getClasspathLoader(antLoader)); - if (verbose) - gen.setMessageStream(new PrintStream(new LogOutputStream(this, Project.MSG_INFO))); - gen.setGenerateSource(keep); - gen.setGenerateWsdl(genwsdl); - if (destdir != null) - gen.setOutputDirectory(destdir); - if (resourcedestdir != null) - gen.setResourceDirectory(resourcedestdir); - if (sourcedestdir != null) - gen.setSourceDirectory(sourcedestdir); - if (verbose) - log("Generating from endpoint: " + sei, Project.MSG_INFO); - - gen.generate(sei); - } - finally - { - Thread.currentThread().setContextClassLoader(prevCL); - } - } - - public void execute() throws BuildException - { - if (sei == null) - throw new BuildException("The sei attribute must be specified!", getLocation()); - - if (fork) - executeForked(); - else - executeNonForked(); - } - - private Path getTaskClassPath() - { - // Why is everything in the Ant API a big hack??? - ClassLoader cl = this.getClass().getClassLoader(); - if (cl instanceof AntClassLoader) - { - return new Path(getProject(), ((AntClassLoader)cl).getClasspath()); - } - - return new Path(getProject()); - } - - private void executeForked() throws BuildException - { - command.setClassname(org.jboss.ws.tools.jaxws.WSGenerate.class.getName()); - - Path path = command.createClasspath(getProject()); - path.append(getTaskClassPath()); - path.append(classpath); - - if (keep) - command.createArgument().setValue("-k"); - - if (genwsdl) - command.createArgument().setValue("-w"); - - if (destdir != null) - { - command.createArgument().setValue("-o"); - command.createArgument().setFile(destdir); - } - if (resourcedestdir != null) - { - command.createArgument().setValue("-r"); - command.createArgument().setFile(resourcedestdir); - } - if (sourcedestdir != null) - { - command.createArgument().setValue("-s"); - command.createArgument().setFile(sourcedestdir); - } - - if (!verbose) - command.createArgument().setValue("-q"); - - // Always dump traces - command.createArgument().setValue("-t"); - command.createArgument().setValue(sei); - - if (verbose) - log("Command invoked: " + command.getJavaCommand().toString()); - - ExecuteJava execute = new ExecuteJava(); - execute.setClasspath(path); - execute.setJavaCommand(command.getJavaCommand()); - if (execute.fork(this) != 0) - throw new BuildException("Could not invoke wsgen", getLocation()); - } -} \ No newline at end of file Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/WSImport.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/WSImport.java 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/WSImport.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -1,308 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.tools.jaxws.ant; - -import java.io.File; -import java.io.PrintStream; -import java.net.MalformedURLException; -import java.util.ArrayList; -import java.util.List; - -import org.apache.tools.ant.AntClassLoader; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.ExecuteJava; -import org.apache.tools.ant.taskdefs.LogOutputStream; -import org.apache.tools.ant.types.Commandline; -import org.apache.tools.ant.types.CommandlineJava; -import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.types.Path; -import org.jboss.ws.tools.jaxws.api.WebServiceImporter; - -/** - * Ant task which invokes WebServiceGenerate. - * - * <table border="1"> - * <tr align="left" BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"><th>Attribute</th><th>Description</th><th>Default</th></tr> - * <tr><td>fork</td><td>Whether or not to run the generation task in a separate VM.</td><td>true</td></tr> - * <tr><td>keep</td><td>Keep/Enable Java source code generation.</td><td>false</td></tr> - * <tr><td>catalog</td><td> Oasis XML Catalog file for entity resolution</td><td>none</td></tr> - * <tr><td>package</td><td> The target Java package for generated code.</td><td>generated</td></tr> - * <tr><td>binding</td><td>A JAX-WS or JAXB binding file</td><td>none</td></tr> - * <tr><td>wsdlLocation</td><td>Value to use for @(a)WebService.wsdlLocation</td><td>generated</td></tr> - * <tr><td>destdir</td><td>The output directory for generated artifacts.</td><td>"output"</td></tr> - * <tr><td>sourcedir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr> - * <tr><td>verbose</td><td>Enables more informational output about command progress.</td><td>false</td><tr> - * <tr><td>wsdl*</td><td>The WSDL file or URL</td><td>n/a</td><tr> - * </table> - * <b>* = required.</b> - * - * <p>Example: - * - * <pre> - * <wsimport - * fork="true" - * verbose="true" - * destdir="output" - * sourcedestdir="gen-src" - * keep="true" - * wsdllocation="handEdited.wsdl" - * wsdl="foo.wsdl"> - * <binding dir="binding-files" includes="*.xml" excludes="bad.xml"/> - * </wsimport> - * </pre> - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class WSImport extends Task -{ - private CommandlineJava command = new CommandlineJava(); - private String wsdl = null; - private File destdir = null; - private File sourcedestdir = null; - private List<File> bindingFiles = new ArrayList<File>(); - private File catalog = null; - private String wsdlLocation = null; - private String targetPackage = null; - private boolean keep = false; - private boolean verbose = false; - private boolean fork = false; - private boolean debug = false; - - // Not actually used right now - public void setDebug(boolean debug) - { - this.debug = debug; - } - - public Commandline.Argument createJvmarg() - { - return command.createVmArgument(); - } - - public void setBinding(File bindingFile) - { - bindingFiles.add(bindingFile); - } - - public void setCatalog(File catalog) - { - this.catalog = catalog; - } - - public void setDestdir(File destdir) - { - this.destdir = destdir; - } - - public void setFork(boolean fork) - { - this.fork = fork; - } - - public void setKeep(boolean keep) - { - this.keep = keep; - } - - public void setSourcedestdir(File sourcedestdir) - { - this.sourcedestdir = sourcedestdir; - } - - public void setPackage(String targetPackage) - { - this.targetPackage = targetPackage; - } - - public void setVerbose(boolean verbose) - { - this.verbose = verbose; - } - - public void setWsdl(String wsdl) - { - this.wsdl = wsdl; - } - - public void setWsdlLocation(String wsdlLocation) - { - this.wsdlLocation = wsdlLocation; - } - - public void addConfiguredBinding(FileSet fs) - { - DirectoryScanner ds = fs.getDirectoryScanner(getProject()); - File baseDir = ds.getBasedir(); - for (String file : ds.getIncludedFiles()) - { - bindingFiles.add(new File(baseDir, file)); - } - } - - public void executeNonForked() - { - ClassLoader prevCL = Thread.currentThread().getContextClassLoader(); - ClassLoader antLoader = this.getClass().getClassLoader(); - Thread.currentThread().setContextClassLoader(antLoader); - try - { - WebServiceImporter importer = WebServiceImporter.newInstance(); - importer.setGenerateSource(keep); - if (destdir != null) - importer.setOutputDirectory(destdir); - if (sourcedestdir != null) - importer.setSourceDirectory(sourcedestdir); - if (targetPackage != null) - importer.setTargetPackage(targetPackage); - if (wsdlLocation != null) - importer.setWsdlLocation(wsdlLocation); - if (catalog != null) - importer.setCatalog(catalog); - if (bindingFiles != null && bindingFiles.size() > 0) - importer.setBindingFiles(bindingFiles); - - if (verbose) - { - importer.setMessageStream(new PrintStream(new LogOutputStream(this, Project.MSG_INFO))); - log("Generating from wsdl: " + wsdl, Project.MSG_INFO); - } - - try - { - importer.setAdditionalCompilerClassPath(getTaskClassPathStrings()); - importer.importServices(wsdl); - } - catch (MalformedURLException e) - { - throw new BuildException(e, getLocation()); - } - } - finally - { - Thread.currentThread().setContextClassLoader(prevCL); - } - } - - public void execute() throws BuildException - { - if (wsdl == null) - throw new BuildException("The wsdl attribute must be specified!", getLocation()); - - if (fork) - executeForked(); - else - executeNonForked(); - } - - private Path getTaskClassPath() - { - // Why is everything in the Ant API a big hack??? - ClassLoader cl = this.getClass().getClassLoader(); - if (cl instanceof AntClassLoader) - { - return new Path(getProject(), ((AntClassLoader)cl).getClasspath()); - } - - return new Path(getProject()); - } - - private List<String> getTaskClassPathStrings() - { - // Why is everything in the Ant API a big hack??? - List<String> strings = new ArrayList<String>(); - ClassLoader cl = this.getClass().getClassLoader(); - if (cl instanceof AntClassLoader) - { - for (String string : ((AntClassLoader)cl).getClasspath().split(File.pathSeparator)) - strings.add(string); - } - - return strings; - } - - private void executeForked() throws BuildException - { - command.setClassname(org.jboss.ws.tools.jaxws.WSImport.class.getName()); - - Path path = command.createClasspath(getProject()); - path.append(getTaskClassPath()); - - if (keep) - command.createArgument().setValue("-k"); - - for (File file : bindingFiles) - { - command.createArgument().setValue("-b"); - command.createArgument().setFile(file); - } - - if (catalog != null) - { - command.createArgument().setValue("-c"); - command.createArgument().setFile(catalog); - } - - if (targetPackage != null) - { - command.createArgument().setValue("-p"); - command.createArgument().setValue(targetPackage); - } - - if (wsdlLocation != null) - { - command.createArgument().setValue("-w"); - command.createArgument().setValue(wsdlLocation); - } - - if (destdir != null) - { - command.createArgument().setValue("-o"); - command.createArgument().setFile(destdir); - } - - if (sourcedestdir != null) - { - command.createArgument().setValue("-s"); - command.createArgument().setFile(sourcedestdir); - } - - if (!verbose) - command.createArgument().setValue("-q"); - - // Always dump traces - command.createArgument().setValue("-t"); - command.createArgument().setValue(wsdl); - - if (verbose) - log("Command invoked: " + command.getJavaCommand().toString()); - - ExecuteJava execute = new ExecuteJava(); - execute.setClasspath(path); - execute.setJavaCommand(command.getJavaCommand()); - if (execute.fork(this) != 0) - throw new BuildException("Could not invoke wsimport", getLocation()); - } -} \ No newline at end of file Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/wsconsume.java (from rev 2304, trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/WSImport.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/wsconsume.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/wsconsume.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -0,0 +1,308 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.ws.tools.jaxws.ant; + +import java.io.File; +import java.io.PrintStream; +import java.net.MalformedURLException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.taskdefs.ExecuteJava; +import org.apache.tools.ant.taskdefs.LogOutputStream; +import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.CommandlineJava; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.Path; +import org.jboss.ws.tools.jaxws.api.WSContractConsumer; + +/** + * Ant task which consumes a Web Service contract. + * + * <table border="1"> + * <tr align="left" BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"><th>Attribute</th><th>Description</th><th>Default</th></tr> + * <tr><td>fork</td><td>Whether or not to run the generation task in a separate VM.</td><td>true</td></tr> + * <tr><td>keep</td><td>Keep/Enable Java source code generation.</td><td>false</td></tr> + * <tr><td>catalog</td><td> Oasis XML Catalog file for entity resolution</td><td>none</td></tr> + * <tr><td>package</td><td> The target Java package for generated code.</td><td>generated</td></tr> + * <tr><td>binding</td><td>A JAX-WS or JAXB binding file</td><td>none</td></tr> + * <tr><td>wsdlLocation</td><td>Value to use for @(a)WebService.wsdlLocation</td><td>generated</td></tr> + * <tr><td>destdir</td><td>The output directory for generated artifacts.</td><td>"output"</td></tr> + * <tr><td>sourcedir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr> + * <tr><td>verbose</td><td>Enables more informational output about command progress.</td><td>false</td><tr> + * <tr><td>wsdl*</td><td>The WSDL file or URL</td><td>n/a</td><tr> + * </table> + * <b>* = required.</b> + * + * <p>Example: + * + * <pre> + * <wsconsume + * fork="true" + * verbose="true" + * destdir="output" + * sourcedestdir="gen-src" + * keep="true" + * wsdllocation="handEdited.wsdl" + * wsdl="foo.wsdl"> + * <binding dir="binding-files" includes="*.xml" excludes="bad.xml"/> + * </wsimport> + * </pre> + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +public class wsconsume extends Task +{ + private CommandlineJava command = new CommandlineJava(); + private String wsdl = null; + private File destdir = null; + private File sourcedestdir = null; + private List<File> bindingFiles = new ArrayList<File>(); + private File catalog = null; + private String wsdlLocation = null; + private String targetPackage = null; + private boolean keep = false; + private boolean verbose = false; + private boolean fork = false; + private boolean debug = false; + + // Not actually used right now + public void setDebug(boolean debug) + { + this.debug = debug; + } + + public Commandline.Argument createJvmarg() + { + return command.createVmArgument(); + } + + public void setBinding(File bindingFile) + { + bindingFiles.add(bindingFile); + } + + public void setCatalog(File catalog) + { + this.catalog = catalog; + } + + public void setDestdir(File destdir) + { + this.destdir = destdir; + } + + public void setFork(boolean fork) + { + this.fork = fork; + } + + public void setKeep(boolean keep) + { + this.keep = keep; + } + + public void setSourcedestdir(File sourcedestdir) + { + this.sourcedestdir = sourcedestdir; + } + + public void setPackage(String targetPackage) + { + this.targetPackage = targetPackage; + } + + public void setVerbose(boolean verbose) + { + this.verbose = verbose; + } + + public void setWsdl(String wsdl) + { + this.wsdl = wsdl; + } + + public void setWsdlLocation(String wsdlLocation) + { + this.wsdlLocation = wsdlLocation; + } + + public void addConfiguredBinding(FileSet fs) + { + DirectoryScanner ds = fs.getDirectoryScanner(getProject()); + File baseDir = ds.getBasedir(); + for (String file : ds.getIncludedFiles()) + { + bindingFiles.add(new File(baseDir, file)); + } + } + + public void executeNonForked() + { + ClassLoader prevCL = Thread.currentThread().getContextClassLoader(); + ClassLoader antLoader = this.getClass().getClassLoader(); + Thread.currentThread().setContextClassLoader(antLoader); + try + { + WSContractConsumer importer = WSContractConsumer.newInstance(); + importer.setGenerateSource(keep); + if (destdir != null) + importer.setOutputDirectory(destdir); + if (sourcedestdir != null) + importer.setSourceDirectory(sourcedestdir); + if (targetPackage != null) + importer.setTargetPackage(targetPackage); + if (wsdlLocation != null) + importer.setWsdlLocation(wsdlLocation); + if (catalog != null) + importer.setCatalog(catalog); + if (bindingFiles != null && bindingFiles.size() > 0) + importer.setBindingFiles(bindingFiles); + + if (verbose) + { + importer.setMessageStream(new PrintStream(new LogOutputStream(this, Project.MSG_INFO))); + log("Generating from wsdl: " + wsdl, Project.MSG_INFO); + } + + try + { + importer.setAdditionalCompilerClassPath(getTaskClassPathStrings()); + importer.consume(wsdl); + } + catch (MalformedURLException e) + { + throw new BuildException(e, getLocation()); + } + } + finally + { + Thread.currentThread().setContextClassLoader(prevCL); + } + } + + public void execute() throws BuildException + { + if (wsdl == null) + throw new BuildException("The wsdl attribute must be specified!", getLocation()); + + if (fork) + executeForked(); + else + executeNonForked(); + } + + private Path getTaskClassPath() + { + // Why is everything in the Ant API a big hack??? + ClassLoader cl = this.getClass().getClassLoader(); + if (cl instanceof AntClassLoader) + { + return new Path(getProject(), ((AntClassLoader)cl).getClasspath()); + } + + return new Path(getProject()); + } + + private List<String> getTaskClassPathStrings() + { + // Why is everything in the Ant API a big hack??? + List<String> strings = new ArrayList<String>(); + ClassLoader cl = this.getClass().getClassLoader(); + if (cl instanceof AntClassLoader) + { + for (String string : ((AntClassLoader)cl).getClasspath().split(File.pathSeparator)) + strings.add(string); + } + + return strings; + } + + private void executeForked() throws BuildException + { + command.setClassname(org.jboss.ws.tools.jaxws.command.wsconsume.class.getName()); + + Path path = command.createClasspath(getProject()); + path.append(getTaskClassPath()); + + if (keep) + command.createArgument().setValue("-k"); + + for (File file : bindingFiles) + { + command.createArgument().setValue("-b"); + command.createArgument().setFile(file); + } + + if (catalog != null) + { + command.createArgument().setValue("-c"); + command.createArgument().setFile(catalog); + } + + if (targetPackage != null) + { + command.createArgument().setValue("-p"); + command.createArgument().setValue(targetPackage); + } + + if (wsdlLocation != null) + { + command.createArgument().setValue("-w"); + command.createArgument().setValue(wsdlLocation); + } + + if (destdir != null) + { + command.createArgument().setValue("-o"); + command.createArgument().setFile(destdir); + } + + if (sourcedestdir != null) + { + command.createArgument().setValue("-s"); + command.createArgument().setFile(sourcedestdir); + } + + if (!verbose) + command.createArgument().setValue("-q"); + + // Always dump traces + command.createArgument().setValue("-t"); + command.createArgument().setValue(wsdl); + + if (verbose) + log("Command invoked: " + command.getJavaCommand().toString()); + + ExecuteJava execute = new ExecuteJava(); + execute.setClasspath(path); + execute.setJavaCommand(command.getJavaCommand()); + if (execute.fork(this) != 0) + throw new BuildException("Could not invoke wsconsume", getLocation()); + } +} \ No newline at end of file Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/wsprovide.java (from rev 2304, trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/WSGenerate.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/wsprovide.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/wsprovide.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -0,0 +1,266 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.ws.tools.jaxws.ant; + +import java.io.File; +import java.io.PrintStream; + +import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.taskdefs.ExecuteJava; +import org.apache.tools.ant.taskdefs.LogOutputStream; +import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.CommandlineJava; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.Reference; +import org.jboss.ws.tools.jaxws.api.WSContractProvider; + +/** + * Ant task which invokes provides a Web Service contract and portable JAX-WS wrapper classes. + * + * <table border="1"> + * <tr align="left" BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"><th>Attribute</th><th>Description</th><th>Default</th></tr> + * <tr><td>fork</td><td>Whether or not to run the generation task in a separate VM.</td><td>true</td></tr> + * <tr><td>keep</td><td>Keep/Enable Java source code generation.</td><td>false</td></tr> + * <tr><td>destdir</td><td>The output directory for generated artifacts.</td><td>"output"</td></tr> + * <tr><td>resourcedestdir</td><td>The output directory for resource artifacts (WSDL/XSD).</td><td>value of destdir</td></tr> + * <tr><td>sourcedir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr> + * <tr><td>genwsdl</td><td>Whether or not to generate WSDL.</td><td>false</td><tr> + * <tr><td>verbose</td><td>Enables more informational output about command progress.</td><td>false</td><tr> + * <tr><td>sei*</td><td>Service Endpoint Implementation.</td><td></td><tr> + * <tr><td>classpath</td><td>The classpath that contains the service endpoint implementation.</td><td>""</tr> + * </table> + * <b>* = required.</b> + * + * <p>Example: + * + * <pre> + * <target name="test-wsproivde" depends="init"> + * <taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide"> + * <classpath refid="core.classpath"/> + * </taskdef> + * <wsgen + * fork="false" + * keep="true" + * destdir="out" + * resourcedestdir="out-resource" + * sourcedestdir="out-source" + * genwsdl="true" + * verbose="true" + * sei="org.jboss.test.ws.jaxws.jsr181.soapbinding.DocWrappedServiceImpl"> + * <classpath> + * <pathelement path="${tests.output.dir}/classes"/> + * </classpath> + * </wsgen> + * </target> + * </pre> + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +public class wsprovide extends Task +{ + private Path classpath = new Path(getProject()); + private CommandlineJava command = new CommandlineJava(); + private String sei = null; + private File destdir = null; + private File resourcedestdir = null; + private File sourcedestdir = null; + private boolean keep = false; + private boolean genwsdl = false; + private boolean verbose = false; + private boolean fork = false; + private boolean debug = false; + + // Not actually used right now + public void setDebug(boolean debug) + { + this.debug = debug; + } + + public Commandline.Argument createJvmarg() + { + return command.createVmArgument(); + } + + public void setClasspath(Path classpath) + { + this.classpath = classpath; + } + + public void setClasspathRef(Reference ref) + { + createClasspath().setRefid(ref); + } + + public Path createClasspath() + { + return classpath; + } + + public void setDestdir(File destdir) + { + this.destdir = destdir; + } + + public void setKeep(boolean keep) + { + this.keep = keep; + } + + public void setSei(String sei) + { + this.sei = sei; + } + + public void setFork(boolean fork) + { + this.fork = fork; + } + + public void setResourcedestdir(File resourcedestdir) + { + this.resourcedestdir = resourcedestdir; + } + + public void setSourcedestdir(File sourcedestdir) + { + this.sourcedestdir = sourcedestdir; + } + + public void setVerbose(boolean verbose) + { + this.verbose = verbose; + } + + public void setGenwsdl(boolean genwsdl) + { + this.genwsdl = genwsdl; + } + + private ClassLoader getClasspathLoader(ClassLoader parent) + { + return new AntClassLoader(parent, getProject(), classpath, false); + } + + public void executeNonForked() + { + ClassLoader prevCL = Thread.currentThread().getContextClassLoader(); + ClassLoader antLoader = this.getClass().getClassLoader(); + Thread.currentThread().setContextClassLoader(antLoader); + try + { + WSContractProvider gen = WSContractProvider.newInstance(); + gen.setClassLoader(getClasspathLoader(antLoader)); + if (verbose) + gen.setMessageStream(new PrintStream(new LogOutputStream(this, Project.MSG_INFO))); + gen.setGenerateSource(keep); + gen.setGenerateWsdl(genwsdl); + if (destdir != null) + gen.setOutputDirectory(destdir); + if (resourcedestdir != null) + gen.setResourceDirectory(resourcedestdir); + if (sourcedestdir != null) + gen.setSourceDirectory(sourcedestdir); + if (verbose) + log("Generating from endpoint: " + sei, Project.MSG_INFO); + + gen.provide(sei); + } + finally + { + Thread.currentThread().setContextClassLoader(prevCL); + } + } + + public void execute() throws BuildException + { + if (sei == null) + throw new BuildException("The sei attribute must be specified!", getLocation()); + + if (fork) + executeForked(); + else + executeNonForked(); + } + + private Path getTaskClassPath() + { + // Why is everything in the Ant API a big hack??? + ClassLoader cl = this.getClass().getClassLoader(); + if (cl instanceof AntClassLoader) + { + return new Path(getProject(), ((AntClassLoader)cl).getClasspath()); + } + + return new Path(getProject()); + } + + private void executeForked() throws BuildException + { + command.setClassname(org.jboss.ws.tools.jaxws.command.wsprovide.class.getName()); + + Path path = command.createClasspath(getProject()); + path.append(getTaskClassPath()); + path.append(classpath); + + if (keep) + command.createArgument().setValue("-k"); + + if (genwsdl) + command.createArgument().setValue("-w"); + + if (destdir != null) + { + command.createArgument().setValue("-o"); + command.createArgument().setFile(destdir); + } + if (resourcedestdir != null) + { + command.createArgument().setValue("-r"); + command.createArgument().setFile(resourcedestdir); + } + if (sourcedestdir != null) + { + command.createArgument().setValue("-s"); + command.createArgument().setFile(sourcedestdir); + } + + if (!verbose) + command.createArgument().setValue("-q"); + + // Always dump traces + command.createArgument().setValue("-t"); + command.createArgument().setValue(sei); + + if (verbose) + log("Command invoked: " + command.getJavaCommand().toString()); + + ExecuteJava execute = new ExecuteJava(); + execute.setClasspath(path); + execute.setJavaCommand(command.getJavaCommand()); + if (execute.fork(this) != 0) + throw new BuildException("Could not invoke wsprovide", getLocation()); + } +} \ No newline at end of file Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/Locator.java (from rev 2303, trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/ProviderLocator.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/Locator.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/Locator.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -0,0 +1,75 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.ws.tools.jaxws.api; + +import java.security.AccessController; +import java.security.PrivilegedAction; + +/** + * Locates a provider. + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * + */ +class Locator +{ + static <T> T locate(Class<T> providerType, String providerProperty, String defaultProvider, ClassLoader loader) + { + String provider = null; + + try + { + + PrivilegedAction action = new PropertyAccessAction(providerProperty); + provider = (String)AccessController.doPrivileged(action); + if (provider == null) + provider = defaultProvider; + + Class<?> clazz = loader.loadClass(provider); + return (T) clazz.newInstance(); + } + catch (Throwable t) + { + if (provider == null) + throw new IllegalStateException("Failure reading system property: " + providerProperty); + + throw new IllegalStateException("Could not load provider:" + provider); + } + + } + + private static class PropertyAccessAction implements PrivilegedAction + { + private String name; + + PropertyAccessAction(String name) + { + this.name = name; + } + + public Object run() + { + return System.getProperty(name); + } + } + +} \ No newline at end of file Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/ProviderLocator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/ProviderLocator.java 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/ProviderLocator.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -1,75 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.tools.jaxws.api; - -import java.security.AccessController; -import java.security.PrivilegedAction; - -/** - * Locates a provider. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * - */ -class ProviderLocator -{ - static <T> T locate(Class<T> providerType, String providerProperty, String defaultProvider, ClassLoader loader) - { - String provider = null; - - try - { - - PrivilegedAction action = new PropertyAccessAction(providerProperty); - provider = (String)AccessController.doPrivileged(action); - if (provider == null) - provider = defaultProvider; - - Class<?> clazz = loader.loadClass(provider); - return (T) clazz.newInstance(); - } - catch (Throwable t) - { - if (provider == null) - throw new IllegalStateException("Failure reading system property: " + providerProperty); - - throw new IllegalStateException("Could not load provider:" + provider); - } - - } - - private static class PropertyAccessAction implements PrivilegedAction - { - private String name; - - PropertyAccessAction(String name) - { - this.name = name; - } - - public Object run() - { - return System.getProperty(name); - } - } - -} \ No newline at end of file Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WSContractConsumer.java (from rev 2303, trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WebServiceImporter.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WSContractConsumer.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WSContractConsumer.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -0,0 +1,178 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.ws.tools.jaxws.api; + +import java.io.File; +import java.io.PrintStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.List; + +import org.jboss.ws.tools.jaxws.spi.WSContractConsumerFactory; + +/** + * WSContractConsumer is responsible for generating JAX-WS client and server + * artifacts from the specified WSDL file. To implement a client, one would use + * the generated ___Service.java file. For a server, one only needs to provide + * an implementation class that implements the generated service endpoint + * interface. + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +public abstract class WSContractConsumer +{ + private static String DEFAULT_PROVIDER = "org.jboss.ws.tools.jaxws.impl.WSContractConsumerFactoryImpl"; + public static final String PROVIDER_PROPERTY = "org.jboss.ws.tools.jaxws.WSContractConsumerFactoryImpl"; + + /** + * Obtain a new instance of a WSContractProvider. This will use the current + * thread's context class loader to locate the WSContractProviderFactory + * implementation. + * + * @return a new WSContractProvider + */ + public static WSContractConsumer newInstance() + { + return newInstance(Thread.currentThread().getContextClassLoader()); + } + + /** + * Obtain a new instance of a WSContractConsumer. The specified ClassLoader will be used to + * locate the WebServiceImporterProvide implementation + * + * @param loader the ClassLoader to use + * @return a new WSContractConsumer + */ + public static WSContractConsumer newInstance(ClassLoader loader) + { + WSContractConsumerFactory provider = Locator.locate(WSContractConsumerFactory.class, PROVIDER_PROPERTY, DEFAULT_PROVIDER, loader); + return provider.createImporter(); + } + + /** + * Specifies the JAX-WS and JAXB binding files to use on import operations. + * + * @param bindingFiles list of JAX-WS or JAXB binding files + */ + public abstract void setBindingFiles(List<File> bindingFiles); + + /** + * Sets the OASIS XML Catalog file to use for entity resolution. + * + * @param catalog the OASIS XML Catalog file + */ + public abstract void setCatalog(File catalog); + + /** + * Sets the main output directory. If the directory does not exist, it will be created. + * + * @param directory the root directory for generated files + */ + public abstract void setOutputDirectory(File directory); + + /** + * Sets the source directory. This directory will contain any generated Java source. + * If the directory does not exist, it will be created. If not specified, + * the output directory will be used instead. + * + * @param directory the root directory for generated source code + */ + public abstract void setSourceDirectory(File directory); + + /** + * Enables/Disables Java source generation. + * + * @param generateSource whether or not to generate Java source. + */ + public abstract void setGenerateSource(boolean generateSource); + + + /** + * Sets the target package for generated source. If not specified the default + * is based off of the XML namespace. + * + * @param targetPackage the target package for generated source + */ + public abstract void setTargetPackage(String targetPackage); + + /** + * Sets the @(a)WebService.wsdlLocation and @(a)WebServiceClient.wsdlLocation attributes to a custom value. + * + * @param wsdlLocation the custom WSDL location to use in generated source + */ + public abstract void setWsdlLocation(String wsdlLocation); + + /** + * Sets the PrintStream to use for status feedback. The simplest example + * would be to use System.out. + * + * @param messageStream the stream to use for status messages: + */ + public abstract void setMessageStream(PrintStream messageStream); + + + /** + * Sets the additional classpath to use if/when invoking the Java compiler. + * Typically an implementation will use the system <code>java.class.path</code> + * property. So for most normal applications this method is not needed. However, + * if this API is being used from an isolated classloader, then it needs to + * be called in order to reference all jars that are required by the + * implementation. + * + * @param classPath a list of strings where each entry references a + * single jar or directory + */ + public abstract void setAdditionalCompilerClassPath(List<String> classPath); + + /** + * Generate the required artifacts using the specified WSDL URL. This method + * may be called more than once, although this is probably not desireable + * + * @param wsdl the URL of the WSDL + */ + public abstract void consume(URL wsdl); + + /** + * Generate the required artifacts using the specified WSDL. This method + * may be called more than once, although this is probably not desireable. + * The passed string is expect to either be a valid URL, or a local file path. + * + * @param wsdl a URL or local file path + * @throws MalformedURLException if wsdl is not a legal URL or local file + */ + public void consume(String wsdl) throws MalformedURLException + { + URL url = null; + try + { + url = new URL(wsdl); + } + catch (MalformedURLException e) + { + File file = new File(wsdl); + url = file.toURL(); + } + + consume(url); + } +} Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WSContractProvider.java (from rev 2303, trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WebServiceGenerator.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WSContractProvider.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WSContractProvider.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -0,0 +1,150 @@ +package org.jboss.ws.tools.jaxws.api; + +import java.io.File; +import java.io.PrintStream; + +import org.jboss.ws.WSException; +import org.jboss.ws.tools.jaxws.spi.WSContractProviderFactory; + + +/** + * WSContractProvider is responsible for generating the required portable + * JAX-WS artifacts for a service endpoint implementation. This includes class + * files for wrapper types and fault beans. WSDL may be optionally generated as + * well using this API. + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * + * <p>The following example generates class files, source files and WSDL for an + * endpoint:</p> + * <pre> + * WSContractProvider provider = WSContractProvider.newInstance(); + * provider.setGenerateSource(true); + * provider.setGenerateWsdl(true); + * provider.setOutputDirectory(new File("output")); + * provider.setMessageStream(System.out); + * provider.provide(TestMe.class); + * </pre> + * + * <p>Thread-Safety:</p> + * This class expects to be thread-confined, so it can not be shared between threads. + */ +public abstract class WSContractProvider +{ + private static String DEFAULT_PROVIDER = "org.jboss.ws.tools.jaxws.impl.WSContractProviderFactoryImpl"; + public static final String PROVIDER_PROPERTY = "org.jboss.ws.tools.jaxws.WSContractProviderFactoryImpl"; + + protected WSContractProvider() + { + + } + + /** + * Obtain a new instance of a WSContractProvider. This will use the current + * thread's context class loader to locate the WSContractProviderFactory + * implementation. + * + * @return a new WSContractProvider + */ + public static WSContractProvider newInstance() + { + return newInstance(Thread.currentThread().getContextClassLoader()); + } + + /** + * Obtain a new instance of a WSContractProvider. The specified ClassLoader will be used to + * locate the WSContractProviderFactory implementation + * + * @param loader the ClassLoader to use + * @return a new WSContractProvider + */ + public static WSContractProvider newInstance(ClassLoader loader) + { + WSContractProviderFactory provider = Locator.locate(WSContractProviderFactory.class, PROVIDER_PROPERTY, DEFAULT_PROVIDER, loader); + return provider.createGenerator(loader); + } + + /** + * Enables/Disables WSDL generation. + * + * @param generateWsdl whether or not to generate WSDL + */ + public abstract void setGenerateWsdl(boolean generateWsdl); + + /** + * Enables/Disables Java source generation. + * + * @param generateSource whether or not to generate Java source. + */ + public abstract void setGenerateSource(boolean generateSource); + + /** + * Sets the main output directory. If the directory does not exist, it will be created. + * + * @param directory the root directory for generated files + */ + public abstract void setOutputDirectory(File directory); + + /** + * Sets the resource directory. This directory will contain any generated + * WSDL and XSD files. If the directory does not exist, it will be created. + * If not specified, the output directory will be used instead. + * + * @param directory the root directory for generated resource files + */ + public abstract void setResourceDirectory(File directory); + + /** + * Sets the source directory. This directory will contain any generated Java source. + * If the directory does not exist, it will be created. If not specified, + * the output directory will be used instead. + * + * @param directory the root directory for generated source code + */ + public abstract void setSourceDirectory(File directory); + + /** + * Sets the ClassLoader used to discover types. This defaults to the one used + * in instantiation. + * + * @param loader the ClassLoader to use + */ + public abstract void setClassLoader(ClassLoader loader); + + /** + * Generates artifacts using the current settings. This method may be invoked + * more than once (e.g. multiple endpoints). + * + * @param endpointClass the name of the endpoint implementation bean + * @throws WSException if any error occurs during processing, or the class is not found + */ + public abstract void provide(String endpointClass); + + /** + * Generates artifacts using the current settings. This method may be invoked + * more than once (e.g. multiple endpoints). + * + * @param endpointClass the endpoint implementation bean + * @throws WSException if any error occurs during processing + */ + public abstract void provide(Class<?> endpointClass); + + /** + * Sets the PrintStream to use for status feedback. The simplest example + * would be to use System.out. + * + * <p>Example output:</p> + * <pre> + * Generating WSDL: + * TestMeService.wsdl + * Writing Source: + * org/jboss/ws/tools/jaxws/TestMe.java + * org/jboss/ws/tools/jaxws/TestMeResponse.java + * Writing Classes: + * org/jboss/ws/tools/jaxws/TestMe.class + * org/jboss/ws/tools/jaxws/TestMeResponse.class + * </pre> + * @param messageStream the stream to use for status messages: + */ + public abstract void setMessageStream(PrintStream messageStream); +} Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WebServiceGenerator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WebServiceGenerator.java 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WebServiceGenerator.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -1,150 +0,0 @@ -package org.jboss.ws.tools.jaxws.api; - -import java.io.File; -import java.io.PrintStream; - -import org.jboss.ws.WSException; -import org.jboss.ws.tools.jaxws.spi.WebServiceGeneratorProvider; - - -/** - * WebServiceGenerator is responsible for generating the required portable - * JAX-WS artifacts for a service endpoint implementation. This includes class - * files for wrapper types and fault beans. WSDL may be optionally generated as - * well using this API. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * - * <p>The following example generates class files, source files and WSDL for an - * endpoint:</p> - * <pre> - * WebServiceGenerator generator = WebServiceGenerator.newInstance(); - * generator.setGenerateSource(true); - * generator.setGenerateWsdl(true); - * generator.setOutputDirectory(new File("output")); - * generator.setMessageStream(System.out); - * generator.generate(TestMe.class); - * </pre> - * - * <p>Thread-Safety:</p> - * This class expects to be thread-confined, so it can not be shared between threads. - */ -public abstract class WebServiceGenerator -{ - private static String DEFAULT_PROVIDER = "org.jboss.ws.tools.jaxws.impl.WebServiceGeneratorProviderImpl"; - public static final String PROVIDER_PROPERTY = "org.jboss.ws.tools.jaxws.webServiceGeneratorProvider"; - - protected WebServiceGenerator() - { - - } - - /** - * Obtain a new instance of a WebServiceGenerator. This will use the current - * thread's context class loader to locate the WebServiceGeneratorProvider - * implementation. - * - * @return a new WebServiceGenerator - */ - public static WebServiceGenerator newInstance() - { - return newInstance(Thread.currentThread().getContextClassLoader()); - } - - /** - * Obtain a new instance of a WebServiceGenerator. The specified ClassLoader will be used to - * locate the WebServiceGeneratorProvide implementation - * - * @param loader the ClassLoader to use - * @return a new WebServiceGenerator - */ - public static WebServiceGenerator newInstance(ClassLoader loader) - { - WebServiceGeneratorProvider provider = ProviderLocator.locate(WebServiceGeneratorProvider.class, PROVIDER_PROPERTY, DEFAULT_PROVIDER, loader); - return provider.createGenerator(loader); - } - - /** - * Enables/Disables WSDL generation. - * - * @param generateWsdl whether or not to generate WSDL - */ - public abstract void setGenerateWsdl(boolean generateWsdl); - - /** - * Enables/Disables Java source generation. - * - * @param generateSource whether or not to generate Java source. - */ - public abstract void setGenerateSource(boolean generateSource); - - /** - * Sets the main output directory. If the directory does not exist, it will be created. - * - * @param directory the root directory for generated files - */ - public abstract void setOutputDirectory(File directory); - - /** - * Sets the resource directory. This directory will contain any generated - * WSDL and XSD files. If the directory does not exist, it will be created. - * If not specified, the output directory will be used instead. - * - * @param directory the root directory for generated resource files - */ - public abstract void setResourceDirectory(File directory); - - /** - * Sets the source directory. This directory will contain any generated Java source. - * If the directory does not exist, it will be created. If not specified, - * the output directory will be used instead. - * - * @param directory the root directory for generated source code - */ - public abstract void setSourceDirectory(File directory); - - /** - * Sets the ClassLoader used to discover types. This defaults to the one used - * in instantiation. - * - * @param loader the ClassLoader to use - */ - public abstract void setClassLoader(ClassLoader loader); - - /** - * Generates artifacts using the current settings. This method may be invoked - * more than once (e.g. multiple endpoints). - * - * @param endpointClass the name of the endpoint implementation bean - * @throws WSException if any error occurs during processing, or the class is not found - */ - public abstract void generate(String endpointClass); - - /** - * Generates artifacts using the current settings. This method may be invoked - * more than once (e.g. multiple endpoints). - * - * @param endpointClass the endpoint implementation bean - * @throws WSException if any error occurs during processing - */ - public abstract void generate(Class<?> endpointClass); - - /** - * Sets the PrintStream to use for status feedback. The simplest example - * would be to use System.out. - * - * <p>Example output:</p> - * <pre> - * Generating WSDL: - * TestMeService.wsdl - * Writing Source: - * org/jboss/ws/tools/jaxws/TestMe.java - * org/jboss/ws/tools/jaxws/TestMeResponse.java - * Writing Classes: - * org/jboss/ws/tools/jaxws/TestMe.class - * org/jboss/ws/tools/jaxws/TestMeResponse.class - * </pre> - * @param messageStream the stream to use for status messages: - */ - public abstract void setMessageStream(PrintStream messageStream); -} Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WebServiceImporter.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WebServiceImporter.java 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/api/WebServiceImporter.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -1,178 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.tools.jaxws.api; - -import java.io.File; -import java.io.PrintStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.List; - -import org.jboss.ws.tools.jaxws.spi.WebServiceImporterProvider; - -/** - * WebServiceImporter is responsible for generating JAX-WS client and server - * artifacts from the specified WSDL file. To implement a client, one would use - * the generated ___Service.java file. For a server, one only needs to provide - * an implementation class that implements the generated service endpoint - * interface. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public abstract class WebServiceImporter -{ - private static String DEFAULT_PROVIDER = "org.jboss.com.sun.tools.ws.jbossws.WebServiceImporterProviderImpl"; - public static final String PROVIDER_PROPERTY = "org.jboss.ws.tools.jaxws.webServiceImporterProvider"; - - /** - * Obtain a new instance of a WebServiceGenerator. This will use the current - * thread's context class loader to locate the WebServiceGeneratorProvider - * implementation. - * - * @return a new WebServiceGenerator - */ - public static WebServiceImporter newInstance() - { - return newInstance(Thread.currentThread().getContextClassLoader()); - } - - /** - * Obtain a new instance of a WebServiceImporter. The specified ClassLoader will be used to - * locate the WebServiceImporterProvide implementation - * - * @param loader the ClassLoader to use - * @return a new WebServiceImporter - */ - public static WebServiceImporter newInstance(ClassLoader loader) - { - WebServiceImporterProvider provider = ProviderLocator.locate(WebServiceImporterProvider.class, PROVIDER_PROPERTY, DEFAULT_PROVIDER, loader); - return provider.createImporter(); - } - - /** - * Specifies the JAX-WS and JAXB binding files to use on import operations. - * - * @param bindingFiles list of JAX-WS or JAXB binding files - */ - public abstract void setBindingFiles(List<File> bindingFiles); - - /** - * Sets the OASIS XML Catalog file to use for entity resolution. - * - * @param catalog the OASIS XML Catalog file - */ - public abstract void setCatalog(File catalog); - - /** - * Sets the main output directory. If the directory does not exist, it will be created. - * - * @param directory the root directory for generated files - */ - public abstract void setOutputDirectory(File directory); - - /** - * Sets the source directory. This directory will contain any generated Java source. - * If the directory does not exist, it will be created. If not specified, - * the output directory will be used instead. - * - * @param directory the root directory for generated source code - */ - public abstract void setSourceDirectory(File directory); - - /** - * Enables/Disables Java source generation. - * - * @param generateSource whether or not to generate Java source. - */ - public abstract void setGenerateSource(boolean generateSource); - - - /** - * Sets the target package for generated source. If not specified the default - * is based off of the XML namespace. - * - * @param targetPackage the target package for generated source - */ - public abstract void setTargetPackage(String targetPackage); - - /** - * Sets the @(a)WebService.wsdlLocation and @(a)WebServiceClient.wsdlLocation attributes to a custom value. - * - * @param wsdlLocation the custom WSDL location to use in generated source - */ - public abstract void setWsdlLocation(String wsdlLocation); - - /** - * Sets the PrintStream to use for status feedback. The simplest example - * would be to use System.out. - * - * @param messageStream the stream to use for status messages: - */ - public abstract void setMessageStream(PrintStream messageStream); - - - /** - * Sets the additional classpath to use if/when invoking the Java compiler. - * Typically an implementation will use the system <code>java.class.path</code> - * property. So for most normal applications this method is not needed. However, - * if this API is being used from an isolated classloader, then it needs to - * be called in order to reference all jars that are required by the - * implementation. - * - * @param classPath a list of strings where each entry references a - * single jar or directory - */ - public abstract void setAdditionalCompilerClassPath(List<String> classPath); - - /** - * Generate the required artifacts using the specified WSDL URL. This method - * may be called more than once, although this is probably not desireable - * - * @param wsdl the URL of the WSDL - */ - public abstract void importServices(URL wsdl); - - /** - * Generate the required artifacts using the specified WSDL. This method - * may be called more than once, although this is probably not desireable. - * The passed string is expect to either be a valid URL, or a local file path. - * - * @param wsdl a URL or local file path - * @throws MalformedURLException if wsdl is not a legal URL or local file - */ - public void importServices(String wsdl) throws MalformedURLException - { - URL url = null; - try - { - url = new URL(wsdl); - } - catch (MalformedURLException e) - { - File file = new File(wsdl); - url = file.toURL(); - } - - importServices(url); - } -} Added: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsconsume.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsconsume.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsconsume.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -0,0 +1,235 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.tools.jaxws.command; + +import gnu.getopt.Getopt; +import gnu.getopt.LongOpt; + +import java.io.File; +import java.io.PrintStream; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import org.jboss.ws.tools.jaxws.api.WSContractConsumer; + +/** + * wsconsume is a command line tool that generates portable JAX-WS artifacts + * from a WSDL file. + * + * <pre> + * usage: wsimport [options] <wsdl-urlgt; + * options: + * -h, --help Show this help message + * -b, --binding=<file> One or more JAX-WS or JAXB binding files + * -k, --keep Keep/Generate Java source + * -c --catalog=<file> Oasis XML Catalog file for entity resolution + * -p --package=<name> The target package for generated source + * -w --wsdlLocation=<loc> Value to use for @(a)WebService.wsdlLocation + * -o, --output=<directory> The directory to put generated artifacts + * -s, --source=<directory> The directory to put Java source + * -q, --quiet Be somewhat more quiet + * -t, --show-traces Show full exception stack traces + * </pre> + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision: 2221 $ + */ +public class wsconsume +{ + private List<File> bindingFiles = new ArrayList<File>(); + private boolean generateSource = false; + private File catalog = null; + private String targetPackage = null; + private String wsdlLocation = null; + private boolean quiet = false; + private boolean showTraces = false; + private File outputDir = new File("output"); + private File sourceDir = null; + + public static String PROGRAM_NAME = System.getProperty("program.name", wsconsume.class.getName()); + + public static void main(String[] args) + { + wsconsume importer = new wsconsume(); + URL wsdl = importer.parseArguments(args); + System.exit(importer.importServices(wsdl)); + } + + private URL parseArguments(String[] args) + { + String shortOpts = "hb:kc:p:w:o:s:qt"; + LongOpt[] longOpts = + { + new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), + new LongOpt("binding", LongOpt.REQUIRED_ARGUMENT, null, 'b'), + new LongOpt("keep", LongOpt.NO_ARGUMENT, null, 'k'), + new LongOpt("catalog", LongOpt.REQUIRED_ARGUMENT, null, 'c'), + new LongOpt("package", LongOpt.REQUIRED_ARGUMENT, null, 'p'), + new LongOpt("wsdlLocation", LongOpt.REQUIRED_ARGUMENT, null, 'w'), + new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'), + new LongOpt("source", LongOpt.REQUIRED_ARGUMENT, null, 's'), + new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'), + new LongOpt("show-traces", LongOpt.NO_ARGUMENT, null, 't'), + }; + + Getopt getopt = new Getopt(PROGRAM_NAME, args, shortOpts, longOpts); + int c; + while ((c = getopt.getopt()) != -1) + { + switch (c) + { + case 'b': + bindingFiles.add(new File(getopt.getOptarg())); + break; + case 'k': + generateSource = true; + break; + case 'c': + catalog = new File(getopt.getOptarg()); + break; + case 'p': + targetPackage = getopt.getOptarg(); + break; + case 'w': + wsdlLocation = getopt.getOptarg(); + break; + case 'o': + outputDir = new File(getopt.getOptarg()); + break; + case 's': + sourceDir = new File(getopt.getOptarg()); + break; + case 'q': + quiet = true; + break; + case 't': + showTraces = true; + break; + case 'h': + printHelp(); + System.exit(0); + case '?': + System.exit(1); + } + } + + int wsdlPos = getopt.getOptind(); + if (wsdlPos >= args.length) + { + System.err.println("Error: WSDL URL was not specified!"); + printHelp(); + System.exit(1); + } + + URL url = null; + try + { + try + { + url = new URL(args[wsdlPos]); + } + catch (MalformedURLException e) + { + File file = new File(args[wsdlPos]); + url = file.toURL(); + } + } + catch (MalformedURLException e) + { + System.err.println("Error: Invalid URI: " + args[wsdlPos]); + System.exit(1); + } + + return url; + } + + + private int importServices(URL wsdl) + { + WSContractConsumer importer = WSContractConsumer.newInstance(); + importer.setGenerateSource(generateSource); + importer.setOutputDirectory(outputDir); + if (sourceDir != null) + importer.setSourceDirectory(sourceDir); + + if (! quiet) + importer.setMessageStream(System.out); + + if (catalog != null) + importer.setCatalog(catalog); + + if (targetPackage != null) + importer.setTargetPackage(targetPackage); + + if (wsdlLocation != null) + importer.setWsdlLocation(wsdlLocation); + + if (bindingFiles != null && bindingFiles.size() > 0) + importer.setBindingFiles(bindingFiles); + + try + { + importer.consume(wsdl); + return 0; + } + catch (Throwable t) + { + System.err.println("Error: Could not import. (use --show-traces to see full traces)"); + if (!showTraces) + { + String message = t.getMessage(); + if (message == null) + message = t.getClass().getSimpleName(); + System.err.println("Error: " + message); + } + else + { + t.printStackTrace(System.err); + } + + } + + return 1; + } + + private static void printHelp() + { + PrintStream out = System.out; + out.println("wsconsume is a command line tool that generates portable JAX-WS artifacts from a WSDL file.\n"); + out.println("usage: " + PROGRAM_NAME + " [options] <wsdl-url>\n"); + out.println("options: "); + out.println(" -h, --help Show this help message"); + out.println(" -b, --binding=<file> One or more JAX-WS or JAXB binding files "); + out.println(" -k, --keep Keep/Generate Java source"); + out.println(" -c --catalog=<file> Oasis XML Catalog file for entity resolution"); + out.println(" -p --package=<name> The target package for generated source"); + out.println(" -w --wsdlLocation=<loc> Value to use for @WebService.wsdlLocation"); + out.println(" -o, --output=<directory> The directory to put generated artifacts"); + out.println(" -s, --source=<directory> The directory to put Java source"); + out.println(" -q, --quiet Be somewhat more quiet"); + out.println(" -t, --show-traces Show full exception stack traces"); + out.flush(); + } +} Added: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -0,0 +1,225 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.tools.jaxws.command; + +import gnu.getopt.Getopt; +import gnu.getopt.LongOpt; + +import java.io.File; +import java.io.PrintStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.List; + +import org.jboss.ws.core.utils.JavaUtils; +import org.jboss.ws.tools.jaxws.api.WSContractProvider; + +/** + * wsprovide is a command line tool that generates portable JAX-WS artifacts + * for a service endpoint implementation. + * + * <pre> + * usage: wsprovide [options] <endpoint class name> + * options: + * -h, --help Show this help message + * -k, --keep Keep/Generate Java source + * -w, --wsdl Enable WSDL file generation + * -c. --classpath The classpath that contains the endpoint + * -o, --output=<directory> The directory to put generated artifacts + * -r, --resource=<directory> The directory to put resource artifacts + * -s, --source=<directory> The directory to put Java source + * -q, --quiet Be somewhat more quiet + * -t, --show-traces Show full exception stack traces + * </pre> + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision: 2164 $ + */ +public class wsprovide +{ + private boolean generateSource = false; + private boolean generateWsdl = false; + private boolean quiet = false; + private boolean showTraces = false; + private ClassLoader loader = Thread.currentThread().getContextClassLoader(); + private File outputDir = new File("output"); + private File resourceDir = null; + private File sourceDir = null; + + public static String PROGRAM_NAME = System.getProperty("program.name", wsprovide.class.getSimpleName()); + + public static void main(String[] args) + { + wsprovide generate = new wsprovide(); + String endpoint = generate.parseArguments(args); + System.exit(generate.generate(endpoint)); + } + + private String parseArguments(String[] args) + { + String shortOpts = "hwko:r:s:cqt"; + LongOpt[] longOpts = + { + new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), + new LongOpt("wsdl", LongOpt.NO_ARGUMENT, null, 'w'), + new LongOpt("keep", LongOpt.NO_ARGUMENT, null, 'k'), + new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'), + new LongOpt("resource", LongOpt.REQUIRED_ARGUMENT, null, 'r'), + new LongOpt("source", LongOpt.REQUIRED_ARGUMENT, null, 's'), + new LongOpt("classpath", LongOpt.REQUIRED_ARGUMENT, null, 'c'), + new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'), + new LongOpt("show-traces", LongOpt.NO_ARGUMENT, null, 't'), + }; + + Getopt getopt = new Getopt(PROGRAM_NAME, args, shortOpts, longOpts); + int c; + while ((c = getopt.getopt()) != -1) + { + switch (c) + { + case 'k': + generateSource = true; + break; + case 's': + sourceDir = new File(getopt.getOptarg()); + break; + case 'r': + resourceDir = new File(getopt.getOptarg()); + break; + case 'w': + generateWsdl = true; + break; + case 't': + showTraces = true; + break; + case 'o': + outputDir = new File(getopt.getOptarg()); + break; + case 'q': + quiet = true; + break; + case 'c': + processClassPath(getopt.getOptarg()); + break; + case 'h': + printHelp(); + System.exit(0); + case '?': + System.exit(1); + } + } + + int endpointPos = getopt.getOptind(); + if (endpointPos >= args.length) + { + System.err.println("Error: endpoint implementation was not specified!"); + printHelp(); + System.exit(1); + } + + return args[endpointPos]; + } + + + private int generate(String endpoint) + { + if (!JavaUtils.isLoaded(endpoint, loader)) + { + System.err.println("Error: Could not load class [" + endpoint + "]. Did you specify a valid --classpath?"); + return 1; + } + + WSContractProvider gen = WSContractProvider.newInstance(loader); + gen.setGenerateWsdl(generateWsdl); + gen.setGenerateSource(generateSource); + gen.setOutputDirectory(outputDir); + if (resourceDir != null) + gen.setResourceDirectory(resourceDir); + if (sourceDir != null) + gen.setSourceDirectory(sourceDir); + + if (! quiet) + gen.setMessageStream(System.out); + + try + { + gen.provide(endpoint); + return 0; + } + catch (Throwable t) + { + System.err.println("Error: Could not generate. (use --show-traces to see full traces)"); + if (!showTraces) + { + String message = t.getMessage(); + if (message == null) + message = t.getClass().getSimpleName(); + System.err.println("Error: " + message); + } + else + { + t.printStackTrace(System.err); + } + + } + + return 1; + } + + private void processClassPath(String classPath) + { + String[] entries = classPath.split(File.pathSeparator); + List<URL> urls= new ArrayList<URL>(entries.length); + for (String entry : entries) + { + try + { + urls.add(new File(entry).toURL()); + } + catch (MalformedURLException e) + { + System.err.println("Error: a classpath entry was malformed: " + entry); + } + } + loader = new URLClassLoader(urls.toArray(new URL[0]), loader); + } + + private static void printHelp() + { + PrintStream out = System.out; + out.println("wsprovide generates portable JAX-WS artifacts for an endpoint implementation.\n"); + out.println("usage: " + PROGRAM_NAME + " [options] <endpoint class name>\n"); + out.println("options: "); + out.println(" -h, --help Show this help message"); + out.println(" -k, --keep Keep/Generate Java source"); + out.println(" -w, --wsdl Enable WSDL file generation"); + out.println(" -c. --classpath The classpath that contains the endpoint"); + out.println(" -o, --output=<directory> The directory to put generated artifacts"); + out.println(" -r, --resource=<directory> The directory to put resource artifacts"); + out.println(" -s, --source=<directory> The directory to put Java source"); + out.println(" -q, --quiet Be somewhat more quiet"); + out.println(" -t, --show-traces Show full exception stack traces"); + out.flush(); + } +} Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderFactoryImpl.java (from rev 2303, trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WebServiceGeneratorProviderImpl.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderFactoryImpl.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderFactoryImpl.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.tools.jaxws.impl; + +import org.jboss.ws.tools.jaxws.api.WSContractProvider; +import org.jboss.ws.tools.jaxws.spi.WSContractProviderFactory; + +public class WSContractProviderFactoryImpl implements WSContractProviderFactory +{ + public WSContractProvider createGenerator(ClassLoader loader) + { + WSContractProviderImpl impl = new WSContractProviderImpl(); + impl.setClassLoader(loader); + return impl; + } +} Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java (from rev 2303, trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WebServiceGeneratorImpl.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -0,0 +1,183 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.ws.tools.jaxws.impl; + +import static org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType.JAXWS_EJB3; +import static org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType.JAXWS_JSE; + +import java.io.File; +import java.io.IOException; +import java.io.PrintStream; +import java.net.URL; +import java.net.URLClassLoader; + +import javax.ejb.Stateless; + +import org.jboss.ws.WSException; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder; +import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; +import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import org.jboss.ws.tools.jaxws.api.WSContractProvider; + +/** + * The provided implementation of a WSContractProvider. + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + */ +final class WSContractProviderImpl extends WSContractProvider +{ + private ClassLoader loader; + private boolean generateWsdl = false; + private boolean generateSource = false; + private File outputDir = new File("output"); + private File resourceDir = null; + private File sourceDir = null; + private PrintStream messageStream = new NullPrintStream(); + + private void createDirectories(File resourceDir, File sourceDir) + { + if (!outputDir.exists()) + if (!outputDir.mkdirs()) + throw new WSException("Could not create directory: " + outputDir); + + if (generateWsdl && !resourceDir.exists()) + if (!resourceDir.mkdirs()) + throw new WSException("Could not create directory: " + resourceDir); + + if (generateSource && !sourceDir.exists()) + if (!sourceDir.mkdirs()) + throw new WSException("Could not create directory: " + sourceDir); + } + + private UnifiedDeploymentInfo createUDI(Class<?> endpointClass, ClassLoader loader) + { + DeploymentType type = (endpointClass.isAnnotationPresent(Stateless.class)) ? JAXWS_EJB3 : JAXWS_JSE; + UnifiedDeploymentInfo udi = new UnifiedDeploymentInfo(type) + { + @Override + public URL getMetaDataFileURL(String resourcePath) throws IOException + { + return null; + } + }; + udi.classLoader = loader; + return udi; + } + + @Override + public void provide(Class<?> endpointClass) + { + // Use the output directory as the default + File resourceDir = (this.resourceDir != null) ? this.resourceDir : outputDir; + File sourceDir = (this.sourceDir != null) ? this.sourceDir : outputDir; + + createDirectories(resourceDir, sourceDir); + + // Create a dummy classloader to catch generated classes + ClassLoader loader = new URLClassLoader(new URL[0], this.loader); + UnifiedMetaData umd = new UnifiedMetaData(new ResourceLoaderAdapter(loader)); + umd.setClassLoader(loader); + + ChainedWritableWrapperGenerator generator = new ChainedWritableWrapperGenerator(); + if (generateSource) + generator.add(new SourceWrapperGenerator(loader, messageStream), sourceDir); + generator.add(new BytecodeWrapperGenerator(loader, messageStream), outputDir); + + JAXWSWebServiceMetaDataBuilder builder = new JAXWSWebServiceMetaDataBuilder(); + builder.setWrapperGenerator(generator); + builder.setGenerateWsdl(generateWsdl); + builder.setToolMode(true); + builder.setWsdlDirectory(resourceDir); + builder.setMessageStream(messageStream); + + if (generateWsdl) + messageStream.println("Generating WSDL:"); + + UnifiedDeploymentInfo udi = createUDI(endpointClass, loader); + builder.buildWebServiceMetaData(umd, udi, endpointClass, null); + try + { + generator.write(); + } + catch (IOException io) + { + throw new WSException("Could not write output files:", io); + } + } + + @Override + public void provide(String endpointClass) + { + try + { + provide(loader.loadClass(endpointClass)); + } + catch (ClassNotFoundException e) + { + throw new WSException("Class not found: " + endpointClass); + } + } + + @Override + public void setClassLoader(ClassLoader loader) + { + this.loader = loader; + } + + @Override + public void setGenerateWsdl(boolean generateWsdl) + { + this.generateWsdl = generateWsdl; + } + + @Override + public void setOutputDirectory(File directory) + { + outputDir = directory; + } + + @Override + public void setGenerateSource(boolean generateSource) + { + this.generateSource = generateSource; + } + + @Override + public void setResourceDirectory(File directory) + { + resourceDir = directory; + } + + @Override + public void setSourceDirectory(File directory) + { + sourceDir = directory; + } + + @Override + public void setMessageStream(PrintStream messageStream) + { + this.messageStream = messageStream; + } +} Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WebServiceGeneratorImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WebServiceGeneratorImpl.java 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WebServiceGeneratorImpl.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -1,183 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.tools.jaxws.impl; - -import static org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType.JAXWS_EJB3; -import static org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType.JAXWS_JSE; - -import java.io.File; -import java.io.IOException; -import java.io.PrintStream; -import java.net.URL; -import java.net.URLClassLoader; - -import javax.ejb.Stateless; - -import org.jboss.ws.WSException; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; -import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder; -import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.tools.jaxws.api.WebServiceGenerator; - -/** - * The provided implementation of a WebServiceGenerator. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - */ -final class WebServiceGeneratorImpl extends WebServiceGenerator -{ - private ClassLoader loader; - private boolean generateWsdl = false; - private boolean generateSource = false; - private File outputDir = new File("output"); - private File resourceDir = null; - private File sourceDir = null; - private PrintStream messageStream = new NullPrintStream(); - - private void createDirectories(File resourceDir, File sourceDir) - { - if (!outputDir.exists()) - if (!outputDir.mkdirs()) - throw new WSException("Could not create directory: " + outputDir); - - if (generateWsdl && !resourceDir.exists()) - if (!resourceDir.mkdirs()) - throw new WSException("Could not create directory: " + resourceDir); - - if (generateSource && !sourceDir.exists()) - if (!sourceDir.mkdirs()) - throw new WSException("Could not create directory: " + sourceDir); - } - - private UnifiedDeploymentInfo createUDI(Class<?> endpointClass, ClassLoader loader) - { - DeploymentType type = (endpointClass.isAnnotationPresent(Stateless.class)) ? JAXWS_EJB3 : JAXWS_JSE; - UnifiedDeploymentInfo udi = new UnifiedDeploymentInfo(type) - { - @Override - public URL getMetaDataFileURL(String resourcePath) throws IOException - { - return null; - } - }; - udi.classLoader = loader; - return udi; - } - - @Override - public void generate(Class<?> endpointClass) - { - // Use the output directory as the default - File resourceDir = (this.resourceDir != null) ? this.resourceDir : outputDir; - File sourceDir = (this.sourceDir != null) ? this.sourceDir : outputDir; - - createDirectories(resourceDir, sourceDir); - - // Create a dummy classloader to catch generated classes - ClassLoader loader = new URLClassLoader(new URL[0], this.loader); - UnifiedMetaData umd = new UnifiedMetaData(new ResourceLoaderAdapter(loader)); - umd.setClassLoader(loader); - - ChainedWritableWrapperGenerator generator = new ChainedWritableWrapperGenerator(); - if (generateSource) - generator.add(new SourceWrapperGenerator(loader, messageStream), sourceDir); - generator.add(new BytecodeWrapperGenerator(loader, messageStream), outputDir); - - JAXWSWebServiceMetaDataBuilder builder = new JAXWSWebServiceMetaDataBuilder(); - builder.setWrapperGenerator(generator); - builder.setGenerateWsdl(generateWsdl); - builder.setToolMode(true); - builder.setWsdlDirectory(resourceDir); - builder.setMessageStream(messageStream); - - if (generateWsdl) - messageStream.println("Generating WSDL:"); - - UnifiedDeploymentInfo udi = createUDI(endpointClass, loader); - builder.buildWebServiceMetaData(umd, udi, endpointClass, null); - try - { - generator.write(); - } - catch (IOException io) - { - throw new WSException("Could not write output files:", io); - } - } - - @Override - public void generate(String endpointClass) - { - try - { - generate(loader.loadClass(endpointClass)); - } - catch (ClassNotFoundException e) - { - throw new WSException("Class not found: " + endpointClass); - } - } - - @Override - public void setClassLoader(ClassLoader loader) - { - this.loader = loader; - } - - @Override - public void setGenerateWsdl(boolean generateWsdl) - { - this.generateWsdl = generateWsdl; - } - - @Override - public void setOutputDirectory(File directory) - { - outputDir = directory; - } - - @Override - public void setGenerateSource(boolean generateSource) - { - this.generateSource = generateSource; - } - - @Override - public void setResourceDirectory(File directory) - { - resourceDir = directory; - } - - @Override - public void setSourceDirectory(File directory) - { - sourceDir = directory; - } - - @Override - public void setMessageStream(PrintStream messageStream) - { - this.messageStream = messageStream; - } -} Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WebServiceGeneratorProviderImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WebServiceGeneratorProviderImpl.java 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WebServiceGeneratorProviderImpl.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -1,35 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.tools.jaxws.impl; - -import org.jboss.ws.tools.jaxws.api.WebServiceGenerator; -import org.jboss.ws.tools.jaxws.spi.WebServiceGeneratorProvider; - -public class WebServiceGeneratorProviderImpl implements WebServiceGeneratorProvider -{ - public WebServiceGenerator createGenerator(ClassLoader loader) - { - WebServiceGeneratorImpl impl = new WebServiceGeneratorImpl(); - impl.setClassLoader(loader); - return impl; - } -} Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WSContractConsumerFactory.java (from rev 2303, trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WebServiceImporterProvider.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WSContractConsumerFactory.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WSContractConsumerFactory.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.tools.jaxws.spi; + +import org.jboss.ws.tools.jaxws.api.WSContractConsumer; + +/** + * WSContractConsumerFactory defines the contract for a WSContractConsumer factory. + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + */ +public interface WSContractConsumerFactory +{ + /** + * Create a new WSContractConsumer. There are no restrictions on how this + * should be performed. + * + * @return a new WSContractConsumer + */ + public WSContractConsumer createImporter(); +} Added: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WSContractProviderFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WSContractProviderFactory.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WSContractProviderFactory.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.tools.jaxws.spi; + +import org.jboss.ws.tools.jaxws.api.WSContractProvider; + +/** + * WSContractProviderFactory defines the contract for a WSContractProvider factory. + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + */ +public interface WSContractProviderFactory +{ + /** + * Create a new WSContractProvider. There are no restrictions on how this + * should be performed. The passed ClassLoader is the one used in + * {@link WSContractProvider#newInstance(ClassLoader)}. This loader + * should be made available to the generated WSContractProvider. + * + * @param loader the ClassLoader for type discovery + * @return a new WSContractProvider + */ + public WSContractProvider createGenerator(ClassLoader loader); +} Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WebServiceGeneratorProvider.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WebServiceGeneratorProvider.java 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WebServiceGeneratorProvider.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.tools.jaxws.spi; - -import org.jboss.ws.tools.jaxws.api.WebServiceGenerator; - -/** - * WebServiceGeneratorProvider defines the contract for a WebServiceGenerator provider. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - */ -public interface WebServiceGeneratorProvider -{ - /** - * Create a new WebServiceGenerator. There are no restrictions on how this - * should be performed. The passed ClassLoader is the one used in - * {@link WebServiceGenerator#newInstance(ClassLoader)}. This loader - * should be made available to the generated WebServiceGenerator. - * - * @param loader the ClassLoader for type discovery - * @return a new WebServiceGenerator - */ - public WebServiceGenerator createGenerator(ClassLoader loader); -} Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WebServiceImporterProvider.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WebServiceImporterProvider.java 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/spi/WebServiceImporterProvider.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.tools.jaxws.spi; - -import org.jboss.ws.tools.jaxws.api.WebServiceImporter; - -/** - * WebServiceImporterProvider defines the contract for a WebServiceImporter provider. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - */ -public interface WebServiceImporterProvider -{ - /** - * Create a new WebServiceImporter. There are no restrictions on how this - * should be performed. - * - * @return a new WebServiceImporter - */ - public WebServiceImporter createImporter(); -} Modified: trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml =================================================================== --- trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml 2007-02-09 22:14:15 UTC (rev 2325) @@ -9,32 +9,8 @@  <project name="TOOLS-Delegate"> - + <macrodef name="call-wsconsume"> - - <macrodef name="callWsimport"> - <attribute name="sourceDir"/> <attribute name="destDir"/> <attribute name="wsdlLocation"/> @@ -52,26 +28,48 @@ <mkdir dir="@{sourceDir}"/> <mkdir dir="@{destDir}"/> - <taskdef name="wsimport" classname="org.jboss.ws.tools.jaxws.ant.WSImport"> + + <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> + <classpath> <pathelement location="${core.output.dir}/lib/jbossws-client.jar"/> <pathelement location="${core.output.dir}/lib/jboss-jaxws.jar"/> <pathelement location="${core.output.dir}/lib/jboss-saaj.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-sun-wsimport.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/> <pathelement location="${thirdparty.dir}/wstx.jar"/> <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> </classpath> </taskdef> - <wsimport + <wsconsume keep="true" sourcedestdir="@{sourceDir}" destdir="@{destDir}" wsdl="@{wsdlLocation}" package="@{package}" verbose="@{verbose}"> - </wsimport> + </wsconsume> </sequential> </macrodef> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/jbossws-tests/build.xml 2007-02-09 22:14:15 UTC (rev 2325) @@ -316,17 +316,17 @@ --> <target name="wsdl-java" depends="init">  - <callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java" + <call-wsconsume wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java" destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" verbose="false"/> - <callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java" + <call-wsconsume wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java" destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" verbose="false"/> - <callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java" + <call-wsconsume wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java" destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" verbose="false"/>  - <callWsimport wsdlLocation="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" sourceDir="${tests.output.dir}/wstools/java" + <call-wsconsume wsdlLocation="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" sourceDir="${tests.output.dir}/wstools/java" destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.benchmark.jaxws.doclit" verbose="false"/> </target> @@ -551,4 +551,4 @@ <delete dir="${tests.output.dir}"/> </target> -</project> \ No newline at end of file +</project> Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jaxws/WebServiceGeneratorTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jaxws/WebServiceGeneratorTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jaxws/WebServiceGeneratorTestCase.java 2007-02-09 22:14:15 UTC (rev 2325) @@ -31,11 +31,11 @@ import org.jboss.test.ws.jaxws.samples.soapbinding.PurchaseOrder; import org.jboss.test.ws.jaxws.samples.soapbinding.PurchaseOrderAck; import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.tools.jaxws.api.WebServiceGenerator; +import org.jboss.ws.tools.jaxws.api.WSContractProvider; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; /** - * Tests the WebServiceGenerator API. + * Tests the WSContractProvider API. * * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> * @version $Revision$ @@ -44,10 +44,10 @@ { public void testBasic() throws Exception { - WebServiceGenerator gen = getGenerator(); + WSContractProvider gen = getGenerator(); File outputDir = new File("tools/wsgen/basic/out"); gen.setOutputDirectory(outputDir); - gen.generate(DocWrappedServiceImpl.class); + gen.provide(DocWrappedServiceImpl.class); checkWrapperClasses(outputDir); @@ -55,9 +55,9 @@ checkWrapperSource(outputDir, false); } - private WebServiceGenerator getGenerator() + private WSContractProvider getGenerator() { - return WebServiceGenerator.newInstance(); + return WSContractProvider.newInstance(); } private void checkWrapperSource(File outputDir, boolean shouldExist) @@ -86,11 +86,11 @@ public void testSource() throws Exception { - WebServiceGenerator gen = getGenerator(); + WSContractProvider gen = getGenerator(); File outputDir = new File("tools/wsgen/source/out"); gen.setOutputDirectory(outputDir); gen.setGenerateSource(true); - gen.generate(DocWrappedServiceImpl.class); + gen.provide(DocWrappedServiceImpl.class); checkWrapperClasses(outputDir); checkWrapperSource(outputDir, true); @@ -98,14 +98,14 @@ public void testSourceDir() throws Exception { - WebServiceGenerator gen = getGenerator(); + WSContractProvider gen = getGenerator(); File outputDir = new File("tools/wsgen/sourcedir/out"); File sourceDir = new File("tools/wsgen/sourcedir/source"); gen.setOutputDirectory(outputDir); gen.setSourceDirectory(sourceDir); gen.setGenerateSource(true); - gen.generate(DocWrappedServiceImpl.class); + gen.provide(DocWrappedServiceImpl.class); checkWrapperClasses(outputDir); checkWrapperSource(outputDir, false); @@ -114,11 +114,11 @@ public void testWsdl() throws Exception { - WebServiceGenerator gen = getGenerator(); + WSContractProvider gen = getGenerator(); File outputDir = new File("tools/wsgen/wsdl/out"); gen.setOutputDirectory(outputDir); gen.setGenerateWsdl(true); - gen.generate(DocWrappedServiceImpl.class); + gen.provide(DocWrappedServiceImpl.class); checkWrapperClasses(outputDir); @@ -132,13 +132,13 @@ public void testResourceDir() throws Exception { - WebServiceGenerator gen = getGenerator(); + WSContractProvider gen = getGenerator(); File outputDir = new File("tools/wsgen/resourcedir/out"); File wsdlDir = new File("tools/wsgen/resourcedir/wsdl"); gen.setOutputDirectory(outputDir); gen.setResourceDirectory(wsdlDir); gen.setGenerateWsdl(true); - gen.generate(DocWrappedServiceImpl.class); + gen.provide(DocWrappedServiceImpl.class); checkWrapperClasses(outputDir);

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r2324 - in trunk: jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc and 41 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-02-09 11:14:15 -0500 (Fri, 09 Feb 2007) New Revision: 2324 Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java trunk/jbossws-tests/src/main/resources/jaxrpc/xop/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/attach.jpeg trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.jpeg trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/disguised_jpeg.xcf Removed: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/attach.jpeg trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.jpeg trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/disguised_jpeg.xcf Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml trunk/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java trunk/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml Log: Same MTOM default for JAX-WS and JAX-RPC (disabled). JAX-RPC endpoint config supports Features now. Removed XOP unit tests from samples package. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -777,7 +777,7 @@ if (paramMetaData.isXOP() && XOPContext.isXOPEncodedRequest()) { SOAPMessageImpl soapMessage = (SOAPMessageImpl)MessageContextAssociation.peekMessageContext().getSOAPMessage(); - soapMessage.setXOPMessage(true); + soapMessage.setXOPMessage(true); } return soapContentElement; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -42,7 +42,7 @@ public SOAP11BindingJAXRPC() { super(); - setMTOMEnabled(true); + setMTOMEnabled(false); } public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -42,7 +42,7 @@ public SOAP12BindingJAXRPC() { super(); - setMTOMEnabled(true); + setMTOMEnabled(false); } public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -46,6 +46,7 @@ import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonClient; import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.StubExt; import org.jboss.ws.core.jaxws.binding.BindingExt; import org.jboss.ws.core.jaxws.binding.BindingProviderImpl; import org.jboss.ws.core.jaxws.handler.HandlerChainExecutor; @@ -59,6 +60,7 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; +import org.jboss.ws.extensions.xop.XOPContext; /** * Provides support for the dynamic invocation of a service endpoint. @@ -207,12 +209,16 @@ { if(log.isDebugEnabled()) log.debug("Begin response processing"); + // MTOM setting need to pass past pivot + boolean mtomEnabled = XOPContext.isMTOMEnabled(); + // remove existing context MessageContextAssociation.popMessageContext(); SOAPMessageContextJAXWS responseContext = new SOAPMessageContextJAXWS(requestContext); responseContext.setSOAPMessage(null); responseContext.clear(); // clear message context properties + responseContext.setProperty(StubExt.PROPERTY_MTOM_ENABLED, mtomEnabled); // associate new context MessageContextAssociation.pushMessageContext(responseContext); Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,59 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.extensions.xop; - -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.MessageContext; - -import org.jboss.ws.core.StubExt; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id$ - * @since Oct 2, 2006 - */ -public class DisableMTOMHandler extends GenericHandler { - public QName[] getHeaders() { - return new QName[0]; - } - - public boolean handleRequest(MessageContext msgContext) { - disableMTOM(msgContext); - return true; - } - - public boolean handleResponse(MessageContext msgContext) { - disableMTOM(msgContext); - return true; - } - - public boolean handleFault(MessageContext msgContext) { - disableMTOM(msgContext); - return true; - } - - public void disableMTOM(MessageContext msgContext) - { - msgContext.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - } -} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -126,7 +126,7 @@ { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); Boolean mtomEnabled = (Boolean)msgContext.getProperty(StubExt.PROPERTY_MTOM_ENABLED); - return Boolean.TRUE.equals(mtomEnabled) || mtomEnabled == null; + return Boolean.TRUE.equals(mtomEnabled); } public static void setMTOMEnabled(boolean b) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -23,22 +23,6 @@ // $Id$ -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Observable; -import java.util.Properties; -import java.util.concurrent.ConcurrentHashMap; - -import javax.jws.soap.SOAPBinding.ParameterStyle; -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; -import javax.xml.ws.Service.Mode; - import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; @@ -56,13 +40,17 @@ import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.metadata.config.CommonConfig; -import org.jboss.ws.metadata.config.Configurable; -import org.jboss.ws.metadata.config.ConfigurationProvider; -import org.jboss.ws.metadata.config.EndpointFeature; -import org.jboss.ws.metadata.config.JBossWSConfigFactory; +import org.jboss.ws.metadata.config.*; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; +import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; +import javax.xml.ws.Service.Mode; +import java.lang.reflect.Method; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; + /** * A Service component describes a set of endpoints. * @@ -595,6 +583,9 @@ if (config == null) initEndpointConfig(); + // register any configurable with the ConfigProvider + configObservable.addObserver(configurable); + // SOAPBinding configuration if (configurable instanceof CommonBindingProvider) { Modified: trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml =================================================================== --- trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -3,21 +3,15 @@  <jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> + xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> <client-config> <config-name>Standard Client</config-name> </client-config> <client-config> - <config-name>Standard MTOM disabled client</config-name> - <post-handler-chain> - <handler-chain-name>MTOM handler</handler-chain-name> - <handler> - <j2ee:handler-name>DisableMTOMHandler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.xop.DisableMTOMHandler</j2ee:handler-class> - </handler> - </post-handler-chain> + <config-name>Standard MTOM client</config-name> + <feature>http://org.jboss.ws/mtom</feature> </client-config> <client-config> Modified: trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml =================================================================== --- trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -2,7 +2,8 @@  -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" +<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> <endpoint-config> @@ -10,14 +11,8 @@ </endpoint-config> <endpoint-config> - <config-name>Standard MTOM disabled endpoint</config-name> - <pre-handler-chain> - <handler-chain-name>MTOM handlers</handler-chain-name> - <handler> - <j2ee:handler-name>DisableMTOMHandler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.xop.DisableMTOMHandler</j2ee:handler-class> - </handler> - </pre-handler-chain> + <config-name>Standard MTOM Endpoint</config-name> + <feature>http://org.jboss.ws/mtom</feature> </endpoint-config> <endpoint-config> Modified: trunk/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd =================================================================== --- trunk/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd 2007-02-09 16:14:15 UTC (rev 2324) @@ -56,6 +56,7 @@ <xsd:element name="config-name" type="xsd:string"/> <xsd:element name="pre-handler-chain" type="tns:handlerChainType" minOccurs="0"/> <xsd:element name="post-handler-chain" type="tns:handlerChainType" minOccurs="0"/> + <xsd:element name="feature" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="property" type="tns:propertyType" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:complexType> Modified: trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -628,13 +628,13 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -642,59 +642,59 @@ </war> <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar>  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF"> <include name="webservices.xml"/> </webinf> </war> <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit_handler-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar>  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -702,46 +702,46 @@ </war> <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar>  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF"> <include name="webservices.xml"/> </webinf> </war> <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit_handler-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -28,6 +28,7 @@ import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC; +import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC; import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; import org.jboss.ws.metadata.config.jaxws.EndpointConfigJAXWS; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; @@ -52,13 +53,14 @@ assertNotNull("Null config", config); - assertEquals(2, config.getEndpointConfig().size()); + assertEquals(3, config.getEndpointConfig().size()); EndpointConfigJAXRPC epc1 = (EndpointConfigJAXRPC)config.getEndpointConfig().get(0); - EndpointConfigJAXRPC epc2 = (EndpointConfigJAXRPC)config.getEndpointConfig().get(1); + EndpointConfigJAXRPC epc2 = (EndpointConfigJAXRPC)config.getEndpointConfig().get(2); assertEquals("Standard Endpoint", epc1.getConfigName()); assertNull(epc1.getPreHandlerChain()); assertNull(epc1.getPostHandlerChain()); + assertFalse("MTOM should not be enabled" , epc1.hasFeature("http://org.jboss.ws/mtom")); assertEquals("Standard WSSecurity Endpoint", epc2.getConfigName()); HandlerChainMetaData preChain = epc2.getPreHandlerChain(); @@ -68,12 +70,12 @@ assertEquals("org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound", h1.getHandlerClass()); } - public void testFeatures() throws Exception + public void testJAXWSFeatures() throws Exception { File confFile = new File("resources/common/config/jaxws-endpoint-config.xml"); assertTrue(confFile.exists()); + JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); ConfigRootJAXWS config = (ConfigRootJAXWS)factory.parse(confFile.toURL()); assertNotNull("Null config", config); @@ -83,7 +85,22 @@ // disable feature epConfig.setFeature("http://org.jboss.ws/mtom", false); assertFalse("Feature still set", epConfig.hasFeature("http://org.jboss.ws/mtom")); + } + public void testJAXRPCFeatures() throws Exception + { + File confFile = new File("resources/common/config/jaxrpc-endpoint-config.xml"); + assertTrue(confFile.exists()); + JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); + ConfigRootJAXRPC config = (ConfigRootJAXRPC)factory.parse(confFile.toURL()); + assertNotNull("Null config", config); + + CommonConfigJAXRPC epConfig = (CommonConfigJAXRPC)config.getConfigByName("Standard MTOM Endpoint"); + assertTrue("Feature not set" , epConfig.hasFeature("http://org.jboss.ws/mtom")); + + // disable feature + epConfig.setFeature("http://org.jboss.ws/mtom", false); + assertFalse("Feature still set", epConfig.hasFeature("http://org.jboss.ws/mtom")); } public void testProperties() throws Exception Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,119 +0,0 @@ -package org.jboss.test.ws.jaxrpc.samples.xop; - -import java.io.File; - -import junit.framework.TestCase; - -import org.apache.xerces.xs.XSComplexTypeDefinition; -import org.apache.xerces.xs.XSModel; -import org.apache.xerces.xs.XSTypeDefinition; -import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils; -import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; -import org.jboss.xb.binding.NamespaceRegistry; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @since Jun 9, 2006 - */ -public class XOPTypeDefTestCase extends TestCase -{ - public XOPTypeDefTestCase(String string) - { - super(string); - } - - protected void setUp() throws Exception - { - super.setUp(); - } - - public void testCircularReferences() throws Exception - { - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/samples/xop/circular.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); - JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - - XSTypeDefinition xsType = schemaModel.getTypeDefinition("Customer", "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); - - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); - - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - - // it fails when getting a stack overflow ;) - } - } - - public void testXOPElementScan() throws Exception - { - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/samples/xop/schema.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); - JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - - // test custom binary declaration - XSTypeDefinition xsType = schemaModel.getTypeDefinition(">PingMsg", "http://jboss.org/test/ws/xop/doclit"); - - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); - - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find xop typedef in schema", resultType); - } - - scanner.reset(); - - // test the xmime binary declaration - xsType = schemaModel.getTypeDefinition(">PingMsgResponse", "http://jboss.org/test/ws/xop/doclit"); - assertNotNull("Root type def not found", xsType); - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find XOP typedef in schema", resultType); - } - - } - - public void testMSFTElementScan() throws Exception - { - - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/samples/xop/schema.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); - JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - - XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit"); - - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); - - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find xop typedef in schema", resultType); - } - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,129 +0,0 @@ -package org.jboss.test.ws.jaxrpc.xop; - -import java.io.File; - -import junit.framework.TestCase; - -import org.apache.xerces.xs.XSComplexTypeDefinition; -import org.apache.xerces.xs.XSModel; -import org.apache.xerces.xs.XSTypeDefinition; -import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner; -import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils; -import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; -import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.xb.binding.NamespaceRegistry; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @since Jun 9, 2006 - */ -public class XOPTypeDefTestCase extends TestCase -{ - public XOPTypeDefTestCase(String string) - { - super(string); - } - - protected void setUp() throws Exception - { - super.setUp(); - } - - public void testCircularReferences() throws Exception - { - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/xop/circular.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); - JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - - XSTypeDefinition xsType = schemaModel.getTypeDefinition("Customer", "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); - - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); - - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - - // it fails when getting a stack overflow ;) - } - } - - public void testXOPElementScan() throws Exception - { - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/xop/schema.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); - JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - - // test custom binary declaration - XSTypeDefinition xsType = schemaModel.getTypeDefinition(">PingMsg", "http://jboss.org/test/ws/xop/doclit"); - - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); - - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find xop typedef in schema", resultType); - } - - scanner.reset(); - - // test the xmime binary declaration - xsType = schemaModel.getTypeDefinition(">PingMsgResponse", "http://jboss.org/test/ws/xop/doclit"); - assertNotNull("Root type def not found", xsType); - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find XOP typedef in schema", resultType); - } - - } - - public void testMSFTElementScan() throws Exception - { - - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/xop/schema.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); - JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - - XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit"); - - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); - - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find xop typedef in schema", resultType); - } - } - - public void testXOPContext() - { - SOAPMessageContextJAXRPC messageContext = new SOAPMessageContextJAXRPC(); - MessageContextAssociation.pushMessageContext(messageContext); - assertFalse("MTOM should be disabled", XOPContext.isMTOMEnabled()); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,129 @@ +package org.jboss.test.ws.jaxrpc.xop; + +import java.io.File; + +import junit.framework.TestCase; + +import org.apache.xerces.xs.XSComplexTypeDefinition; +import org.apache.xerces.xs.XSModel; +import org.apache.xerces.xs.XSTypeDefinition; +import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner; +import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; +import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils; +import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; +import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.xb.binding.NamespaceRegistry; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @since Jun 9, 2006 + */ +public class XOPTypeDefTestCase extends TestCase +{ + public XOPTypeDefTestCase(String string) + { + super(string); + } + + protected void setUp() throws Exception + { + super.setUp(); + } + + public void testCircularReferences() throws Exception + { + SchemaUtils utils = SchemaUtils.getInstance(); + File f = new File("resources/jaxrpc/xop/circular.xsd"); + assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); + + XSModel xsModel = utils.parseSchema(f.toURL()); + assertNotNull(xsModel); + WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); + JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); + + XSTypeDefinition xsType = schemaModel.getTypeDefinition("Customer", "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); + + assertNotNull("Root type def not found", xsType); + XOPScanner scanner = new XOPScanner(); + + if (xsType instanceof XSComplexTypeDefinition) + { + XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; + XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); + + // it fails when getting a stack overflow ;) + } + } + + public void testXOPElementScan() throws Exception + { + SchemaUtils utils = SchemaUtils.getInstance(); + File f = new File("resources/jaxrpc/xop/schema.xsd"); + assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); + + XSModel xsModel = utils.parseSchema(f.toURL()); + assertNotNull(xsModel); + WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); + JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); + + // test custom binary declaration + XSTypeDefinition xsType = schemaModel.getTypeDefinition(">PingMsg", "http://jboss.org/test/ws/xop/doclit"); + + assertNotNull("Root type def not found", xsType); + XOPScanner scanner = new XOPScanner(); + + if (xsType instanceof XSComplexTypeDefinition) + { + XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; + XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); + assertNotNull("Unable to find xop typedef in schema", resultType); + } + + scanner.reset(); + + // test the xmime binary declaration + xsType = schemaModel.getTypeDefinition(">PingMsgResponse", "http://jboss.org/test/ws/xop/doclit"); + assertNotNull("Root type def not found", xsType); + if (xsType instanceof XSComplexTypeDefinition) + { + XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; + XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); + assertNotNull("Unable to find XOP typedef in schema", resultType); + } + + } + + public void testMSFTElementScan() throws Exception + { + + SchemaUtils utils = SchemaUtils.getInstance(); + File f = new File("resources/jaxrpc/xop/schema.xsd"); + assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); + + XSModel xsModel = utils.parseSchema(f.toURL()); + assertNotNull(xsModel); + WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); + JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); + + XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit"); + + assertNotNull("Root type def not found", xsType); + XOPScanner scanner = new XOPScanner(); + + if (xsType instanceof XSComplexTypeDefinition) + { + XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; + XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); + assertNotNull("Unable to find xop typedef in schema", resultType); + } + } + + public void testXOPContext() + { + SOAPMessageContextJAXRPC messageContext = new SOAPMessageContextJAXRPC(); + MessageContextAssociation.pushMessageContext(messageContext); + assertFalse("MTOM should be disabled", XOPContext.isMTOMEnabled()); + } +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,86 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxrpc.xop.doclit; - -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.HandlerInfo; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPMessage; - -import org.jboss.logging.Logger; -import org.jboss.ws.core.soap.NameImpl; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id$ - * @since Sep 25, 2006 - */ -public class InlineHandler extends GenericHandler -{ - HandlerInfo config; - - private static Logger log = Logger.getLogger(InlineHandler.class); - - public QName[] getHeaders() - { - return new QName[0]; - } - - public void init(HandlerInfo config) { - this.config = config; - } - - public boolean handleRequest(MessageContext messageContext) - { - dumpMessage(messageContext); - return true; - } - - public boolean handleResponse(MessageContext messageContext) - { - dumpMessage(messageContext); - return true; - } - - private void dumpMessage(MessageContext messageContext) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)messageContext).getMessage(); - SOAPBody soapBody = soapMessage.getSOAPBody(); - - SOAPElement bodyElement = (SOAPElement)soapBody.getChildElements().next(); - SOAPElement xopElement = (SOAPElement)bodyElement.getChildElements(new NameImpl("xopContent")).next(); - String base64Value = xopElement.getValue(); - log.debug("base64Value: " + base64Value); - messageContext.setProperty("xop.inline.value", base64Value); - } - catch (Exception e) - { - log.error("Failed to access inline XOP values", e); - } - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,86 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.doclit; + +import javax.xml.namespace.QName; +import javax.xml.rpc.handler.GenericHandler; +import javax.xml.rpc.handler.HandlerInfo; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPMessage; + +import org.jboss.logging.Logger; +import org.jboss.ws.core.soap.NameImpl; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Sep 25, 2006 + */ +public class InlineHandler extends GenericHandler +{ + HandlerInfo config; + + private static Logger log = Logger.getLogger(InlineHandler.class); + + public QName[] getHeaders() + { + return new QName[0]; + } + + public void init(HandlerInfo config) { + this.config = config; + } + + public boolean handleRequest(MessageContext messageContext) + { + dumpMessage(messageContext); + return true; + } + + public boolean handleResponse(MessageContext messageContext) + { + dumpMessage(messageContext); + return true; + } + + private void dumpMessage(MessageContext messageContext) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)messageContext).getMessage(); + SOAPBody soapBody = soapMessage.getSOAPBody(); + + SOAPElement bodyElement = (SOAPElement)soapBody.getChildElements().next(); + SOAPElement xopElement = (SOAPElement)bodyElement.getChildElements(new NameImpl("xopContent")).next(); + String base64Value = xopElement.getValue(); + log.debug("base64Value: " + base64Value); + messageContext.setProperty("xop.inline.value", base64Value); + } + catch (Exception e) + { + log.error("Failed to access inline XOP values", e); + } + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,195 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxrpc.xop.doclit; - -import java.awt.Image; -import java.io.File; - -import javax.activation.DataHandler; -import javax.xml.rpc.Stub; -import javax.xml.transform.Source; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.XOPTestSupport; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; -import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.utils.IOUtils; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id:XOPBase.java 1321 2006-10-27 11:47:18Z heiko.braun(a)jboss.com $ - * @since Sep 25, 2006 - */ -public abstract class XOPBase extends JBossWSTest { - - private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); - - protected abstract XOPPing getPort(); - - // --------------------------------------------------------------------------------- - // Test raw binary data - - public void testRequestResponseOptimized() throws Exception { - - DataHandler dh = new DataHandler("Another plain text attachment", "text/plain"); - byte[] bytesIn = IOUtils.convertToBytes(dh); - PingMsgResponse value = getPort().ping(new PingMsg("1|1", bytesIn)); - assertNotNull("Return value was null", value); - byte[] bytesOut = value.getXopContent(); - assertNotNull("Returned xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - } - - public void testResponseOptimized() throws Exception { - - byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); - - // disable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingMsgResponse value = getPort().ping(new PingMsg("0|1", bytesIn)); - assertNotNull("Return value was null",value); - byte[] bytesOut = value.getXopContent(); - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - } - - public void testRequestOptimized() throws Exception { - - byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); - - // reusing the stub means cleaning the previous state - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingMsgResponse value = getPort().ping(new PingMsg("1|0", bytesIn)); - assertNotNull("Return value was null",value); - byte[] bytesOut = value.getXopContent(); - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - } - - // --------------------------------------------------------------------------------- - // Test concrete java types - - public void testImageResponseOptimized() throws Exception { - - Image image = XOPTestSupport.createTestImage(imgFile); - - if(image!=null) - { - // disable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingImage pingImage = new PingImage("0|1", image); - PingImageResponse response = getPort().pingImage(pingImage); - assertNotNull("Return xopContent was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - } - - public void testImageRequestOptimized() throws Exception { - - Image image = XOPTestSupport.createTestImage(imgFile); - - if(image!=null) - { - // enable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingImage pingImage = new PingImage("1|0", image); - PingImageResponse response = getPort().pingImage(pingImage); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - } - - public void testSourceResponseOptimized() throws Exception { - - Source source = XOPTestSupport.createTestSource(); - - // disable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingSource pingSource = new PingSource(); - pingSource.setMessage("0|1"); - pingSource.setXopContent(source); - - PingSourceResponse response = getPort().pingSource(pingSource); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - - } - - public void testSourceRequestOptimized() throws Exception { - - Source source = XOPTestSupport.createTestSource(); - - // enable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingSource pingSource = new PingSource(); - pingSource.setMessage("1|0"); - pingSource.setXopContent(source); - - PingSourceResponse response = getPort().pingSource(pingSource); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - - public void testDHResponseOptimized() throws Exception { - - DataHandler dh = XOPTestSupport.createDataHandler(imgFile); - - // disable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingDataHandler reqest = new PingDataHandler(dh); - reqest.setMessage("0|1"); - - PingDataHandlerResponse response = getPort().pingDataHandler(reqest); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - - } - - public void testDHRequestOptimized() throws Exception { - - DataHandler dh = XOPTestSupport.createDataHandler(imgFile); - - // enable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingDataHandler reqest = new PingDataHandler(dh); - reqest.setMessage("1|0"); - - PingDataHandlerResponse response = getPort().pingDataHandler(reqest); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,195 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.doclit; + +import java.awt.Image; +import java.io.File; + +import javax.activation.DataHandler; +import javax.xml.rpc.Stub; +import javax.xml.transform.Source; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.XOPTestSupport; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; +import org.jboss.ws.core.StubExt; +import org.jboss.ws.core.utils.IOUtils; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id:XOPBase.java 1321 2006-10-27 11:47:18Z heiko.braun(a)jboss.com $ + * @since Sep 25, 2006 + */ +public abstract class XOPBase extends JBossWSTest { + + private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); + + protected abstract XOPPing getPort(); + + // --------------------------------------------------------------------------------- + // Test raw binary data + + public void testRequestResponseOptimized() throws Exception { + + DataHandler dh = new DataHandler("Another plain text attachment", "text/plain"); + byte[] bytesIn = IOUtils.convertToBytes(dh); + PingMsgResponse value = getPort().ping(new PingMsg("1|1", bytesIn)); + assertNotNull("Return value was null", value); + byte[] bytesOut = value.getXopContent(); + assertNotNull("Returned xopContent was null", bytesOut); + assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } + + public void testResponseOptimized() throws Exception { + + byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingMsgResponse value = getPort().ping(new PingMsg("0|1", bytesIn)); + assertNotNull("Return value was null",value); + byte[] bytesOut = value.getXopContent(); + assertNotNull("Return xopContent was null", bytesOut); + assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } + + public void testRequestOptimized() throws Exception { + + byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); + + // reusing the stub means cleaning the previous state + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingMsgResponse value = getPort().ping(new PingMsg("1|0", bytesIn)); + assertNotNull("Return value was null",value); + byte[] bytesOut = value.getXopContent(); + assertNotNull("Return xopContent was null", bytesOut); + assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } + + // --------------------------------------------------------------------------------- + // Test concrete java types + + public void testImageResponseOptimized() throws Exception { + + Image image = XOPTestSupport.createTestImage(imgFile); + + if(image!=null) + { + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingImage pingImage = new PingImage("0|1", image); + PingImageResponse response = getPort().pingImage(pingImage); + assertNotNull("Return xopContent was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + } + + public void testImageRequestOptimized() throws Exception { + + Image image = XOPTestSupport.createTestImage(imgFile); + + if(image!=null) + { + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingImage pingImage = new PingImage("1|0", image); + PingImageResponse response = getPort().pingImage(pingImage); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + } + + public void testSourceResponseOptimized() throws Exception { + + Source source = XOPTestSupport.createTestSource(); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingSource pingSource = new PingSource(); + pingSource.setMessage("0|1"); + pingSource.setXopContent(source); + + PingSourceResponse response = getPort().pingSource(pingSource); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testSourceRequestOptimized() throws Exception { + + Source source = XOPTestSupport.createTestSource(); + + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingSource pingSource = new PingSource(); + pingSource.setMessage("1|0"); + pingSource.setXopContent(source); + + PingSourceResponse response = getPort().pingSource(pingSource); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + + public void testDHResponseOptimized() throws Exception { + + DataHandler dh = XOPTestSupport.createDataHandler(imgFile); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingDataHandler reqest = new PingDataHandler(dh); + reqest.setMessage("0|1"); + + PingDataHandlerResponse response = getPort().pingDataHandler(reqest); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testDHRequestOptimized() throws Exception { + + DataHandler dh = XOPTestSupport.createDataHandler(imgFile); + + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingDataHandler reqest = new PingDataHandler(dh); + reqest.setMessage("1|0"); + + PingDataHandlerResponse response = getPort().pingDataHandler(reqest); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,67 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxrpc.xop.doclit; - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.StubExt; - -/** - * Test MTOM functionality with jaxrpc-handlers in place.<br> - * This basically determines wether XB needs to handle base64 values directly - * or uses callbacks to XOPMarshaller/Unmarshaller. - * - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id$ - * @since Sep 22, 2006 - */ -public class XOPHandlerTestCase extends XOPBase { - - private static XOPPing port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-doclit_handler.war, jaxrpc-samples-xop-doclit_handler-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCase"); - port = (XOPPing)service.getPort(XOPPing.class); - ((StubExt)port).setConfigName("Standard MTOM client"); - } - - //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit_handler"); - } - - protected XOPPing getPort() { - return port; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,67 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.doclit; + +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; + +/** + * Test MTOM functionality with jaxrpc-handlers in place.<br> + * This basically determines wether XB needs to handle base64 values directly + * or uses callbacks to XOPMarshaller/Unmarshaller. + * + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Sep 22, 2006 + */ +public class XOPHandlerTestCase extends XOPBase { + + private static XOPPing port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-doclit_handler.war, jaxrpc-samples-xop-doclit_handler-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + if (port == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCase"); + port = (XOPPing)service.getPort(XOPPing.class); + ((StubExt)port).setConfigName("Standard MTOM client"); + } + + //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit_handler"); + } + + protected XOPPing getPort() { + return port; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,24 +0,0 @@ -/* - * JBoss, the OpenSource EJB server - * Distributable under LGPL license. See terms of license at gnu.org. - */ -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jaxrpc.xop.doclit; - -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; - -public interface XOPPing extends java.rmi.Remote -{ - public PingMsgResponse ping(PingMsg pingMsg) throws java.rmi.RemoteException; - public PingImageResponse pingImage(PingImage pingImage) throws java.rmi.RemoteException; - public PingSourceResponse pingSource(PingSource pingSource) throws java.rmi.RemoteException; - public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,24 @@ +/* + * JBoss, the OpenSource EJB server + * Distributable under LGPL license. See terms of license at gnu.org. + */ +//Auto Generated by jbossws - Please do not edit!!! + +package org.jboss.test.ws.jaxrpc.xop.doclit; + +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; + +public interface XOPPing extends java.rmi.Remote +{ + public PingMsgResponse ping(PingMsg pingMsg) throws java.rmi.RemoteException; + public PingImageResponse pingImage(PingImage pingImage) throws java.rmi.RemoteException; + public PingSourceResponse pingSource(PingSource pingSource) throws java.rmi.RemoteException; + public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws java.rmi.RemoteException; +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,43 +0,0 @@ -package org.jboss.test.ws.jaxrpc.xop.doclit; - -import java.rmi.RemoteException; - -import org.jboss.test.ws.jaxrpc.xop.shared.MTOMServiceBase; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; - -/** - * MTOM test service impl. - * The 'message' param value determines wether or not the response should be XOP encoded. - * - * @author Heiko Braun, <heiko(a)openj.net> - * @since 11-Apr-2006 - */ -public class XOPPingImpl extends MTOMServiceBase implements XOPPing { - - public PingMsgResponse ping(PingMsg pingMsg) throws RemoteException { - toggleXOP(pingMsg.getMessage()); - return new PingMsgResponse(pingMsg.getXopContent()); - } - - public PingImageResponse pingImage(PingImage pingImage) throws RemoteException { - toggleXOP(pingImage.getMessage()); - return new PingImageResponse(pingImage.getXopContent()); - } - - public PingSourceResponse pingSource(PingSource pingSource) throws RemoteException { - toggleXOP(pingSource.getMessage()); - return new PingSourceResponse(pingSource.getXopContent()); - } - - public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws RemoteException { - toggleXOP(pingDataHandler.getMessage()); - return new PingDataHandlerResponse(pingDataHandler.getXopContent()); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,43 @@ +package org.jboss.test.ws.jaxrpc.xop.doclit; + +import java.rmi.RemoteException; + +import org.jboss.test.ws.jaxrpc.xop.shared.MTOMServiceBase; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; + +/** + * MTOM test service impl. + * The 'message' param value determines wether or not the response should be XOP encoded. + * + * @author Heiko Braun, <heiko(a)openj.net> + * @since 11-Apr-2006 + */ +public class XOPPingImpl extends MTOMServiceBase implements XOPPing { + + public PingMsgResponse ping(PingMsg pingMsg) throws RemoteException { + toggleXOP(pingMsg.getMessage()); + return new PingMsgResponse(pingMsg.getXopContent()); + } + + public PingImageResponse pingImage(PingImage pingImage) throws RemoteException { + toggleXOP(pingImage.getMessage()); + return new PingImageResponse(pingImage.getXopContent()); + } + + public PingSourceResponse pingSource(PingSource pingSource) throws RemoteException { + toggleXOP(pingSource.getMessage()); + return new PingSourceResponse(pingSource.getXopContent()); + } + + public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws RemoteException { + toggleXOP(pingDataHandler.getMessage()); + return new PingDataHandlerResponse(pingDataHandler.getXopContent()); + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,19 +0,0 @@ -/* -* JBoss, the OpenSource EJB server -* Distributable under LGPL license. See terms of license at gnu.org. -*/ - -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jaxrpc.xop.doclit; - - -import javax.xml.rpc.ServiceException; - - -public interface XOPPingService extends javax.xml.rpc.Service -{ - - public org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing getTestServicePort() throws ServiceException; - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,19 @@ +/* +* JBoss, the OpenSource EJB server +* Distributable under LGPL license. See terms of license at gnu.org. +*/ + +//Auto Generated by jbossws - Please do not edit!!! + +package org.jboss.test.ws.jaxrpc.xop.doclit; + + +import javax.xml.rpc.ServiceException; + + +public interface XOPPingService extends javax.xml.rpc.Service +{ + + public org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing getTestServicePort() throws ServiceException; + +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.xop.doclit; - -// $Id$ - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.StubExt; - -/** - * Test MTOM functionaly without any jaxrpc handlers in place. - * - * @author Heiko.Braun(a)jboss.org - * @since Sep 22, 2006 - */ -public class XOPTestCase extends XOPBase { - - private static XOPPing port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-doclit.war, jaxrpc-samples-xop-doclit-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCase"); - port = (XOPPing)service.getPort(XOPPing.class); - ((StubExt)port).setConfigName("Standard MTOM client"); - } - - //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit"); - } - - protected XOPPing getPort() - { - return port; - } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.xop.doclit; + +// $Id$ + +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; + +/** + * Test MTOM functionaly without any jaxrpc handlers in place. + * + * @author Heiko.Braun(a)jboss.org + * @since Sep 22, 2006 + */ +public class XOPTestCase extends XOPBase { + + private static XOPPing port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-doclit.war, jaxrpc-samples-xop-doclit-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + if (port == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCase"); + port = (XOPPing)service.getPort(XOPPing.class); + ((StubExt)port).setConfigName("Standard MTOM client"); + } + + //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit"); + } + + protected XOPPing getPort() + { + return port; + } + +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,65 +0,0 @@ -package org.jboss.test.ws.jaxrpc.xop.rpclit; - -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.HandlerInfo; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPMessage; - -import org.jboss.logging.Logger; -import org.jboss.ws.core.soap.NameImpl; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @since Jun 16, 2006 - */ -public class InlineHandler extends GenericHandler -{ - HandlerInfo config; - - private static Logger log = Logger.getLogger(InlineHandler.class); - - public QName[] getHeaders() - { - return new QName[0]; - } - - public void init(HandlerInfo config) { - this.config = config; - } - - public boolean handleRequest(MessageContext messageContext) - { - dumpMessage(messageContext, "parameters"); - return true; - } - - public boolean handleResponse(MessageContext messageContext) - { - dumpMessage(messageContext, "result"); - return true; - } - - private void dumpMessage(MessageContext messageContext, String parentName) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)messageContext).getMessage(); - SOAPBody soapBody = soapMessage.getSOAPBody(); - - SOAPElement bodyElement = (SOAPElement)soapBody.getChildElements().next(); - SOAPElement wrapper = (SOAPElement)bodyElement.getChildElements(new NameImpl(parentName)).next(); - SOAPElement xopElement = (SOAPElement)wrapper.getChildElements(new NameImpl("xopContent")).next(); - String base64Value = xopElement.getValue(); - log.debug("base64Value: " + base64Value); - messageContext.setProperty("xop.inline.value", base64Value); - } - catch (Exception e) - { - // ingore, happens when simple types are send - } - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,65 @@ +package org.jboss.test.ws.jaxrpc.xop.rpclit; + +import javax.xml.namespace.QName; +import javax.xml.rpc.handler.GenericHandler; +import javax.xml.rpc.handler.HandlerInfo; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPMessage; + +import org.jboss.logging.Logger; +import org.jboss.ws.core.soap.NameImpl; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @since Jun 16, 2006 + */ +public class InlineHandler extends GenericHandler +{ + HandlerInfo config; + + private static Logger log = Logger.getLogger(InlineHandler.class); + + public QName[] getHeaders() + { + return new QName[0]; + } + + public void init(HandlerInfo config) { + this.config = config; + } + + public boolean handleRequest(MessageContext messageContext) + { + dumpMessage(messageContext, "parameters"); + return true; + } + + public boolean handleResponse(MessageContext messageContext) + { + dumpMessage(messageContext, "result"); + return true; + } + + private void dumpMessage(MessageContext messageContext, String parentName) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)messageContext).getMessage(); + SOAPBody soapBody = soapMessage.getSOAPBody(); + + SOAPElement bodyElement = (SOAPElement)soapBody.getChildElements().next(); + SOAPElement wrapper = (SOAPElement)bodyElement.getChildElements(new NameImpl(parentName)).next(); + SOAPElement xopElement = (SOAPElement)wrapper.getChildElements(new NameImpl("xopContent")).next(); + String base64Value = xopElement.getValue(); + log.debug("base64Value: " + base64Value); + messageContext.setProperty("xop.inline.value", base64Value); + } + catch (Exception e) + { + // ingore, happens when simple types are send + } + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,219 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.xop.rpclit; - -import java.awt.Image; -import java.io.File; -import java.util.StringTokenizer; - -import javax.activation.DataHandler; -import javax.xml.rpc.Stub; -import javax.xml.transform.Source; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.XOPTestSupport; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; -import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.utils.IOUtils; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id:XOPBase.java 1321 2006-10-27 11:47:18Z heiko.braun(a)jboss.com $ - * @since Sep 25, 2006 - */ -public abstract class XOPBase extends JBossWSTest -{ - private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); - - protected abstract XOPPing getPort(); - - public void testRequestResponseOptimized() throws Exception - { - - DataHandler dh = new DataHandler("Another plain text attachment", "text/plain"); - byte[] bytesIn = IOUtils.convertToBytes(dh); - requestComplex(new PingMsg("1|1", bytesIn)); - - } - - public void testResponseOptimized() throws Exception - { - - byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); - requestComplex(new PingMsg("0|1", bytesIn)); - - } - - public void testRequestOptimized() throws Exception - { - - byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); - requestComplex(new PingMsg("1|0", bytesIn)); - - } - - private void requestComplex(PingMsg payload) throws Exception - { - StringTokenizer tok = new StringTokenizer(payload.getMessage(), "|"); - boolean mtomEnabled = tok.nextToken().equals("1"); - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.valueOf(mtomEnabled)); - - PingMsgResponse value = getPort().ping(payload); - assertNotNull("Return value was null", value); - byte[] bytesOut = value.getXopContent(); - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", payload.getXopContent().length, bytesOut.length); - } - - public void testSimpleTypesOptimized() throws Exception - { - DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); - byte[] bytesIn = IOUtils.convertToBytes(dh); - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - byte[] bytesOut = getPort().pingSimple("s1|s1", bytesIn); - - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - } - - public void testSimpleTypesResponseOptimized() throws Exception - { - DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); - byte[] bytesIn = IOUtils.convertToBytes(dh); - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - byte[] bytesOut = getPort().pingSimple("s0|s1", bytesIn); - - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - } - - public void testImageResponseOptimized() throws Exception - { - - Image image = XOPTestSupport.createTestImage(imgFile); - - if (image != null) - { - // disable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingImage pingImage = new PingImage("0|1", image); - PingImageResponse response = getPort().pingImage(pingImage); - assertNotNull("Return xopContent was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - } - - public void testImageRequestOptimized() throws Exception - { - - Image image = XOPTestSupport.createTestImage(imgFile); - - if (image != null) - { - // enable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingImage pingImage = new PingImage("1|0", image); - PingImageResponse response = getPort().pingImage(pingImage); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - } - - public void testSourceResponseOptimized() throws Exception - { - - Source source = XOPTestSupport.createTestSource(); - - // disable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingSource pingSource = new PingSource(); - pingSource.setMessage("0|1"); - pingSource.setXopContent(source); - - PingSourceResponse response = getPort().pingSource(pingSource); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - - } - - public void testSourceRequestOptimized() throws Exception - { - - Source source = XOPTestSupport.createTestSource(); - - // enable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingSource pingSource = new PingSource(); - pingSource.setMessage("1|0"); - pingSource.setXopContent(source); - - PingSourceResponse response = getPort().pingSource(pingSource); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - - public void testDHResponseOptimized() throws Exception - { - - DataHandler dh = XOPTestSupport.createDataHandler(imgFile); - - // disable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingDataHandler reqest = new PingDataHandler(dh); - reqest.setMessage("0|1"); - - PingDataHandlerResponse response = getPort().pingDataHandler(reqest); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - - } - - public void testDHRequestOptimized() throws Exception - { - - DataHandler dh = XOPTestSupport.createDataHandler(imgFile); - - // enable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingDataHandler reqest = new PingDataHandler(dh); - reqest.setMessage("1|0"); - - PingDataHandlerResponse response = getPort().pingDataHandler(reqest); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,219 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.xop.rpclit; + +import java.awt.Image; +import java.io.File; +import java.util.StringTokenizer; + +import javax.activation.DataHandler; +import javax.xml.rpc.Stub; +import javax.xml.transform.Source; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.XOPTestSupport; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; +import org.jboss.ws.core.StubExt; +import org.jboss.ws.core.utils.IOUtils; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id:XOPBase.java 1321 2006-10-27 11:47:18Z heiko.braun(a)jboss.com $ + * @since Sep 25, 2006 + */ +public abstract class XOPBase extends JBossWSTest +{ + private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); + + protected abstract XOPPing getPort(); + + public void testRequestResponseOptimized() throws Exception + { + + DataHandler dh = new DataHandler("Another plain text attachment", "text/plain"); + byte[] bytesIn = IOUtils.convertToBytes(dh); + requestComplex(new PingMsg("1|1", bytesIn)); + + } + + public void testResponseOptimized() throws Exception + { + + byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); + requestComplex(new PingMsg("0|1", bytesIn)); + + } + + public void testRequestOptimized() throws Exception + { + + byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); + requestComplex(new PingMsg("1|0", bytesIn)); + + } + + private void requestComplex(PingMsg payload) throws Exception + { + StringTokenizer tok = new StringTokenizer(payload.getMessage(), "|"); + boolean mtomEnabled = tok.nextToken().equals("1"); + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.valueOf(mtomEnabled)); + + PingMsgResponse value = getPort().ping(payload); + assertNotNull("Return value was null", value); + byte[] bytesOut = value.getXopContent(); + assertNotNull("Return xopContent was null", bytesOut); + assertEquals("Content length doesn't match", payload.getXopContent().length, bytesOut.length); + } + + public void testSimpleTypesOptimized() throws Exception + { + DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); + byte[] bytesIn = IOUtils.convertToBytes(dh); + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + byte[] bytesOut = getPort().pingSimple("s1|s1", bytesIn); + + assertNotNull("Return xopContent was null", bytesOut); + assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } + + public void testSimpleTypesResponseOptimized() throws Exception + { + DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); + byte[] bytesIn = IOUtils.convertToBytes(dh); + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + byte[] bytesOut = getPort().pingSimple("s0|s1", bytesIn); + + assertNotNull("Return xopContent was null", bytesOut); + assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } + + public void testImageResponseOptimized() throws Exception + { + + Image image = XOPTestSupport.createTestImage(imgFile); + + if (image != null) + { + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingImage pingImage = new PingImage("0|1", image); + PingImageResponse response = getPort().pingImage(pingImage); + assertNotNull("Return xopContent was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + } + + public void testImageRequestOptimized() throws Exception + { + + Image image = XOPTestSupport.createTestImage(imgFile); + + if (image != null) + { + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingImage pingImage = new PingImage("1|0", image); + PingImageResponse response = getPort().pingImage(pingImage); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + } + + public void testSourceResponseOptimized() throws Exception + { + + Source source = XOPTestSupport.createTestSource(); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingSource pingSource = new PingSource(); + pingSource.setMessage("0|1"); + pingSource.setXopContent(source); + + PingSourceResponse response = getPort().pingSource(pingSource); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testSourceRequestOptimized() throws Exception + { + + Source source = XOPTestSupport.createTestSource(); + + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingSource pingSource = new PingSource(); + pingSource.setMessage("1|0"); + pingSource.setXopContent(source); + + PingSourceResponse response = getPort().pingSource(pingSource); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + + public void testDHResponseOptimized() throws Exception + { + + DataHandler dh = XOPTestSupport.createDataHandler(imgFile); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingDataHandler reqest = new PingDataHandler(dh); + reqest.setMessage("0|1"); + + PingDataHandlerResponse response = getPort().pingDataHandler(reqest); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testDHRequestOptimized() throws Exception + { + + DataHandler dh = XOPTestSupport.createDataHandler(imgFile); + + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingDataHandler reqest = new PingDataHandler(dh); + reqest.setMessage("1|0"); + + PingDataHandlerResponse response = getPort().pingDataHandler(reqest); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,63 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxrpc.xop.rpclit; - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.StubExt; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id$ - * @since Sep 22, 2006 - */ -public class XOPHandlerTestCase extends XOPBase { - - private static XOPPing port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-rpclit_handler.war, jaxrpc-samples-xop-rpclit_handler-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCaseRPC"); - port = (XOPPing)service.getPort(XOPPing.class); - ((StubExt)port).setConfigName("Standard MTOM client"); - } - - //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit_handler"); - } - - protected XOPPing getPort() { - return port; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,63 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.rpclit; + +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Sep 22, 2006 + */ +public class XOPHandlerTestCase extends XOPBase { + + private static XOPPing port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-rpclit_handler.war, jaxrpc-samples-xop-rpclit_handler-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + if (port == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCaseRPC"); + port = (XOPPing)service.getPort(XOPPing.class); + ((StubExt)port).setConfigName("Standard MTOM client"); + } + + //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit_handler"); + } + + protected XOPPing getPort() { + return port; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,23 +0,0 @@ -/* - * JBoss, the OpenSource EJB server - * Distributable under LGPL license. See terms of license at gnu.org. - */ -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jaxrpc.xop.rpclit; - -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; - -public interface XOPPing extends java.rmi.Remote -{ - public org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.xop.shared.PingMsg pingMsg) throws java.rmi.RemoteException; - public byte[] pingSimple(String parameters, byte[] xopContent) throws java.rmi.RemoteException; - public PingImageResponse pingImage(PingImage pingImage) throws java.rmi.RemoteException; - public PingSourceResponse pingSource(PingSource pingSource) throws java.rmi.RemoteException; - public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,23 @@ +/* + * JBoss, the OpenSource EJB server + * Distributable under LGPL license. See terms of license at gnu.org. + */ +//Auto Generated by jbossws - Please do not edit!!! + +package org.jboss.test.ws.jaxrpc.xop.rpclit; + +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; + +public interface XOPPing extends java.rmi.Remote +{ + public org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.xop.shared.PingMsg pingMsg) throws java.rmi.RemoteException; + public byte[] pingSimple(String parameters, byte[] xopContent) throws java.rmi.RemoteException; + public PingImageResponse pingImage(PingImage pingImage) throws java.rmi.RemoteException; + public PingSourceResponse pingSource(PingSource pingSource) throws java.rmi.RemoteException; + public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws java.rmi.RemoteException; +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,49 +0,0 @@ -package org.jboss.test.ws.jaxrpc.xop.rpclit; - -import java.rmi.RemoteException; - -import org.jboss.test.ws.jaxrpc.xop.shared.MTOMServiceBase; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; - -/** - * @author Heiko Braun, <heiko(a)openj.net> - * @since 11-Apr-2006 - */ -public class XOPPingImpl extends MTOMServiceBase implements XOPPing { - - public PingMsgResponse ping(PingMsg pingMsg) throws RemoteException { - - String message = pingMsg.getMessage(); - toggleXOP(message); - - return new PingMsgResponse(pingMsg.getXopContent()); - } - - public byte[] pingSimple(String parameters, byte[] xopContent) throws RemoteException { - toggleXOP(parameters); - return xopContent; - } - - public PingImageResponse pingImage(PingImage pingImage) throws RemoteException { - toggleXOP(pingImage.getMessage()); - return new PingImageResponse(pingImage.getXopContent()); - } - - public PingSourceResponse pingSource(PingSource pingSource) throws RemoteException { - toggleXOP(pingSource.getMessage()); - return new PingSourceResponse(pingSource.getXopContent()); - } - - public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws RemoteException { - toggleXOP(pingDataHandler.getMessage()); - return new PingDataHandlerResponse(pingDataHandler.getXopContent()); - } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,49 @@ +package org.jboss.test.ws.jaxrpc.xop.rpclit; + +import java.rmi.RemoteException; + +import org.jboss.test.ws.jaxrpc.xop.shared.MTOMServiceBase; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; + +/** + * @author Heiko Braun, <heiko(a)openj.net> + * @since 11-Apr-2006 + */ +public class XOPPingImpl extends MTOMServiceBase implements XOPPing { + + public PingMsgResponse ping(PingMsg pingMsg) throws RemoteException { + + String message = pingMsg.getMessage(); + toggleXOP(message); + + return new PingMsgResponse(pingMsg.getXopContent()); + } + + public byte[] pingSimple(String parameters, byte[] xopContent) throws RemoteException { + toggleXOP(parameters); + return xopContent; + } + + public PingImageResponse pingImage(PingImage pingImage) throws RemoteException { + toggleXOP(pingImage.getMessage()); + return new PingImageResponse(pingImage.getXopContent()); + } + + public PingSourceResponse pingSource(PingSource pingSource) throws RemoteException { + toggleXOP(pingSource.getMessage()); + return new PingSourceResponse(pingSource.getXopContent()); + } + + public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws RemoteException { + toggleXOP(pingDataHandler.getMessage()); + return new PingDataHandlerResponse(pingDataHandler.getXopContent()); + } + +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,17 +0,0 @@ -/* -* JBoss, the OpenSource EJB server -* Distributable under LGPL license. See terms of license at gnu.org. -*/ - -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jaxrpc.xop.rpclit; - - -import javax.xml.rpc.ServiceException; - - -public interface XOPPingService extends javax.xml.rpc.Service -{ - public org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing getTestServicePort() throws ServiceException; -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,17 @@ +/* +* JBoss, the OpenSource EJB server +* Distributable under LGPL license. See terms of license at gnu.org. +*/ + +//Auto Generated by jbossws - Please do not edit!!! + +package org.jboss.test.ws.jaxrpc.xop.rpclit; + + +import javax.xml.rpc.ServiceException; + + +public interface XOPPingService extends javax.xml.rpc.Service +{ + public org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing getTestServicePort() throws ServiceException; +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,66 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.xop.rpclit; - -// $Id$ - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.StubExt; - -/** - * - * @author Heiko.Braun(a)jboss.org - * @since 11-Nov-2005 - */ -public class XOPTestCase extends XOPBase { - - private static XOPPing port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-rpclit.war, jaxrpc-samples-xop-rpclit-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCaseRPC"); - port = (XOPPing)service.getPort(XOPPing.class); - ((StubExt)port).setConfigName("Standard MTOM client"); - } - - //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit"); - } - - protected XOPPing getPort() { - return port; - } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.xop.rpclit; + +// $Id$ + +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; + +/** + * + * @author Heiko.Braun(a)jboss.org + * @since 11-Nov-2005 + */ +public class XOPTestCase extends XOPBase { + + private static XOPPing port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-rpclit.war, jaxrpc-samples-xop-rpclit-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + if (port == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCaseRPC"); + port = (XOPPing)service.getPort(XOPPing.class); + ((StubExt)port).setConfigName("Standard MTOM client"); + } + + //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit"); + } + + protected XOPPing getPort() { + return port; + } + +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,54 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxrpc.xop.shared; - -import java.util.StringTokenizer; - -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.xop.XOPContext; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id$ - * @since Sep 25, 2006 - */ -public class MTOMServiceBase { - protected void toggleXOP(String message) { - StringTokenizer tok = new StringTokenizer(message, "|"); - String requestOptimized = tok.nextToken(); - String responseOptimized = tok.nextToken(); - System.out.println(requestOptimized+"|"+responseOptimized); - - if(requestOptimized.equals("1") && !XOPContext.isXOPEncodedRequest()) - { - throw new RuntimeException("Illegal state: No XOP encoded request found"); - } - - if(responseOptimized.equals("0")) - { - CommonMessageContext ctx = MessageContextAssociation.peekMessageContext(); - ctx.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - } - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,54 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.shared; + +import java.util.StringTokenizer; + +import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.StubExt; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.extensions.xop.XOPContext; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Sep 25, 2006 + */ +public class MTOMServiceBase { + protected void toggleXOP(String message) { + StringTokenizer tok = new StringTokenizer(message, "|"); + String requestOptimized = tok.nextToken(); + String responseOptimized = tok.nextToken(); + System.out.println(requestOptimized+"|"+responseOptimized); + + if(requestOptimized.equals("1") && !XOPContext.isXOPEncodedRequest()) + { + throw new RuntimeException("Illegal state: No XOP encoded request found"); + } + + if(responseOptimized.equals("0")) + { + CommonMessageContext ctx = MessageContextAssociation.peekMessageContext(); + ctx.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + } + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,57 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxrpc.xop.shared; - -import javax.activation.DataHandler; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id: PingDataHandler.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ - * @since Oct 23, 2006 - */ -public class PingDataHandler { - String message; - DataHandler xopContent; - - public PingDataHandler() { - } - - public PingDataHandler(DataHandler dataHandler) { - this.xopContent = dataHandler; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public DataHandler getXopContent() { - return xopContent; - } - - public void setXopContent(DataHandler xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,57 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.shared; + +import javax.activation.DataHandler; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id: PingDataHandler.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ + * @since Oct 23, 2006 + */ +public class PingDataHandler { + String message; + DataHandler xopContent; + + public PingDataHandler() { + } + + public PingDataHandler(DataHandler dataHandler) { + this.xopContent = dataHandler; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public DataHandler getXopContent() { + return xopContent; + } + + public void setXopContent(DataHandler xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,48 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxrpc.xop.shared; - -import javax.activation.DataHandler; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id: PingDataHandlerResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ - * @since Oct 23, 2006 - */ -public class PingDataHandlerResponse { - DataHandler xopContent; - - public PingDataHandlerResponse() { - } - - public PingDataHandlerResponse(DataHandler dataHandler) { - this.xopContent = dataHandler; - } - - public DataHandler getXopContent() { - return xopContent; - } - - public void setXopContent(DataHandler xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,48 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.shared; + +import javax.activation.DataHandler; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id: PingDataHandlerResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ + * @since Oct 23, 2006 + */ +public class PingDataHandlerResponse { + DataHandler xopContent; + + public PingDataHandlerResponse() { + } + + public PingDataHandlerResponse(DataHandler dataHandler) { + this.xopContent = dataHandler; + } + + public DataHandler getXopContent() { + return xopContent; + } + + public void setXopContent(DataHandler xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,59 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxrpc.xop.shared; - -import java.awt.Image; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id: PingImage.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ - * @since Oct 17, 2006 - */ -public class PingImage { - - String message; - Image xopContent; - - public PingImage() { - } - - public PingImage(String message, Image xopContent) { - this.message = message; - this.xopContent = xopContent; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public Image getXopContent() { - return xopContent; - } - - public void setXopContent(Image xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,59 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.shared; + +import java.awt.Image; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id: PingImage.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ + * @since Oct 17, 2006 + */ +public class PingImage { + + String message; + Image xopContent; + + public PingImage() { + } + + public PingImage(String message, Image xopContent) { + this.message = message; + this.xopContent = xopContent; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Image getXopContent() { + return xopContent; + } + + public void setXopContent(Image xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,49 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxrpc.xop.shared; - -import java.awt.Image; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id: PingImageResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ - * @since Oct 17, 2006 - */ -public class PingImageResponse { - - Image xopContent; - - public PingImageResponse() { - } - - public PingImageResponse(Image xopContent) { - this.xopContent = xopContent; - } - - public Image getXopContent() { - return xopContent; - } - - public void setXopContent(Image xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,49 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.shared; + +import java.awt.Image; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id: PingImageResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ + * @since Oct 17, 2006 + */ +public class PingImageResponse { + + Image xopContent; + + public PingImageResponse() { + } + + public PingImageResponse(Image xopContent) { + this.xopContent = xopContent; + } + + public Image getXopContent() { + return xopContent; + } + + public void setXopContent(Image xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,32 +0,0 @@ -/* - * JBoss, the OpenSource EJB server - * Distributable under LGPL license. See terms of license at gnu.org. - */ -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jaxrpc.xop.shared; - -public class PingMsg -{ - protected String message; - protected byte[] xopContent; - - public PingMsg(){} - - public PingMsg(String message, byte[] dataHandler){ - this.message=message; - this.xopContent = dataHandler; - } - - public java.lang.String getMessage() { return message ;} - - public void setMessage(java.lang.String message){ this.message=message; } - - public byte[] getXopContent() { - return xopContent; - } - - public void setXopContent(byte[] xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,32 @@ +/* + * JBoss, the OpenSource EJB server + * Distributable under LGPL license. See terms of license at gnu.org. + */ +//Auto Generated by jbossws - Please do not edit!!! + +package org.jboss.test.ws.jaxrpc.xop.shared; + +public class PingMsg +{ + protected String message; + protected byte[] xopContent; + + public PingMsg(){} + + public PingMsg(String message, byte[] dataHandler){ + this.message=message; + this.xopContent = dataHandler; + } + + public java.lang.String getMessage() { return message ;} + + public void setMessage(java.lang.String message){ this.message=message; } + + public byte[] getXopContent() { + return xopContent; + } + + public void setXopContent(byte[] xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,28 +0,0 @@ -/* - * JBoss, the OpenSource EJB server - * Distributable under LGPL license. See terms of license at gnu.org. - */ -//Auto Generated by jbossws - Please do not edit!!! - - -package org.jboss.test.ws.jaxrpc.xop.shared; - -public class PingMsgResponse -{ - protected byte[] xopContent; - - public PingMsgResponse(){ - } - - public PingMsgResponse(byte[] dataHandler) { - this.xopContent = dataHandler; - } - - public byte[] getXopContent() { - return xopContent; - } - - public void setXopContent(byte[] xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,28 @@ +/* + * JBoss, the OpenSource EJB server + * Distributable under LGPL license. See terms of license at gnu.org. + */ +//Auto Generated by jbossws - Please do not edit!!! + + +package org.jboss.test.ws.jaxrpc.xop.shared; + +public class PingMsgResponse +{ + protected byte[] xopContent; + + public PingMsgResponse(){ + } + + public PingMsgResponse(byte[] dataHandler) { + this.xopContent = dataHandler; + } + + public byte[] getXopContent() { + return xopContent; + } + + public void setXopContent(byte[] xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,50 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxrpc.xop.shared; - -import javax.xml.transform.Source; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id: PingSource.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ - * @since Oct 19, 2006 - */ -public class PingSource { - String message; - Source xopContent; - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public Source getXopContent() { - return xopContent; - } - - public void setXopContent(Source xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,50 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.shared; + +import javax.xml.transform.Source; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id: PingSource.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ + * @since Oct 19, 2006 + */ +public class PingSource { + String message; + Source xopContent; + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Source getXopContent() { + return xopContent; + } + + public void setXopContent(Source xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,49 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxrpc.xop.shared; - -import javax.xml.transform.Source; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id: PingSourceResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ - * @since Oct 19, 2006 - */ -public class PingSourceResponse { - - Source xopContent; - - public PingSourceResponse() { - } - - public PingSourceResponse(Source source) { - this.xopContent = source; - } - - public Source getXopContent() { - return xopContent; - } - - public void setXopContent(Source xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,49 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.shared; + +import javax.xml.transform.Source; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id: PingSourceResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ + * @since Oct 19, 2006 + */ +public class PingSourceResponse { + + Source xopContent; + + public PingSourceResponse() { + } + + public PingSourceResponse(Source source) { + this.xopContent = source; + } + + public Source getXopContent() { + return xopContent; + } + + public void setXopContent(Source xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,151 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxws.samples.xop; - -import java.awt.Image; -import java.lang.reflect.Method; - -import javax.xml.bind.annotation.XmlMimeType; - -import junit.framework.TestCase; - -import org.jboss.ws.extensions.xop.jaxws.ReflectiveXOPScanner; - -/** - * Test the ReflectiveXOPScanner. - * - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id$ - * @since 04.12.2006 - */ -public class MimeDeclarationTestCase extends TestCase { - - static ReflectiveXOPScanner SCANNER = new ReflectiveXOPScanner(); - - - protected void setUp() throws Exception - { - SCANNER.reset(); - } - - public void testFieldAnnotation() throws Exception - { - String mimeType = SCANNER.scan(FieldAnnotation.class); - assertNotNull("Unable to find xop declaration", mimeType); - assertEquals("text/xml", mimeType); - } - - public void testMethodAnnotation() throws Exception - { - String mimeType = SCANNER.scan(MethodAnnotation.class); - assertNotNull("Unable to find xop declaration", mimeType); - } - - public void testAnnotationMissing() throws Exception - { - String mimeType = SCANNER.scan(NoAnnotation.class); - assertNull("There should be no mimeType available", mimeType); - } - - public void testAnnotatedParameter() throws Exception - { - - if(true) - { - System.out.println("FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations"); - return; - } - - Method m = AnnotatedSEI.class.getMethod("foo", new Class[] {byte[].class}); - assertNotNull(m); - - System.out.println(m.getParameterAnnotations().length); - - String mimeType = SCANNER.scan( m.getParameterTypes()[0]); - assertNotNull("Unable to find xop declaration", mimeType); - assertEquals("text/xml", mimeType); - } - - public void testSimpleRecursion() throws Exception - { - String mimeType = SCANNER.scan(SimpleRecursion.class); - assertNull(mimeType); - } - - public void testComplexRecursion() throws Exception - { - String mimeType = SCANNER.scan(ComplexRecursion.class); - assertNotNull("Unable to find xop declaration", mimeType); - assertEquals("text/plain", mimeType); - } - - class FieldAnnotation - { - @XmlMimeType("text/xml") - public byte[] data; - - - @XmlMimeType("text/plain") // check field level precedence - public byte[] getData() { - return data; - } - } - - class MethodAnnotation - { - private Image data; - - @XmlMimeType("image/jpeg") - public Image getData() { - return data; - } - } - - class NoAnnotation - { - private Image data; - - public Image getData() { - return data; - } - } - - interface AnnotatedSEI { - void foo(@XmlMimeType("text/xml")byte[] bar); - } - - class SimpleRecursion { - private SimpleRecursion data; - } - - class ComplexRecursion - { - String data; - Nested nested; - } - - class Nested - { - @XmlMimeType("text/plain") - String data; - } -} Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,14 +1,20 @@ package org.jboss.test.ws.jaxws.samples.xop.doclit; -import java.io.ByteArrayOutputStream; - -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.handler.MessageContext; - import org.jboss.logging.Logger; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.ws.core.soap.SOAPElementImpl; +import org.jboss.ws.core.soap.SOAPElementWriter; +import org.jboss.ws.core.soap.SOAPMessageImpl; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.ws.handler.MessageContext; + +/** + * A MTOM handler should see the conceptual payload, + * which means an inlined representation of the binary data. + */ class MTOMProtocolHandler extends GenericSOAPHandler { private Logger log = Logger.getLogger(MTOMProtocolHandler.class); @@ -24,13 +30,16 @@ private boolean dumpMessage(MessageContext context) { try { - SOAPMessage msg = ((CommonMessageContext)context).getSOAPMessage(); - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - msg.writeTo(bout); - log.info(bout.toString()); - } catch (Exception e) { - throw new RuntimeException(e); + CommonMessageContext msgContext = (CommonMessageContext)context; + SOAPMessageImpl soapMsg = (SOAPMessageImpl)msgContext.getSOAPMessage(); + SOAPEnvelope soapReqEnv = soapMsg.getSOAPPart().getEnvelope(); + String xml = SOAPElementWriter.writeElement((SOAPElementImpl)soapReqEnv, true); + log.info(xml.substring(0, 50)+"[...]"); } + catch (SOAPException e) + { + // + } return true; } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -61,6 +61,8 @@ // enable MTOM binding = (SOAPBinding)((BindingProvider)port).getBinding(); + binding.setMTOMEnabled(true); + List<Handler> handlerChain = new ArrayList<Handler>(); handlerChain.addAll(binding.getHandlerChain()); handlerChain.add(new MTOMProtocolHandler()); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -57,6 +57,7 @@ // enable MTOM binding = (SOAPBinding)((BindingProvider)port).getBinding(); + binding.setMTOMEnabled(true); } Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,159 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxws.xop; - -import junit.framework.TestCase; -import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.ws.extensions.xop.jaxws.ReflectiveXOPScanner; - -import javax.xml.bind.annotation.XmlMimeType; -import java.awt.*; -import java.lang.reflect.Method; - -/** - * Test the ReflectiveXOPScanner. - * - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id$ - * @since 04.12.2006 - */ -public class MimeDeclarationTestCase extends TestCase { - - static ReflectiveXOPScanner SCANNER = new ReflectiveXOPScanner(); - - - protected void setUp() throws Exception - { - SCANNER.reset(); - } - - public void testFieldAnnotation() throws Exception - { - String mimeType = SCANNER.scan(FieldAnnotation.class); - assertNotNull("Unable to find xop declaration", mimeType); - assertEquals("text/xml", mimeType); - } - - public void testMethodAnnotation() throws Exception - { - String mimeType = SCANNER.scan(MethodAnnotation.class); - assertNotNull("Unable to find xop declaration", mimeType); - } - - public void testAnnotationMissing() throws Exception - { - String mimeType = SCANNER.scan(NoAnnotation.class); - assertNull("There should be no mimeType available", mimeType); - } - - public void testAnnotatedParameter() throws Exception - { - - if(true) - { - System.out.println("FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations"); - return; - } - - Method m = AnnotatedSEI.class.getMethod("foo", new Class[] {byte[].class}); - assertNotNull(m); - - System.out.println(m.getParameterAnnotations().length); - - String mimeType = SCANNER.scan( m.getParameterTypes()[0]); - assertNotNull("Unable to find xop declaration", mimeType); - assertEquals("text/xml", mimeType); - } - - public void testSimpleRecursion() throws Exception - { - String mimeType = SCANNER.scan(SimpleRecursion.class); - assertNull(mimeType); - } - - public void testComplexRecursion() throws Exception - { - String mimeType = SCANNER.scan(ComplexRecursion.class); - assertNotNull("Unable to find xop declaration", mimeType); - assertEquals("text/plain", mimeType); - } - - public void testXOPContext() - { - SOAPMessageContextJAXWS msgContext = new SOAPMessageContextJAXWS(); - MessageContextAssociation.pushMessageContext(msgContext); - assertFalse("MTOM should be disabled", XOPContext.isMTOMEnabled()); - } - - class FieldAnnotation - { - @XmlMimeType("text/xml") - public byte[] data; - - - @XmlMimeType("text/plain") // check field level precedence - public byte[] getData() { - return data; - } - } - - class MethodAnnotation - { - private Image data; - - @XmlMimeType("image/jpeg") - public Image getData() { - return data; - } - } - - class NoAnnotation - { - private Image data; - - public Image getData() { - return data; - } - } - - interface AnnotatedSEI { - void foo(@XmlMimeType("text/xml")byte[] bar); - } - - class SimpleRecursion { - private SimpleRecursion data; - } - - class ComplexRecursion - { - String data; - Nested nested; - } - - class Nested - { - @XmlMimeType("text/plain") - String data; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,159 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.xop; + +import junit.framework.TestCase; +import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.ws.extensions.xop.jaxws.ReflectiveXOPScanner; + +import javax.xml.bind.annotation.XmlMimeType; +import java.awt.*; +import java.lang.reflect.Method; + +/** + * Test the ReflectiveXOPScanner. + * + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since 04.12.2006 + */ +public class MimeDeclarationTestCase extends TestCase { + + static ReflectiveXOPScanner SCANNER = new ReflectiveXOPScanner(); + + + protected void setUp() throws Exception + { + SCANNER.reset(); + } + + public void testFieldAnnotation() throws Exception + { + String mimeType = SCANNER.scan(FieldAnnotation.class); + assertNotNull("Unable to find xop declaration", mimeType); + assertEquals("text/xml", mimeType); + } + + public void testMethodAnnotation() throws Exception + { + String mimeType = SCANNER.scan(MethodAnnotation.class); + assertNotNull("Unable to find xop declaration", mimeType); + } + + public void testAnnotationMissing() throws Exception + { + String mimeType = SCANNER.scan(NoAnnotation.class); + assertNull("There should be no mimeType available", mimeType); + } + + public void testAnnotatedParameter() throws Exception + { + + if(true) + { + System.out.println("FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations"); + return; + } + + Method m = AnnotatedSEI.class.getMethod("foo", new Class[] {byte[].class}); + assertNotNull(m); + + System.out.println(m.getParameterAnnotations().length); + + String mimeType = SCANNER.scan( m.getParameterTypes()[0]); + assertNotNull("Unable to find xop declaration", mimeType); + assertEquals("text/xml", mimeType); + } + + public void testSimpleRecursion() throws Exception + { + String mimeType = SCANNER.scan(SimpleRecursion.class); + assertNull(mimeType); + } + + public void testComplexRecursion() throws Exception + { + String mimeType = SCANNER.scan(ComplexRecursion.class); + assertNotNull("Unable to find xop declaration", mimeType); + assertEquals("text/plain", mimeType); + } + + public void testXOPContext() + { + SOAPMessageContextJAXWS msgContext = new SOAPMessageContextJAXWS(); + MessageContextAssociation.pushMessageContext(msgContext); + assertFalse("MTOM should be disabled", XOPContext.isMTOMEnabled()); + } + + class FieldAnnotation + { + @XmlMimeType("text/xml") + public byte[] data; + + + @XmlMimeType("text/plain") // check field level precedence + public byte[] getData() { + return data; + } + } + + class MethodAnnotation + { + private Image data; + + @XmlMimeType("image/jpeg") + public Image getData() { + return data; + } + } + + class NoAnnotation + { + private Image data; + + public Image getData() { + return data; + } + } + + interface AnnotatedSEI { + void foo(@XmlMimeType("text/xml")byte[] bar); + } + + class SimpleRecursion { + private SimpleRecursion data; + } + + class ComplexRecursion + { + String data; + Nested nested; + } + + class Nested + { + @XmlMimeType("text/plain") + String data; + } +} Modified: trunk/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -10,8 +10,13 @@ <endpoint-config> <config-name>Standard Endpoint</config-name> </endpoint-config> - + <endpoint-config> + <config-name>Standard MTOM Endpoint</config-name> + <feature>http://org.jboss.ws/mtom</feature> + </endpoint-config> + + <endpoint-config> <config-name>Standard WSSecurity Endpoint</config-name> <pre-handler-chain> <handler-chain-name>PreHandlerChain</handler-chain-name> Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/StandardTypes</service-ref-name> - <config-name>Standard MTOM disabled client</config-name> + <config-name>Standard Client</config-name> <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-marshall-rpclit?wsdl</wsdl-override> </service-ref> Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -7,7 +7,7 @@ <context-param> <param-name>jbossws-config-name</param-name> - <param-value>Standard MTOM disabled endpoint</param-value> + <param-value>Standard Endpoint</param-value> </context-param> <servlet> Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -16,11 +16,7 @@ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.marshall.StandardTypes</service-endpoint-interface> <service-impl-bean> <servlet-link>StandardTypes</servlet-link> - </service-impl-bean> - <handler> - <handler-name>MTOM disabled handler</handler-name> - <handler-class>org.jboss.ws.extensions.xop.DisableMTOMHandler</handler-class> - </handler> + </service-impl-bean> </port-component> </webservice-description> </webservices> Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -7,8 +7,9 @@ <context-param> <param-name>jbossws-config-name</param-name>> - <param-value>Standard MTOM disabled endpoint</param-value> + <param-value>Standard Endpoint</param-value> </context-param> + <servlet> <servlet-name>OutParamTestService</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.outparam.OutParamTestServiceBean</servlet-class> Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -7,8 +7,9 @@ <context-param> <param-name>jbossws-config-name</param-name>> - <param-value>Standard MTOM disabled endpoint</param-value> + <param-value>Standard Endpoint</param-value> </context-param> + <servlet> <servlet-name>TestService</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.samples.holder.HolderTestServiceBean</servlet-class> Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -5,6 +5,12 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> + <context-param> + <param-name>jbossws-config-name</param-name>> + <param-value>Standard MTOM Endpoint</param-value> + </context-param> + + <servlet> <servlet-name>EmployeeEndpoint</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.samples.mtom.EmployeeRecordsImpl</servlet-class> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,134 +0,0 @@ -<schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws" - xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"/> - - <complexType name="Address"> - <sequence> - <element name="city" nillable="true" type="string"/> - <element name="state" nillable="true" type="string"/> - <element name="street" nillable="true" type="string"/> - <element name="zip" nillable="true" type="string"/> - </sequence> - </complexType> - <complexType name="AlreadyRegisteredException"> - <complexContent> - <extension base="tns:RegistrationException"> - <sequence> - <element name="existingId" type="long"/> - </sequence> - </extension> - </complexContent> - </complexType> - <complexType name="BulkRegister"> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="Customers" nillable="true" type="tns:Customer"/> - <element name="When" nillable="true" type="dateTime"/> - </sequence> - </complexType> - <complexType name="BulkRegisterResponse"> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="RegisteredIDs" type="long"/> - </sequence> - </complexType> - <complexType name="Customer"> - <sequence> - <element name="address" nillable="true" type="tns:Address"/> - <element maxOccurs="unbounded" minOccurs="0" name="contactNumbers" nillable="true" type="tns:PhoneNumber"/> - <element name="id" type="long"/> - <element name="name" nillable="true" type="tns:Name"/> - <element maxOccurs="unbounded" minOccurs="0" name="referredCustomers" nillable="true" type="tns:Customer"/> - </sequence> - </complexType> - <complexType name="GetStatistics"> - <sequence> - <element name="Customer" nillable="true" type="tns:Customer"/> - </sequence> - </complexType> - <complexType name="GetStatisticsResponse"> - <sequence> - <element name="Statistics" nillable="true" type="Statistics"/> - </sequence> - </complexType> - - <complexType name="Statistics"> - <sequence> - <element name="activationTime" nillable="true" type="dateTime"/> - <element name="hits" type="long"/> - </sequence> - </complexType> - - - <complexType name="InvoiceCustomer"> - <complexContent> - <extension base="tns:Customer"> - <sequence> - <element name="cycleDay" type="int"/> - </sequence> - </extension> - </complexContent> - </complexType> - <complexType name="Name"> - <sequence> - <element name="firstName" nillable="true" type="string"/> - <element name="lastName" nillable="true" type="string"/> - <element name="middleName" nillable="true" type="string"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="areaCode" nillable="true" type="string"/> - <element name="exchange" nillable="true" type="string"/> - <element name="line" nillable="true" type="string"/> - </sequence> - </complexType> - <complexType name="Register"> - <sequence> - <element name="Customer" nillable="true" type="tns:Customer"/> - <element name="When" nillable="true" type="dateTime"/> - </sequence> - </complexType> - <complexType name="RegisterForInvoice"> - <sequence> - <element name="InvoiceCustomer" nillable="true" type="tns:InvoiceCustomer"/> - </sequence> - </complexType> - <complexType name="RegisterForInvoiceResponse"> - <sequence> - <element name="done" type="boolean"/> - </sequence> - </complexType> - <complexType name="RegisterResponse"> - <sequence> - <element name="RegisteredID" type="long"/> - </sequence> - </complexType> - <complexType name="RegistrationException"> - <sequence> - <element name="message" nillable="true" type="string"/> - </sequence> - </complexType> - <complexType name="ValidationException"> - <complexContent> - <extension base="tns:RegistrationException"> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="failiedCustomers" type="long"/> - </sequence> - </extension> - </complexContent> - </complexType> - <element name="AlreadyRegisteredException" type="tns:AlreadyRegisteredException"/> - <element name="BulkRegister" type="tns:BulkRegister"/> - <element name="BulkRegisterResponse" type="tns:BulkRegisterResponse"/> - <element name="GetStatistics" type="tns:GetStatistics"/> - <element name="GetStatisticsResponse" type="tns:GetStatisticsResponse"/> - <element name="Register" type="tns:Register"/> - <element name="RegisterForInvoice" type="tns:RegisterForInvoice"/> - <element name="RegisterForInvoiceResponse" type="tns:RegisterForInvoiceResponse"/> - <element name="RegisterResponse" type="tns:RegisterResponse"/> - <element name="RegistrationException" type="tns:RegistrationException"/> - <element name="ValidationException" type="tns:ValidationException"/> -</schema> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,134 @@ +<schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns="http://www.w3.org/2001/XMLSchema" + xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws" + xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" + xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws"/> + + <complexType name="Address"> + <sequence> + <element name="city" nillable="true" type="string"/> + <element name="state" nillable="true" type="string"/> + <element name="street" nillable="true" type="string"/> + <element name="zip" nillable="true" type="string"/> + </sequence> + </complexType> + <complexType name="AlreadyRegisteredException"> + <complexContent> + <extension base="tns:RegistrationException"> + <sequence> + <element name="existingId" type="long"/> + </sequence> + </extension> + </complexContent> + </complexType> + <complexType name="BulkRegister"> + <sequence> + <element maxOccurs="unbounded" minOccurs="0" name="Customers" nillable="true" type="tns:Customer"/> + <element name="When" nillable="true" type="dateTime"/> + </sequence> + </complexType> + <complexType name="BulkRegisterResponse"> + <sequence> + <element maxOccurs="unbounded" minOccurs="0" name="RegisteredIDs" type="long"/> + </sequence> + </complexType> + <complexType name="Customer"> + <sequence> + <element name="address" nillable="true" type="tns:Address"/> + <element maxOccurs="unbounded" minOccurs="0" name="contactNumbers" nillable="true" type="tns:PhoneNumber"/> + <element name="id" type="long"/> + <element name="name" nillable="true" type="tns:Name"/> + <element maxOccurs="unbounded" minOccurs="0" name="referredCustomers" nillable="true" type="tns:Customer"/> + </sequence> + </complexType> + <complexType name="GetStatistics"> + <sequence> + <element name="Customer" nillable="true" type="tns:Customer"/> + </sequence> + </complexType> + <complexType name="GetStatisticsResponse"> + <sequence> + <element name="Statistics" nillable="true" type="Statistics"/> + </sequence> + </complexType> + + <complexType name="Statistics"> + <sequence> + <element name="activationTime" nillable="true" type="dateTime"/> + <element name="hits" type="long"/> + </sequence> + </complexType> + + + <complexType name="InvoiceCustomer"> + <complexContent> + <extension base="tns:Customer"> + <sequence> + <element name="cycleDay" type="int"/> + </sequence> + </extension> + </complexContent> + </complexType> + <complexType name="Name"> + <sequence> + <element name="firstName" nillable="true" type="string"/> + <element name="lastName" nillable="true" type="string"/> + <element name="middleName" nillable="true" type="string"/> + </sequence> + </complexType> + <complexType name="PhoneNumber"> + <sequence> + <element name="areaCode" nillable="true" type="string"/> + <element name="exchange" nillable="true" type="string"/> + <element name="line" nillable="true" type="string"/> + </sequence> + </complexType> + <complexType name="Register"> + <sequence> + <element name="Customer" nillable="true" type="tns:Customer"/> + <element name="When" nillable="true" type="dateTime"/> + </sequence> + </complexType> + <complexType name="RegisterForInvoice"> + <sequence> + <element name="InvoiceCustomer" nillable="true" type="tns:InvoiceCustomer"/> + </sequence> + </complexType> + <complexType name="RegisterForInvoiceResponse"> + <sequence> + <element name="done" type="boolean"/> + </sequence> + </complexType> + <complexType name="RegisterResponse"> + <sequence> + <element name="RegisteredID" type="long"/> + </sequence> + </complexType> + <complexType name="RegistrationException"> + <sequence> + <element name="message" nillable="true" type="string"/> + </sequence> + </complexType> + <complexType name="ValidationException"> + <complexContent> + <extension base="tns:RegistrationException"> + <sequence> + <element maxOccurs="unbounded" minOccurs="0" name="failiedCustomers" type="long"/> + </sequence> + </extension> + </complexContent> + </complexType> + <element name="AlreadyRegisteredException" type="tns:AlreadyRegisteredException"/> + <element name="BulkRegister" type="tns:BulkRegister"/> + <element name="BulkRegisterResponse" type="tns:BulkRegisterResponse"/> + <element name="GetStatistics" type="tns:GetStatistics"/> + <element name="GetStatisticsResponse" type="tns:GetStatisticsResponse"/> + <element name="Register" type="tns:Register"/> + <element name="RegisterForInvoice" type="tns:RegisterForInvoice"/> + <element name="RegisterForInvoiceResponse" type="tns:RegisterForInvoiceResponse"/> + <element name="RegisterResponse" type="tns:RegisterResponse"/> + <element name="RegistrationException" type="tns:RegistrationException"/> + <element name="ValidationException" type="tns:ValidationException"/> +</schema> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>XOP DOC/Lit without handlers</display-name> - - <service-ref> - <service-ref-name>service/XOPTestCase</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" + version="1.4"> + + <display-name>XOP DOC/Lit without handlers</display-name> + + <service-ref> + <service-ref-name>service/XOPTestCase</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> + </port-component-ref> + </service-ref> + +</application-client> + Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/XOPTestCase</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC + "-//JBoss//DTD Application Client 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>service/XOPTestCase</service-ref-name> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit?wsdl</wsdl-override> + </service-ref> + +</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,194 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.xop.doclit</package-type> - <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> - </package-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingMsg</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingMsgResponse</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingImage</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingImageResponse</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingSource</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingSourceResponse</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingDataHandler</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingDataHandlerResponse</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestServicePort</port-name> - <java-port-name>TestServicePort</java-port-name> - </port-mapping> - </service-interface-mapping> - - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:TestService</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestServiceBinding</wsdl-binding> - - <service-endpoint-method-mapping> - <java-method-name>ping</java-method-name> - <wsdl-operation>ping</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingIn</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingOut</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - <service-endpoint-method-mapping> - <java-method-name>pingImage</java-method-name> - <wsdl-operation>pingImage</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageIn</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageOut</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - <service-endpoint-method-mapping> - <java-method-name>pingSource</java-method-name> - <wsdl-operation>pingSource</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceIn</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceOut</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - <service-endpoint-method-mapping> - <java-method-name>pingDataHandler</java-method-name> - <wsdl-operation>pingDataHandler</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerIn</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerOut</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,194 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.xop.doclit</package-type> + <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> + </package-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingMsg</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingMsgResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingImage</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingImageResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingSource</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingSourceResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingDataHandler</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingDataHandlerResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestService</wsdl-service-name> + <port-mapping> + <port-name>TestServicePort</port-name> + <java-port-name>TestServicePort</java-port-name> + </port-mapping> + </service-interface-mapping> + + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:TestService</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestServiceBinding</wsdl-binding> + + <service-endpoint-method-mapping> + <java-method-name>ping</java-method-name> + <wsdl-operation>ping</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingIn</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingOut</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingImage</java-method-name> + <wsdl-operation>pingImage</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageIn</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageOut</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingSource</java-method-name> + <wsdl-operation>pingSource</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceIn</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceOut</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingDataHandler</java-method-name> + <wsdl-operation>pingDataHandler</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerIn</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerOut</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <context-param> - <param-name>jbossws-config-name</param-name>> - <param-value>Standard MTOM Endpoint</param-value> - </context-param> - - <servlet> - <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> - Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <context-param> + <param-name>jbossws-config-name</param-name>> + <param-value>Standard MTOM Endpoint</param-value> + </context-param> + + <servlet> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://jboss.org/test/ws/xop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" - version="1.1"> - - <webservice-description> - <webservice-description-name>XOP DOC/Lit without handlers</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/service-doclit.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestServicePort</port-component-name> - <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestService</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<webservices xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:impl="http://jboss.org/test/ws/xop" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" + version="1.1"> + + <webservice-description> + <webservice-description-name>XOP DOC/Lit without handlers</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/service-doclit.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestServicePort</port-component-name> + <wsdl-port>impl:TestServicePort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestService</servlet-link> + </service-impl-bean> + </port-component> + </webservice-description> +</webservices> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<wsdl:definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tns="http://jboss.org/test/ws/xop" - targetNamespace="http://jboss.org/test/ws/xop" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <wsdl:types> - <xsd:import schemaLocation="xsd0.xsd"/> - </wsdl:types> - - <wsdl:import namespace="http://jboss.org/test/ws/xop" location="wsdl0.wsdl"/> - - <wsdl:binding name="TestServiceBinding" type="tns:TestService"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" /> - <wsdl:operation name="ping"> - <soap:operation soapAction="http://jboss.org/test/ws/xop/Ping" style="document" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="pingImage"> - <soap:operation soapAction="http://jboss.org/test/ws/xop/PingImage" style="document" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="pingSource"> - <soap:operation soapAction="http://jboss.org/test/ws/xop/PingSource" style="document" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="pingDataHandler"> - <soap:operation soapAction="http://jboss.org/test/ws/xop/PingDataHandler" style="document" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="TestService"> - <wsdl:port name="TestServicePort" binding="tns:TestServiceBinding"> - <soap:address location="REPLACE_WITH_ACTUAL_URL" /> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions + xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" + xmlns:tns="http://jboss.org/test/ws/xop" + targetNamespace="http://jboss.org/test/ws/xop" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + + <wsdl:types> + <xsd:import schemaLocation="xsd0.xsd"/> + </wsdl:types> + + <wsdl:import namespace="http://jboss.org/test/ws/xop" location="wsdl0.wsdl"/> + + <wsdl:binding name="TestServiceBinding" type="tns:TestService"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" /> + <wsdl:operation name="ping"> + <soap:operation soapAction="http://jboss.org/test/ws/xop/Ping" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="pingImage"> + <soap:operation soapAction="http://jboss.org/test/ws/xop/PingImage" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="pingSource"> + <soap:operation soapAction="http://jboss.org/test/ws/xop/PingSource" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="pingDataHandler"> + <soap:operation soapAction="http://jboss.org/test/ws/xop/PingDataHandler" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + + <wsdl:service name="TestService"> + <wsdl:port name="TestServicePort" binding="tns:TestServiceBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL" /> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,60 +0,0 @@ -<?xml version="1.0" ?> - -<wsdl:definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tns="http://jboss.org/test/ws/xop" - targetNamespace="http://jboss.org/test/ws/xop" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <wsdl:message name="PingIn"> - <wsdl:part name="parameters" element="tns:PingMsg" /> - </wsdl:message> - - <wsdl:message name="PingOut"> - <wsdl:part name="parameters" element="tns:PingMsgResponse" /> - </wsdl:message> - - <wsdl:message name="PingImageIn"> - <wsdl:part name="parameters" element="tns:PingImage" /> - </wsdl:message> - <wsdl:message name="PingImageOut"> - <wsdl:part name="parameters" element="tns:PingImageResponse" /> - </wsdl:message> - - <wsdl:message name="PingSourceIn"> - <wsdl:part name="parameters" element="tns:PingSource" /> - </wsdl:message> - <wsdl:message name="PingSourceOut"> - <wsdl:part name="parameters" element="tns:PingSourceResponse" /> - </wsdl:message> - - <wsdl:message name="PingDataHandlerIn"> - <wsdl:part name="parameters" element="tns:PingDataHandler" /> - </wsdl:message> - <wsdl:message name="PingDataHandlerOut"> - <wsdl:part name="parameters" element="tns:PingDataHandlerResponse" /> - </wsdl:message> - - <wsdl:portType name="TestService"> - <wsdl:operation name="ping"> - <wsdl:input message="tns:PingIn" /> - <wsdl:output message="tns:PingOut" /> - </wsdl:operation> - <wsdl:operation name="pingImage"> - <wsdl:input message="tns:PingImageIn" /> - <wsdl:output message="tns:PingImageOut" /> - </wsdl:operation> - <wsdl:operation name="pingSource"> - <wsdl:input message="tns:PingSourceIn" /> - <wsdl:output message="tns:PingSourceOut" /> - </wsdl:operation> - <wsdl:operation name="pingDataHandler"> - <wsdl:input message="tns:PingDataHandlerIn" /> - <wsdl:output message="tns:PingDataHandlerOut" /> - </wsdl:operation> - </wsdl:portType> - -</wsdl:definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,60 @@ +<?xml version="1.0" ?> + +<wsdl:definitions + xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" + xmlns:tns="http://jboss.org/test/ws/xop" + targetNamespace="http://jboss.org/test/ws/xop" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + + <wsdl:message name="PingIn"> + <wsdl:part name="parameters" element="tns:PingMsg" /> + </wsdl:message> + + <wsdl:message name="PingOut"> + <wsdl:part name="parameters" element="tns:PingMsgResponse" /> + </wsdl:message> + + <wsdl:message name="PingImageIn"> + <wsdl:part name="parameters" element="tns:PingImage" /> + </wsdl:message> + <wsdl:message name="PingImageOut"> + <wsdl:part name="parameters" element="tns:PingImageResponse" /> + </wsdl:message> + + <wsdl:message name="PingSourceIn"> + <wsdl:part name="parameters" element="tns:PingSource" /> + </wsdl:message> + <wsdl:message name="PingSourceOut"> + <wsdl:part name="parameters" element="tns:PingSourceResponse" /> + </wsdl:message> + + <wsdl:message name="PingDataHandlerIn"> + <wsdl:part name="parameters" element="tns:PingDataHandler" /> + </wsdl:message> + <wsdl:message name="PingDataHandlerOut"> + <wsdl:part name="parameters" element="tns:PingDataHandlerResponse" /> + </wsdl:message> + + <wsdl:portType name="TestService"> + <wsdl:operation name="ping"> + <wsdl:input message="tns:PingIn" /> + <wsdl:output message="tns:PingOut" /> + </wsdl:operation> + <wsdl:operation name="pingImage"> + <wsdl:input message="tns:PingImageIn" /> + <wsdl:output message="tns:PingImageOut" /> + </wsdl:operation> + <wsdl:operation name="pingSource"> + <wsdl:input message="tns:PingSourceIn" /> + <wsdl:output message="tns:PingSourceOut" /> + </wsdl:operation> + <wsdl:operation name="pingDataHandler"> + <wsdl:input message="tns:PingDataHandlerIn" /> + <wsdl:output message="tns:PingDataHandlerOut" /> + </wsdl:operation> + </wsdl:portType> + +</wsdl:definitions> \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,108 +0,0 @@ -<?xml version="1.0" ?> -<s:schema xmlns:s="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://jboss.org/test/ws/xop" - xmlns:xmime="http://www.w3.org/2005/05/xmlmime" > - - <s:import namespace="http://www.w3.org/2005/05/xmlmime"/> - -  - <s:element name="PingMsg"> - <s:complexType> - <s:sequence> - <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" type="s:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - -  - <s:element name="PingMsgResponse"> - <s:complexType> - <s:sequence> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" - xmime:expectedContentTypes="application/octet-stream" - type="xmime:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - -  - <s:element name="PingImage"> - <s:complexType> - <s:sequence> - <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" - xmime:expectedContentTypes="image/jpeg" - type="xmime:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - - <s:element name="PingImageResponse"> - <s:complexType> - <s:sequence> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" - xmime:expectedContentTypes="image/jpeg" - type="xmime:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - -  - <s:element name="PingSource"> - <s:complexType> - <s:sequence> - <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" - xmime:expectedContentTypes="image/jpeg,text/xml" - xmime:contentType="text/xml" - type="xmime:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - - <s:element name="PingSourceResponse"> - <s:complexType> - <s:sequence> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" - xmime:expectedContentTypes="text/xml" - type="xmime:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - -  - <s:element name="PingDataHandler"> - <s:complexType> - <s:sequence> - <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" - xmime:expectedContentTypes="image/jpeg,text/xml" - type="xmime:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - - <s:element name="PingDataHandlerResponse"> - <s:complexType> - <s:sequence> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" type="s:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - -</s:schema> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,108 @@ +<?xml version="1.0" ?> +<s:schema xmlns:s="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://jboss.org/test/ws/xop" + xmlns:xmime="http://www.w3.org/2005/05/xmlmime" > + + <s:import namespace="http://www.w3.org/2005/05/xmlmime"/> + +  + <s:element name="PingMsg"> + <s:complexType> + <s:sequence> + <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" type="s:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + +  + <s:element name="PingMsgResponse"> + <s:complexType> + <s:sequence> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="application/octet-stream" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + +  + <s:element name="PingImage"> + <s:complexType> + <s:sequence> + <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="image/jpeg" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + + <s:element name="PingImageResponse"> + <s:complexType> + <s:sequence> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="image/jpeg" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + +  + <s:element name="PingSource"> + <s:complexType> + <s:sequence> + <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="image/jpeg,text/xml" + xmime:contentType="text/xml" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + + <s:element name="PingSourceResponse"> + <s:complexType> + <s:sequence> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="text/xml" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + +  + <s:element name="PingDataHandler"> + <s:complexType> + <s:sequence> + <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="image/jpeg,text/xml" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + + <s:element name="PingDataHandlerResponse"> + <s:complexType> + <s:sequence> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" type="s:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + +</s:schema> \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/attach.jpeg =================================================================== (Binary files differ) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/attach.jpeg (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/attach.jpeg) =================================================================== (Binary files differ) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>XOP DOC/Lit with handlers</display-name> - - <service-ref> - <service-ref-name>service/XOPHandlerTestCase</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> - </port-component-ref> - <handler> - <handler-name>XOPInlineHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class> - </handler> - </service-ref> - -</application-client> - Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" + version="1.4"> + + <display-name>XOP DOC/Lit with handlers</display-name> + + <service-ref> + <service-ref-name>service/XOPHandlerTestCase</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> + </port-component-ref> + <handler> + <handler-name>XOPInlineHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class> + </handler> + </service-ref> + +</application-client> + Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/XOPHandlerTestCase</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit_handler?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC + "-//JBoss//DTD Application Client 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>service/XOPHandlerTestCase</service-ref-name> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit_handler?wsdl</wsdl-override> + </service-ref> + +</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://jboss.org/test/ws/xop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" - version="1.1"> - - <webservice-description> - <webservice-description-name>XOP DOC/Lit with handlers</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/service-doclit.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestServicePort</port-component-name> - <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> - <handler> - <handler-name>XOPInlineHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class> - </handler> - <service-impl-bean> - <servlet-link>TestService</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<webservices xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:impl="http://jboss.org/test/ws/xop" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" + version="1.1"> + + <webservice-description> + <webservice-description-name>XOP DOC/Lit with handlers</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/service-doclit.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestServicePort</port-component-name> + <wsdl-port>impl:TestServicePort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> + <handler> + <handler-name>XOPInlineHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class> + </handler> + <service-impl-bean> + <servlet-link>TestService</servlet-link> + </service-impl-bean> + </port-component> + </webservice-description> +</webservices> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>XOP DOC/Lit without handlers</display-name> - - <service-ref> - <service-ref-name>service/XOPTestCaseRPC</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" + version="1.4"> + + <display-name>XOP DOC/Lit without handlers</display-name> + + <service-ref> + <service-ref-name>service/XOPTestCaseRPC</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> + </port-component-ref> + </service-ref> + +</application-client> + Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/XOPTestCaseRPC</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC + "-//JBoss//DTD Application Client 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>service/XOPTestCaseRPC</service-ref-name> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit?wsdl</wsdl-override> + </service-ref> + +</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,231 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<java-wsdl-mapping version='1.1' - xmlns='http://java.sun.com/xml/ns/j2ee' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' - xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.xop.rpclit</package-type> - <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.xop.shared</package-type> - <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> - </package-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingInType</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingOutType</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageType</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageOutType</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceType</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceOutType</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHandlerType</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHandlerOutType</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestServicePort</port-name> - <java-port-name>TestServicePort</java-port-name> - </port-mapping> - </service-interface-mapping> - - <service-endpoint-interface-mapping> - - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:TestService</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestServiceBinding</wsdl-binding> - - <service-endpoint-method-mapping> - <java-method-name>ping</java-method-name> - <wsdl-operation>ping</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingIn</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingOut</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - <service-endpoint-method-mapping> - <java-method-name>pingSimple</java-method-name> - <wsdl-operation>pingSimple</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:OctetsIn</wsdl-message> - <wsdl-message-part-name>message</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>byte[]</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:OctetsIn</wsdl-message> - <wsdl-message-part-name>xopContent</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>byte[]</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:OctetsOut</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - <service-endpoint-method-mapping> - <java-method-name>pingImage</java-method-name> - <wsdl-operation>pingImage</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageIn</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageOut</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - <service-endpoint-method-mapping> - <java-method-name>pingSource</java-method-name> - <wsdl-operation>pingSource</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceIn</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceOut</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - <service-endpoint-method-mapping> - <java-method-name>pingDataHandler</java-method-name> - <wsdl-operation>pingDataHandler</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerIn</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerOut</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,231 @@ +<?xml version='1.0' encoding='UTF-8'?> +<java-wsdl-mapping version='1.1' + xmlns='http://java.sun.com/xml/ns/j2ee' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.xop.rpclit</package-type> + <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.xop.shared</package-type> + <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> + </package-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingInType</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingOutType</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageType</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageOutType</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceType</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceOutType</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHandlerType</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHandlerOutType</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestService</wsdl-service-name> + <port-mapping> + <port-name>TestServicePort</port-name> + <java-port-name>TestServicePort</java-port-name> + </port-mapping> + </service-interface-mapping> + + <service-endpoint-interface-mapping> + + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:TestService</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestServiceBinding</wsdl-binding> + + <service-endpoint-method-mapping> + <java-method-name>ping</java-method-name> + <wsdl-operation>ping</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingIn</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingOut</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingSimple</java-method-name> + <wsdl-operation>pingSimple</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:OctetsIn</wsdl-message> + <wsdl-message-part-name>message</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>1</param-position> + <param-type>byte[]</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:OctetsIn</wsdl-message> + <wsdl-message-part-name>xopContent</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>byte[]</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:OctetsOut</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingImage</java-method-name> + <wsdl-operation>pingImage</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageIn</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageOut</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingSource</java-method-name> + <wsdl-operation>pingSource</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceIn</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceOut</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingDataHandler</java-method-name> + <wsdl-operation>pingDataHandler</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerIn</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerOut</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <context-param> - <param-name>jbossws-config-name</param-name>> - <param-value>Standard MTOM Endpoint</param-value> - </context-param> - - <servlet> - <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> - Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <context-param> + <param-name>jbossws-config-name</param-name>> + <param-value>Standard MTOM Endpoint</param-value> + </context-param> + + <servlet> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://jboss.org/test/ws/xop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" - version="1.1"> - - <webservice-description> - <webservice-description-name>XOP RPC/Lit without handlers</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/service-rpclit.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestServicePort</port-component-name> - <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestService</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<webservices xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:impl="http://jboss.org/test/ws/xop" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" + version="1.1"> + + <webservice-description> + <webservice-description-name>XOP RPC/Lit without handlers</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/service-rpclit.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestServicePort</port-component-name> + <wsdl-port>impl:TestServicePort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestService</servlet-link> + </service-impl-bean> + </port-component> + </webservice-description> +</webservices> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<wsdl:definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tns="http://jboss.org/test/ws/xop" - targetNamespace="http://jboss.org/test/ws/xop" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <wsdl:types> - <xsd:schema targetNamespace="http://jboss.org/test/ws/xop" - xmlns:xmime="http://www.w3.org/2005/05/xmlmime" > - - <xsd:import namespace="http://www.w3.org/2005/05/xmlmime"/> - - <xsd:complexType name="PingInType"> - <xsd:sequence> - <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="PingOutType"> - <xsd:sequence> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="PingImageType"> - <xsd:sequence> - <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="PingImageOutType"> - <xsd:sequence> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="PingSourceType"> - <xsd:sequence> - <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="PingSourceOutType"> - <xsd:sequence> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="PingDataHandlerType"> - <xsd:sequence> - <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="PingDataHandlerOutType"> - <xsd:sequence> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - </xsd:schema> - - </wsdl:types> - - <wsdl:message name="PingIn"> - <wsdl:part name="parameters" type="tns:PingInType" /> - </wsdl:message> - - <wsdl:message name="PingOut"> - <wsdl:part name="result" type="tns:PingOutType" /> - </wsdl:message> - - <wsdl:message name="OctetsIn"> - <wsdl:part name="message" type="xsd:string" /> - <wsdl:part name="xopContent" type="xsd:base64Binary" /> - </wsdl:message> - - <wsdl:message name="OctetsOut"> - <wsdl:part name="result" type="xsd:base64Binary" /> - </wsdl:message> - - <wsdl:message name="PingImageIn"> - <wsdl:part name="parameters" type="tns:PingImageType" /> - </wsdl:message> - <wsdl:message name="PingImageOut"> - <wsdl:part name="result" type="tns:PingImageOutType" /> - </wsdl:message> - - <wsdl:message name="PingSourceIn"> - <wsdl:part name="parameters" type="tns:PingSourceType" /> - </wsdl:message> - <wsdl:message name="PingSourceOut"> - <wsdl:part name="result" type="tns:PingSourceOutType" /> - </wsdl:message> - - <wsdl:message name="PingDataHandlerIn"> - <wsdl:part name="parameters" type="tns:PingDataHandlerType" /> - </wsdl:message> - <wsdl:message name="PingDataHandlerOut"> - <wsdl:part name="result" type="tns:PingDataHandlerOutType" /> - </wsdl:message> - - <wsdl:portType name="TestService"> - <wsdl:operation name="ping"> - <wsdl:input message="tns:PingIn" /> - <wsdl:output message="tns:PingOut" /> - </wsdl:operation> - <wsdl:operation name="pingSimple"> - <wsdl:input message="tns:OctetsIn" /> - <wsdl:output message="tns:OctetsOut" /> - </wsdl:operation> - <wsdl:operation name="pingImage"> - <wsdl:input message="tns:PingImageIn" /> - <wsdl:output message="tns:PingImageOut" /> - </wsdl:operation> - <wsdl:operation name="pingSource"> - <wsdl:input message="tns:PingSourceIn" /> - <wsdl:output message="tns:PingSourceOut" /> - </wsdl:operation> - <wsdl:operation name="pingDataHandler"> - <wsdl:input message="tns:PingDataHandlerIn" /> - <wsdl:output message="tns:PingDataHandlerOut" /> - </wsdl:operation> - </wsdl:portType> - - - <wsdl:binding name="TestServiceBinding" type="tns:TestService"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" /> - <wsdl:operation name="ping"> - <soap:operation soapAction="" style="rpc" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="pingSimple"> - <soap:operation soapAction="http://jboss.org/test/ws/xop/PingSimple" style="rpc" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - - <wsdl:operation name="pingImage"> - <soap:operation soapAction="" style="rpc" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="pingSource"> - <soap:operation soapAction="" style="rpc" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="pingDataHandler"> - <soap:operation soapAction="" style="rpc" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="TestService"> - <wsdl:port name="TestServicePort" binding="tns:TestServiceBinding"> - <soap:address location="REPLACE_WITH_ACTUAL_URL" /> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,190 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions + xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" + xmlns:tns="http://jboss.org/test/ws/xop" + targetNamespace="http://jboss.org/test/ws/xop" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + + <wsdl:types> + <xsd:schema targetNamespace="http://jboss.org/test/ws/xop" + xmlns:xmime="http://www.w3.org/2005/05/xmlmime" > + + <xsd:import namespace="http://www.w3.org/2005/05/xmlmime"/> + + <xsd:complexType name="PingInType"> + <xsd:sequence> + <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="PingOutType"> + <xsd:sequence> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="PingImageType"> + <xsd:sequence> + <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="PingImageOutType"> + <xsd:sequence> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="PingSourceType"> + <xsd:sequence> + <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="PingSourceOutType"> + <xsd:sequence> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="PingDataHandlerType"> + <xsd:sequence> + <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="PingDataHandlerOutType"> + <xsd:sequence> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + </xsd:schema> + + </wsdl:types> + + <wsdl:message name="PingIn"> + <wsdl:part name="parameters" type="tns:PingInType" /> + </wsdl:message> + + <wsdl:message name="PingOut"> + <wsdl:part name="result" type="tns:PingOutType" /> + </wsdl:message> + + <wsdl:message name="OctetsIn"> + <wsdl:part name="message" type="xsd:string" /> + <wsdl:part name="xopContent" type="xsd:base64Binary" /> + </wsdl:message> + + <wsdl:message name="OctetsOut"> + <wsdl:part name="result" type="xsd:base64Binary" /> + </wsdl:message> + + <wsdl:message name="PingImageIn"> + <wsdl:part name="parameters" type="tns:PingImageType" /> + </wsdl:message> + <wsdl:message name="PingImageOut"> + <wsdl:part name="result" type="tns:PingImageOutType" /> + </wsdl:message> + + <wsdl:message name="PingSourceIn"> + <wsdl:part name="parameters" type="tns:PingSourceType" /> + </wsdl:message> + <wsdl:message name="PingSourceOut"> + <wsdl:part name="result" type="tns:PingSourceOutType" /> + </wsdl:message> + + <wsdl:message name="PingDataHandlerIn"> + <wsdl:part name="parameters" type="tns:PingDataHandlerType" /> + </wsdl:message> + <wsdl:message name="PingDataHandlerOut"> + <wsdl:part name="result" type="tns:PingDataHandlerOutType" /> + </wsdl:message> + + <wsdl:portType name="TestService"> + <wsdl:operation name="ping"> + <wsdl:input message="tns:PingIn" /> + <wsdl:output message="tns:PingOut" /> + </wsdl:operation> + <wsdl:operation name="pingSimple"> + <wsdl:input message="tns:OctetsIn" /> + <wsdl:output message="tns:OctetsOut" /> + </wsdl:operation> + <wsdl:operation name="pingImage"> + <wsdl:input message="tns:PingImageIn" /> + <wsdl:output message="tns:PingImageOut" /> + </wsdl:operation> + <wsdl:operation name="pingSource"> + <wsdl:input message="tns:PingSourceIn" /> + <wsdl:output message="tns:PingSourceOut" /> + </wsdl:operation> + <wsdl:operation name="pingDataHandler"> + <wsdl:input message="tns:PingDataHandlerIn" /> + <wsdl:output message="tns:PingDataHandlerOut" /> + </wsdl:operation> + </wsdl:portType> + + + <wsdl:binding name="TestServiceBinding" type="tns:TestService"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" /> + <wsdl:operation name="ping"> + <soap:operation soapAction="" style="rpc" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="pingSimple"> + <soap:operation soapAction="http://jboss.org/test/ws/xop/PingSimple" style="rpc" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + + <wsdl:operation name="pingImage"> + <soap:operation soapAction="" style="rpc" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="pingSource"> + <soap:operation soapAction="" style="rpc" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="pingDataHandler"> + <soap:operation soapAction="" style="rpc" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + + </wsdl:binding> + + <wsdl:service name="TestService"> + <wsdl:port name="TestServicePort" binding="tns:TestServiceBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL" /> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>XOP DOC/Lit with handlers</display-name> - - <service-ref> - <service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> - </port-component-ref> - <handler> - <handler-name>XOPInlineHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class> - </handler> - </service-ref> - -</application-client> - Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" + version="1.4"> + + <display-name>XOP DOC/Lit with handlers</display-name> + + <service-ref> + <service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> + </port-component-ref> + <handler> + <handler-name>XOPInlineHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class> + </handler> + </service-ref> + +</application-client> + Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit_handler?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC + "-//JBoss//DTD Application Client 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit_handler?wsdl</wsdl-override> + </service-ref> + +</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://jboss.org/test/ws/xop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" - version="1.1"> - - <webservice-description> - <webservice-description-name>XOP RPC/Lit with handlers</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/service-rpclit.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestServicePort</port-component-name> - <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> - <handler> - <handler-name>XOPInlineHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class> - </handler> - <service-impl-bean> - <servlet-link>TestService</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<webservices xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:impl="http://jboss.org/test/ws/xop" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" + version="1.1"> + + <webservice-description> + <webservice-description-name>XOP RPC/Lit with handlers</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/service-rpclit.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestServicePort</port-component-name> + <wsdl-port>impl:TestServicePort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> + <handler> + <handler-name>XOPInlineHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class> + </handler> + <service-impl-bean> + <servlet-link>TestService</servlet-link> + </service-impl-bean> + </port-component> + </webservice-description> +</webservices> Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,41 +0,0 @@ -<s:schema xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://jboss.org/test/ws/xop/doclit" - xmlns:xmime="http://www.w3.org/2005/05/xmlmime" - xmlns:tns="http://jboss.org/test/ws/xop/doclit"> - - <s:import schemaLocation="http://www.w3.org/2005/05/xmlmime" namespace="http://www.w3.org/2005/05/xmlmime"/> - - <s:element name="PingMsg"> - <s:complexType> - <s:sequence> - <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> - <s:element name="xopContent" xmime:contentType="image/jpeg" type="tns:XOPBinary"/> - </s:sequence> - </s:complexType> - </s:element> - - <s:element name="PingMsgResponse"> - <s:complexType> - <s:sequence> - <s:element name="xopContent" xmime:contentType="image/jpeg" type="xmime:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - - <s:complexType name="XOPBinary" > - <s:simpleContent> - <s:extension base="s:base64Binary" > - <s:attribute ref="xmime:contentType" use="optional"/> - </s:extension> - </s:simpleContent> - </s:complexType> - - <s:element name="MSFTBinary"> - <s:complexType> - <s:sequence> - <s:element minOccurs="0" name="xopContent" nillable="true" type="s:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - -</s:schema> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,41 @@ +<s:schema xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://jboss.org/test/ws/xop/doclit" + xmlns:xmime="http://www.w3.org/2005/05/xmlmime" + xmlns:tns="http://jboss.org/test/ws/xop/doclit"> + + <s:import schemaLocation="http://www.w3.org/2005/05/xmlmime" namespace="http://www.w3.org/2005/05/xmlmime"/> + + <s:element name="PingMsg"> + <s:complexType> + <s:sequence> + <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> + <s:element name="xopContent" xmime:contentType="image/jpeg" type="tns:XOPBinary"/> + </s:sequence> + </s:complexType> + </s:element> + + <s:element name="PingMsgResponse"> + <s:complexType> + <s:sequence> + <s:element name="xopContent" xmime:contentType="image/jpeg" type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + + <s:complexType name="XOPBinary" > + <s:simpleContent> + <s:extension base="s:base64Binary" > + <s:attribute ref="xmime:contentType" use="optional"/> + </s:extension> + </s:simpleContent> + </s:complexType> + + <s:element name="MSFTBinary"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" name="xopContent" nillable="true" type="s:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + +</s:schema> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/shared) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.jpeg =================================================================== (Binary files differ) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.jpeg (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.jpeg) =================================================================== (Binary files differ) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt 2007-02-09 16:14:15 UTC (rev 2324) @@ -1 +0,0 @@ -This is a plain text attachment. Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1 @@ +This is a plain text attachment. Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<mime-message>This is an xml attachment.</mime-message> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<mime-message>This is an xml attachment.</mime-message> Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/disguised_jpeg.xcf =================================================================== (Binary files differ) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/disguised_jpeg.xcf (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/shared/disguised_jpeg.xcf) =================================================================== (Binary files differ)

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r2323 - branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-02-09 10:44:12 -0500 (Fri, 09 Feb 2007) New Revision: 2323 Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/Order.java Log: Update retail sample to reflect the quick start guide Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/Order.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/Order.java 2007-02-09 15:34:03 UTC (rev 2322) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/Order.java 2007-02-09 15:44:12 UTC (rev 2323) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.samples.retail; +import javax.xml.bind.annotation.*; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -30,6 +31,13 @@ * @version $Id$ * @since Nov 7, 2006 */ + +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType( + name = "orderType", + namespace="http://org.jboss.ws/samples/retail", + propOrder = { "orderNum", "state", "customer", "items" } +) public class Order implements Serializable { public enum OrderState {TRANSIENT, PREPARED, VERIFIED, PROCESSED}

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r2322 - trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-02-09 10:34:03 -0500 (Fri, 09 Feb 2007) New Revision: 2322 Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/Order.java Log: Added example annotations Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/Order.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/Order.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/Order.java 2007-02-09 15:34:03 UTC (rev 2322) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.samples.retail; +import javax.xml.bind.annotation.*; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -30,6 +31,13 @@ * @version $Id$ * @since Nov 7, 2006 */ + +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType( + name = "orderType", + namespace="http://org.jboss.ws/samples/retail", + propOrder = { "orderNum", "state", "customer", "items" } +) public class Order implements Serializable { public enum OrderState {TRANSIENT, PREPARED, VERIFIED, PROCESSED}

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r2321 - in branches/jbossws-1.2.0: jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc and 33 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-02-09 10:26:41 -0500 (Fri, 09 Feb 2007) New Revision: 2321 Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/ Removed: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/ Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml branches/jbossws-1.2.0/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml Log: Same MTOM default for JAX-WS and JAX-RPC (disabled). JAX-RPC endpoint config supports Features now. Removed XOP unit tests from samples package. Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -777,7 +777,7 @@ if (paramMetaData.isXOP() && XOPContext.isXOPEncodedRequest()) { SOAPMessageImpl soapMessage = (SOAPMessageImpl)MessageContextAssociation.peekMessageContext().getSOAPMessage(); - soapMessage.setXOPMessage(true); + soapMessage.setXOPMessage(true); } return soapContentElement; } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -42,7 +42,7 @@ public SOAP11BindingJAXRPC() { super(); - setMTOMEnabled(true); + setMTOMEnabled(false); } public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -42,7 +42,7 @@ public SOAP12BindingJAXRPC() { super(); - setMTOMEnabled(true); + setMTOMEnabled(false); } public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -46,6 +46,7 @@ import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonClient; import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.StubExt; import org.jboss.ws.core.jaxws.binding.BindingExt; import org.jboss.ws.core.jaxws.binding.BindingProviderImpl; import org.jboss.ws.core.jaxws.handler.HandlerChainExecutor; @@ -59,6 +60,7 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; +import org.jboss.ws.extensions.xop.XOPContext; /** * Provides support for the dynamic invocation of a service endpoint. @@ -207,12 +209,16 @@ { log.debug("Begin response processing"); + // MTOM setting need to pass past pivot + boolean mtomEnabled = XOPContext.isMTOMEnabled(); + // remove existing context MessageContextAssociation.popMessageContext(); SOAPMessageContextJAXWS responseContext = new SOAPMessageContextJAXWS(requestContext); responseContext.setSOAPMessage(null); responseContext.clear(); // clear message context properties + responseContext.setProperty(StubExt.PROPERTY_MTOM_ENABLED, mtomEnabled); // associate new context MessageContextAssociation.pushMessageContext(responseContext); Deleted: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -1,59 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.extensions.xop; - -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.MessageContext; - -import org.jboss.ws.core.StubExt; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id$ - * @since Oct 2, 2006 - */ -public class DisableMTOMHandler extends GenericHandler { - public QName[] getHeaders() { - return new QName[0]; - } - - public boolean handleRequest(MessageContext msgContext) { - disableMTOM(msgContext); - return true; - } - - public boolean handleResponse(MessageContext msgContext) { - disableMTOM(msgContext); - return true; - } - - public boolean handleFault(MessageContext msgContext) { - disableMTOM(msgContext); - return true; - } - - public void disableMTOM(MessageContext msgContext) - { - msgContext.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - } -} Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -126,7 +126,7 @@ { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); Boolean mtomEnabled = (Boolean)msgContext.getProperty(StubExt.PROPERTY_MTOM_ENABLED); - return Boolean.TRUE.equals(mtomEnabled) || mtomEnabled == null; + return Boolean.TRUE.equals(mtomEnabled); } public static void setMTOMEnabled(boolean b) Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -593,7 +593,10 @@ // Make sure we have a configuration if (config == null) initEndpointConfig(); - + + // register any configurable with the ConfigProvider + configObservable.addObserver(configurable); + // SOAPBinding configuration if (configurable instanceof CommonBindingProvider) { @@ -664,14 +667,14 @@ reconfigHandlerMetaData(); } - + private void reconfigHandlerMetaData() { log.debug("Configure EndpointMetaData"); List<HandlerMetaData> sepHandlers = getHandlerMetaData(HandlerType.ENDPOINT); clearHandlers(); - + List<HandlerMetaData> preHandlers = config.getHandlers(this, HandlerType.PRE); List<HandlerMetaData> postHandlers = config.getHandlers(this, HandlerType.POST); Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -3,21 +3,15 @@  <jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> + xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> <client-config> <config-name>Standard Client</config-name> </client-config> <client-config> - <config-name>Standard MTOM disabled client</config-name> - <post-handler-chain> - <handler-chain-name>MTOM handler</handler-chain-name> - <handler> - <j2ee:handler-name>DisableMTOMHandler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.xop.DisableMTOMHandler</j2ee:handler-class> - </handler> - </post-handler-chain> + <config-name>Standard MTOM client</config-name> + <feature>http://org.jboss.ws/mtom</feature> </client-config> <client-config> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -2,7 +2,8 @@  -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" +<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> <endpoint-config> @@ -10,14 +11,8 @@ </endpoint-config> <endpoint-config> - <config-name>Standard MTOM disabled endpoint</config-name> - <pre-handler-chain> - <handler-chain-name>MTOM handlers</handler-chain-name> - <handler> - <j2ee:handler-name>DisableMTOMHandler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.xop.DisableMTOMHandler</j2ee:handler-class> - </handler> - </pre-handler-chain> + <config-name>Standard MTOM Endpoint</config-name> + <feature>http://org.jboss.ws/mtom</feature> </endpoint-config> <endpoint-config> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd 2007-02-09 15:26:41 UTC (rev 2321) @@ -56,6 +56,7 @@ <xsd:element name="config-name" type="xsd:string"/> <xsd:element name="pre-handler-chain" type="tns:handlerChainType" minOccurs="0"/> <xsd:element name="post-handler-chain" type="tns:handlerChainType" minOccurs="0"/> + <xsd:element name="feature" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="property" type="tns:propertyType" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:complexType> Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -628,13 +628,13 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -642,59 +642,59 @@ </war> <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar>  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF"> <include name="webservices.xml"/> </webinf> </war> <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit_handler-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar>  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -702,46 +702,46 @@ </war> <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar>  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF"> <include name="webservices.xml"/> </webinf> </war> <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit_handler-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -28,6 +28,7 @@ import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC; +import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC; import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; import org.jboss.ws.metadata.config.jaxws.EndpointConfigJAXWS; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; @@ -52,13 +53,14 @@ assertNotNull("Null config", config); - assertEquals(2, config.getEndpointConfig().size()); + assertEquals(3, config.getEndpointConfig().size()); EndpointConfigJAXRPC epc1 = (EndpointConfigJAXRPC)config.getEndpointConfig().get(0); - EndpointConfigJAXRPC epc2 = (EndpointConfigJAXRPC)config.getEndpointConfig().get(1); + EndpointConfigJAXRPC epc2 = (EndpointConfigJAXRPC)config.getEndpointConfig().get(2); assertEquals("Standard Endpoint", epc1.getConfigName()); assertNull(epc1.getPreHandlerChain()); assertNull(epc1.getPostHandlerChain()); + assertFalse("MTOM should not be enabled" , epc1.hasFeature("http://org.jboss.ws/mtom")); assertEquals("Standard WSSecurity Endpoint", epc2.getConfigName()); HandlerChainMetaData preChain = epc2.getPreHandlerChain(); @@ -68,12 +70,12 @@ assertEquals("org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound", h1.getHandlerClass()); } - public void testFeatures() throws Exception + public void testJAXWSFeatures() throws Exception { File confFile = new File("resources/common/config/jaxws-endpoint-config.xml"); assertTrue(confFile.exists()); + JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); ConfigRootJAXWS config = (ConfigRootJAXWS)factory.parse(confFile.toURL()); assertNotNull("Null config", config); @@ -83,7 +85,22 @@ // disable feature epConfig.setFeature("http://org.jboss.ws/mtom", false); assertFalse("Feature still set", epConfig.hasFeature("http://org.jboss.ws/mtom")); + } + public void testJAXRPCFeatures() throws Exception + { + File confFile = new File("resources/common/config/jaxrpc-endpoint-config.xml"); + assertTrue(confFile.exists()); + JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); + ConfigRootJAXRPC config = (ConfigRootJAXRPC)factory.parse(confFile.toURL()); + assertNotNull("Null config", config); + + CommonConfigJAXRPC epConfig = (CommonConfigJAXRPC)config.getConfigByName("Standard MTOM Endpoint"); + assertTrue("Feature not set" , epConfig.hasFeature("http://org.jboss.ws/mtom")); + + // disable feature + epConfig.setFeature("http://org.jboss.ws/mtom", false); + assertFalse("Feature still set", epConfig.hasFeature("http://org.jboss.ws/mtom")); } public void testProperties() throws Exception Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -1,119 +0,0 @@ -package org.jboss.test.ws.jaxrpc.samples.xop; - -import java.io.File; - -import junit.framework.TestCase; - -import org.apache.xerces.xs.XSComplexTypeDefinition; -import org.apache.xerces.xs.XSModel; -import org.apache.xerces.xs.XSTypeDefinition; -import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils; -import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; -import org.jboss.xb.binding.NamespaceRegistry; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @since Jun 9, 2006 - */ -public class XOPTypeDefTestCase extends TestCase -{ - public XOPTypeDefTestCase(String string) - { - super(string); - } - - protected void setUp() throws Exception - { - super.setUp(); - } - - public void testCircularReferences() throws Exception - { - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/samples/xop/circular.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); - JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - - XSTypeDefinition xsType = schemaModel.getTypeDefinition("Customer", "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); - - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); - - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - - // it fails when getting a stack overflow ;) - } - } - - public void testXOPElementScan() throws Exception - { - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/samples/xop/schema.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); - JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - - // test custom binary declaration - XSTypeDefinition xsType = schemaModel.getTypeDefinition(">PingMsg", "http://jboss.org/test/ws/xop/doclit"); - - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); - - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find xop typedef in schema", resultType); - } - - scanner.reset(); - - // test the xmime binary declaration - xsType = schemaModel.getTypeDefinition(">PingMsgResponse", "http://jboss.org/test/ws/xop/doclit"); - assertNotNull("Root type def not found", xsType); - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find XOP typedef in schema", resultType); - } - - } - - public void testMSFTElementScan() throws Exception - { - - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/samples/xop/schema.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); - JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - - XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit"); - - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); - - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find xop typedef in schema", resultType); - } - } -} Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java (from rev 2313, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -0,0 +1,129 @@ +package org.jboss.test.ws.jaxrpc.xop; + +import java.io.File; + +import junit.framework.TestCase; + +import org.apache.xerces.xs.XSComplexTypeDefinition; +import org.apache.xerces.xs.XSModel; +import org.apache.xerces.xs.XSTypeDefinition; +import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner; +import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; +import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils; +import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; +import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.xb.binding.NamespaceRegistry; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @since Jun 9, 2006 + */ +public class XOPTypeDefTestCase extends TestCase +{ + public XOPTypeDefTestCase(String string) + { + super(string); + } + + protected void setUp() throws Exception + { + super.setUp(); + } + + public void testCircularReferences() throws Exception + { + SchemaUtils utils = SchemaUtils.getInstance(); + File f = new File("resources/jaxrpc/xop/circular.xsd"); + assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); + + XSModel xsModel = utils.parseSchema(f.toURL()); + assertNotNull(xsModel); + WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); + JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); + + XSTypeDefinition xsType = schemaModel.getTypeDefinition("Customer", "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); + + assertNotNull("Root type def not found", xsType); + XOPScanner scanner = new XOPScanner(); + + if (xsType instanceof XSComplexTypeDefinition) + { + XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; + XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); + + // it fails when getting a stack overflow ;) + } + } + + public void testXOPElementScan() throws Exception + { + SchemaUtils utils = SchemaUtils.getInstance(); + File f = new File("resources/jaxrpc/xop/schema.xsd"); + assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); + + XSModel xsModel = utils.parseSchema(f.toURL()); + assertNotNull(xsModel); + WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); + JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); + + // test custom binary declaration + XSTypeDefinition xsType = schemaModel.getTypeDefinition(">PingMsg", "http://jboss.org/test/ws/xop/doclit"); + + assertNotNull("Root type def not found", xsType); + XOPScanner scanner = new XOPScanner(); + + if (xsType instanceof XSComplexTypeDefinition) + { + XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; + XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); + assertNotNull("Unable to find xop typedef in schema", resultType); + } + + scanner.reset(); + + // test the xmime binary declaration + xsType = schemaModel.getTypeDefinition(">PingMsgResponse", "http://jboss.org/test/ws/xop/doclit"); + assertNotNull("Root type def not found", xsType); + if (xsType instanceof XSComplexTypeDefinition) + { + XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; + XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); + assertNotNull("Unable to find XOP typedef in schema", resultType); + } + + } + + public void testMSFTElementScan() throws Exception + { + + SchemaUtils utils = SchemaUtils.getInstance(); + File f = new File("resources/jaxrpc/xop/schema.xsd"); + assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); + + XSModel xsModel = utils.parseSchema(f.toURL()); + assertNotNull(xsModel); + WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); + JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); + + XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit"); + + assertNotNull("Root type def not found", xsType); + XOPScanner scanner = new XOPScanner(); + + if (xsType instanceof XSComplexTypeDefinition) + { + XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; + XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); + assertNotNull("Unable to find xop typedef in schema", resultType); + } + } + + public void testXOPContext() + { + SOAPMessageContextJAXRPC messageContext = new SOAPMessageContextJAXRPC(); + MessageContextAssociation.pushMessageContext(messageContext); + assertFalse("MTOM should be disabled", XOPContext.isMTOMEnabled()); + } +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit (from rev 2320, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit) Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/InlineHandler.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxrpc.samples.xop.doclit; +package org.jboss.test.ws.jaxrpc.xop.doclit; import javax.xml.namespace.QName; import javax.xml.rpc.handler.GenericHandler; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPBase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxrpc.samples.xop.doclit; +package org.jboss.test.ws.jaxrpc.xop.doclit; import java.awt.Image; import java.io.File; @@ -30,14 +30,14 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.XOPTestSupport; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; import org.jboss.ws.core.StubExt; import org.jboss.ws.core.utils.IOUtils; @@ -48,7 +48,7 @@ */ public abstract class XOPBase extends JBossWSTest { - private File imgFile = new File("resources/jaxrpc/samples/xop/shared/attach.jpeg"); + private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); protected abstract XOPPing getPort(); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxrpc.samples.xop.doclit; +package org.jboss.test.ws.jaxrpc.xop.doclit; import javax.naming.InitialContext; import javax.xml.rpc.Service; @@ -27,6 +27,7 @@ import junit.framework.Test; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; /** * Test MTOM functionality with jaxrpc-handlers in place.<br> @@ -39,7 +40,7 @@ */ public class XOPHandlerTestCase extends XOPBase { - private XOPPing port; + private static XOPPing port; public static Test suite() { @@ -54,6 +55,7 @@ InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCase"); port = (XOPPing)service.getPort(XOPPing.class); + ((StubExt)port).setConfigName("Standard MTOM client"); } //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit_handler"); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPing.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -4,16 +4,16 @@ */ //Auto Generated by jbossws - Please do not edit!!! -package org.jboss.test.ws.jaxrpc.samples.xop.doclit; +package org.jboss.test.ws.jaxrpc.xop.doclit; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; public interface XOPPing extends java.rmi.Remote { Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingImpl.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -1,16 +1,16 @@ -package org.jboss.test.ws.jaxrpc.samples.xop.doclit; +package org.jboss.test.ws.jaxrpc.xop.doclit; import java.rmi.RemoteException; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.MTOMServiceBase; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.MTOMServiceBase; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; /** * MTOM test service impl. Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPPingService.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -5,7 +5,7 @@ //Auto Generated by jbossws - Please do not edit!!! -package org.jboss.test.ws.jaxrpc.samples.xop.doclit; +package org.jboss.test.ws.jaxrpc.xop.doclit; import javax.xml.rpc.ServiceException; @@ -14,6 +14,6 @@ public interface XOPPingService extends javax.xml.rpc.Service { - public org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing getTestServicePort() throws ServiceException; + public org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing getTestServicePort() throws ServiceException; } Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/XOPTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxrpc.samples.xop.doclit; +package org.jboss.test.ws.jaxrpc.xop.doclit; // $Id$ @@ -29,6 +29,7 @@ import junit.framework.Test; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; /** * Test MTOM functionaly without any jaxrpc handlers in place. @@ -38,7 +39,7 @@ */ public class XOPTestCase extends XOPBase { - private XOPPing port; + private static XOPPing port; public static Test suite() { @@ -53,6 +54,7 @@ InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCase"); port = (XOPPing)service.getPort(XOPPing.class); + ((StubExt)port).setConfigName("Standard MTOM client"); } //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit"); Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit (from rev 2320, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit) Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/InlineHandler.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -1,4 +1,4 @@ -package org.jboss.test.ws.jaxrpc.samples.xop.rpclit; +package org.jboss.test.ws.jaxrpc.xop.rpclit; import javax.xml.namespace.QName; import javax.xml.rpc.handler.GenericHandler; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPBase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxrpc.samples.xop.rpclit; +package org.jboss.test.ws.jaxrpc.xop.rpclit; import java.awt.Image; import java.io.File; @@ -31,14 +31,14 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.XOPTestSupport; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; import org.jboss.ws.core.StubExt; import org.jboss.ws.core.utils.IOUtils; @@ -49,7 +49,7 @@ */ public abstract class XOPBase extends JBossWSTest { - private File imgFile = new File("resources/jaxrpc/samples/xop/shared/attach.jpeg"); + private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); protected abstract XOPPing getPort(); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPHandlerTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxrpc.samples.xop.rpclit; +package org.jboss.test.ws.jaxrpc.xop.rpclit; import javax.naming.InitialContext; import javax.xml.rpc.Service; @@ -27,6 +27,7 @@ import junit.framework.Test; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; /** * @author Heiko Braun <heiko.braun(a)jboss.com> @@ -35,7 +36,7 @@ */ public class XOPHandlerTestCase extends XOPBase { - private XOPPing port; + private static XOPPing port; public static Test suite() { @@ -50,6 +51,7 @@ InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCaseRPC"); port = (XOPPing)service.getPort(XOPPing.class); + ((StubExt)port).setConfigName("Standard MTOM client"); } //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit_handler"); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPing.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -4,18 +4,18 @@ */ //Auto Generated by jbossws - Please do not edit!!! -package org.jboss.test.ws.jaxrpc.samples.xop.rpclit; +package org.jboss.test.ws.jaxrpc.xop.rpclit; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; public interface XOPPing extends java.rmi.Remote { - public org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg pingMsg) throws java.rmi.RemoteException; + public org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.xop.shared.PingMsg pingMsg) throws java.rmi.RemoteException; public byte[] pingSimple(String parameters, byte[] xopContent) throws java.rmi.RemoteException; public PingImageResponse pingImage(PingImage pingImage) throws java.rmi.RemoteException; public PingSourceResponse pingSource(PingSource pingSource) throws java.rmi.RemoteException; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingImpl.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -1,16 +1,16 @@ -package org.jboss.test.ws.jaxrpc.samples.xop.rpclit; +package org.jboss.test.ws.jaxrpc.xop.rpclit; import java.rmi.RemoteException; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.MTOMServiceBase; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.MTOMServiceBase; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; /** * @author Heiko Braun, <heiko(a)openj.net> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPPingService.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -5,7 +5,7 @@ //Auto Generated by jbossws - Please do not edit!!! -package org.jboss.test.ws.jaxrpc.samples.xop.rpclit; +package org.jboss.test.ws.jaxrpc.xop.rpclit; import javax.xml.rpc.ServiceException; @@ -13,5 +13,5 @@ public interface XOPPingService extends javax.xml.rpc.Service { - public org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing getTestServicePort() throws ServiceException; + public org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing getTestServicePort() throws ServiceException; } Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/XOPTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxrpc.samples.xop.rpclit; +package org.jboss.test.ws.jaxrpc.xop.rpclit; // $Id$ @@ -29,6 +29,7 @@ import junit.framework.Test; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; /** * @@ -37,7 +38,7 @@ */ public class XOPTestCase extends XOPBase { - private XOPPing port; + private static XOPPing port; public static Test suite() { @@ -52,6 +53,7 @@ InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCaseRPC"); port = (XOPPing)service.getPort(XOPPing.class); + ((StubExt)port).setConfigName("Standard MTOM client"); } //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit"); Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared (from rev 2320, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared) Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/MTOMServiceBase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxrpc.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; import java.util.StringTokenizer; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandler.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxrpc.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; import javax.activation.DataHandler; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingDataHandlerResponse.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxrpc.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; import javax.activation.DataHandler; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImage.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxrpc.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; import java.awt.Image; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingImageResponse.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxrpc.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; import java.awt.Image; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsg.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -4,7 +4,7 @@ */ //Auto Generated by jbossws - Please do not edit!!! -package org.jboss.test.ws.jaxrpc.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; public class PingMsg { Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingMsgResponse.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -5,7 +5,7 @@ //Auto Generated by jbossws - Please do not edit!!! -package org.jboss.test.ws.jaxrpc.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; public class PingMsgResponse { Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSource.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxrpc.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; import javax.xml.transform.Source; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/PingSourceResponse.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.test.ws.jaxrpc.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; import javax.xml.transform.Source; Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -1,151 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxws.samples.xop; - -import java.awt.Image; -import java.lang.reflect.Method; - -import javax.xml.bind.annotation.XmlMimeType; - -import junit.framework.TestCase; - -import org.jboss.ws.extensions.xop.jaxws.ReflectiveXOPScanner; - -/** - * Test the ReflectiveXOPScanner. - * - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id$ - * @since 04.12.2006 - */ -public class MimeDeclarationTestCase extends TestCase { - - static ReflectiveXOPScanner SCANNER = new ReflectiveXOPScanner(); - - - protected void setUp() throws Exception - { - SCANNER.reset(); - } - - public void testFieldAnnotation() throws Exception - { - String mimeType = SCANNER.scan(FieldAnnotation.class); - assertNotNull("Unable to find xop declaration", mimeType); - assertEquals("text/xml", mimeType); - } - - public void testMethodAnnotation() throws Exception - { - String mimeType = SCANNER.scan(MethodAnnotation.class); - assertNotNull("Unable to find xop declaration", mimeType); - } - - public void testAnnotationMissing() throws Exception - { - String mimeType = SCANNER.scan(NoAnnotation.class); - assertNull("There should be no mimeType available", mimeType); - } - - public void testAnnotatedParameter() throws Exception - { - - if(true) - { - System.out.println("FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations"); - return; - } - - Method m = AnnotatedSEI.class.getMethod("foo", new Class[] {byte[].class}); - assertNotNull(m); - - System.out.println(m.getParameterAnnotations().length); - - String mimeType = SCANNER.scan( m.getParameterTypes()[0]); - assertNotNull("Unable to find xop declaration", mimeType); - assertEquals("text/xml", mimeType); - } - - public void testSimpleRecursion() throws Exception - { - String mimeType = SCANNER.scan(SimpleRecursion.class); - assertNull(mimeType); - } - - public void testComplexRecursion() throws Exception - { - String mimeType = SCANNER.scan(ComplexRecursion.class); - assertNotNull("Unable to find xop declaration", mimeType); - assertEquals("text/plain", mimeType); - } - - class FieldAnnotation - { - @XmlMimeType("text/xml") - public byte[] data; - - - @XmlMimeType("text/plain") // check field level precedence - public byte[] getData() { - return data; - } - } - - class MethodAnnotation - { - private Image data; - - @XmlMimeType("image/jpeg") - public Image getData() { - return data; - } - } - - class NoAnnotation - { - private Image data; - - public Image getData() { - return data; - } - } - - interface AnnotatedSEI { - void foo(@XmlMimeType("text/xml")byte[] bar); - } - - class SimpleRecursion { - private SimpleRecursion data; - } - - class ComplexRecursion - { - String data; - Nested nested; - } - - class Nested - { - @XmlMimeType("text/plain") - String data; - } -} Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -1,14 +1,20 @@ package org.jboss.test.ws.jaxws.samples.xop.doclit; -import java.io.ByteArrayOutputStream; - -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.handler.MessageContext; - import org.jboss.logging.Logger; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.ws.core.soap.SOAPElementImpl; +import org.jboss.ws.core.soap.SOAPElementWriter; +import org.jboss.ws.core.soap.SOAPMessageImpl; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.ws.handler.MessageContext; + +/** + * A MTOM handler should see the conceptual payload, + * which means an inlined representation of the binary data. + */ class MTOMProtocolHandler extends GenericSOAPHandler { private Logger log = Logger.getLogger(MTOMProtocolHandler.class); @@ -24,13 +30,16 @@ private boolean dumpMessage(MessageContext context) { try { - SOAPMessage msg = ((CommonMessageContext)context).getSOAPMessage(); - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - msg.writeTo(bout); - log.info(bout.toString()); - } catch (Exception e) { - throw new RuntimeException(e); + CommonMessageContext msgContext = (CommonMessageContext)context; + SOAPMessageImpl soapMsg = (SOAPMessageImpl)msgContext.getSOAPMessage(); + SOAPEnvelope soapReqEnv = soapMsg.getSOAPPart().getEnvelope(); + String xml = SOAPElementWriter.writeElement((SOAPElementImpl)soapReqEnv, true); + log.info(xml.substring(0, 50)+"[...]"); } + catch (SOAPException e) + { + // + } return true; } Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -61,6 +61,8 @@ // enable MTOM binding = (SOAPBinding)((BindingProvider)port).getBinding(); + binding.setMTOMEnabled(true); + List<Handler> handlerChain = new ArrayList<Handler>(); handlerChain.addAll(binding.getHandlerChain()); handlerChain.add(new MTOMProtocolHandler()); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -57,6 +57,7 @@ // enable MTOM binding = (SOAPBinding)((BindingProvider)port).getBinding(); + binding.setMTOMEnabled(true); } Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java (from rev 2313, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -0,0 +1,159 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxws.xop; + +import junit.framework.TestCase; +import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.ws.extensions.xop.jaxws.ReflectiveXOPScanner; + +import javax.xml.bind.annotation.XmlMimeType; +import java.awt.*; +import java.lang.reflect.Method; + +/** + * Test the ReflectiveXOPScanner. + * + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since 04.12.2006 + */ +public class MimeDeclarationTestCase extends TestCase { + + static ReflectiveXOPScanner SCANNER = new ReflectiveXOPScanner(); + + + protected void setUp() throws Exception + { + SCANNER.reset(); + } + + public void testFieldAnnotation() throws Exception + { + String mimeType = SCANNER.scan(FieldAnnotation.class); + assertNotNull("Unable to find xop declaration", mimeType); + assertEquals("text/xml", mimeType); + } + + public void testMethodAnnotation() throws Exception + { + String mimeType = SCANNER.scan(MethodAnnotation.class); + assertNotNull("Unable to find xop declaration", mimeType); + } + + public void testAnnotationMissing() throws Exception + { + String mimeType = SCANNER.scan(NoAnnotation.class); + assertNull("There should be no mimeType available", mimeType); + } + + public void testAnnotatedParameter() throws Exception + { + + if(true) + { + System.out.println("FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations"); + return; + } + + Method m = AnnotatedSEI.class.getMethod("foo", new Class[] {byte[].class}); + assertNotNull(m); + + System.out.println(m.getParameterAnnotations().length); + + String mimeType = SCANNER.scan( m.getParameterTypes()[0]); + assertNotNull("Unable to find xop declaration", mimeType); + assertEquals("text/xml", mimeType); + } + + public void testSimpleRecursion() throws Exception + { + String mimeType = SCANNER.scan(SimpleRecursion.class); + assertNull(mimeType); + } + + public void testComplexRecursion() throws Exception + { + String mimeType = SCANNER.scan(ComplexRecursion.class); + assertNotNull("Unable to find xop declaration", mimeType); + assertEquals("text/plain", mimeType); + } + + public void testXOPContext() + { + SOAPMessageContextJAXWS msgContext = new SOAPMessageContextJAXWS(); + MessageContextAssociation.pushMessageContext(msgContext); + assertFalse("MTOM should be disabled", XOPContext.isMTOMEnabled()); + } + + class FieldAnnotation + { + @XmlMimeType("text/xml") + public byte[] data; + + + @XmlMimeType("text/plain") // check field level precedence + public byte[] getData() { + return data; + } + } + + class MethodAnnotation + { + private Image data; + + @XmlMimeType("image/jpeg") + public Image getData() { + return data; + } + } + + class NoAnnotation + { + private Image data; + + public Image getData() { + return data; + } + } + + interface AnnotatedSEI { + void foo(@XmlMimeType("text/xml")byte[] bar); + } + + class SimpleRecursion { + private SimpleRecursion data; + } + + class ComplexRecursion + { + String data; + Nested nested; + } + + class Nested + { + @XmlMimeType("text/plain") + String data; + } +} Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -10,8 +10,13 @@ <endpoint-config> <config-name>Standard Endpoint</config-name> </endpoint-config> - + <endpoint-config> + <config-name>Standard MTOM Endpoint</config-name> + <feature>http://org.jboss.ws/mtom</feature> + </endpoint-config> + + <endpoint-config> <config-name>Standard WSSecurity Endpoint</config-name> <pre-handler-chain> <handler-chain-name>PreHandlerChain</handler-chain-name> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/StandardTypes</service-ref-name> - <config-name>Standard MTOM disabled client</config-name> + <config-name>Standard Client</config-name> <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-marshall-rpclit?wsdl</wsdl-override> </service-ref> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -7,7 +7,7 @@ <context-param> <param-name>jbossws-config-name</param-name> - <param-value>Standard MTOM disabled endpoint</param-value> + <param-value>Standard Endpoint</param-value> </context-param> <servlet> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -16,11 +16,7 @@ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.marshall.StandardTypes</service-endpoint-interface> <service-impl-bean> <servlet-link>StandardTypes</servlet-link> - </service-impl-bean> - <handler> - <handler-name>MTOM disabled handler</handler-name> - <handler-class>org.jboss.ws.extensions.xop.DisableMTOMHandler</handler-class> - </handler> + </service-impl-bean> </port-component> </webservice-description> </webservices> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -7,8 +7,9 @@ <context-param> <param-name>jbossws-config-name</param-name>> - <param-value>Standard MTOM disabled endpoint</param-value> + <param-value>Standard Endpoint</param-value> </context-param> + <servlet> <servlet-name>OutParamTestService</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.outparam.OutParamTestServiceBean</servlet-class> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -7,8 +7,9 @@ <context-param> <param-name>jbossws-config-name</param-name>> - <param-value>Standard MTOM disabled endpoint</param-value> + <param-value>Standard Endpoint</param-value> </context-param> + <servlet> <servlet-name>TestService</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.samples.holder.HolderTestServiceBean</servlet-class> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -5,6 +5,12 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> + <context-param> + <param-name>jbossws-config-name</param-name>> + <param-value>Standard MTOM Endpoint</param-value> + </context-param> + + <servlet> <servlet-name>EmployeeEndpoint</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.samples.mtom.EmployeeRecordsImpl</servlet-class> Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop (from rev 2320, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop) Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/application-client.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -13,7 +13,7 @@ <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> </port-component-ref> </service-ref> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -1,11 +1,11 @@ <?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.samples.xop.doclit</package-type> + <package-type>org.jboss.test.ws.jaxrpc.xop.doclit</package-type> <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> </package-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type> <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingMsg</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -19,7 +19,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type> <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingMsgResponse</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -29,7 +29,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type> <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingImage</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -43,7 +43,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type> <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingImageResponse</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -53,7 +53,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type> <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingSource</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -67,7 +67,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type> <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingSourceResponse</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -77,7 +77,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type> <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingDataHandler</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -91,7 +91,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type> <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:>PingDataHandlerResponse</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -101,7 +101,7 @@ </java-xml-type-mapping> <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPingService</service-interface> + <service-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingService</service-interface> <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestService</wsdl-service-name> <port-mapping> <port-name>TestServicePort</port-name> @@ -110,7 +110,7 @@ </service-interface-mapping> <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:TestService</wsdl-port-type> <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestServiceBinding</wsdl-binding> @@ -119,7 +119,7 @@ <wsdl-operation>ping</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg</param-type> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingIn</wsdl-message> <wsdl-message-part-name>parameters</wsdl-message-part-name> @@ -127,7 +127,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse</method-return-value> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingOut</wsdl-message> <wsdl-message-part-name>parameters</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -138,7 +138,7 @@ <wsdl-operation>pingImage</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage</param-type> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageIn</wsdl-message> <wsdl-message-part-name>parameters</wsdl-message-part-name> @@ -146,7 +146,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse</method-return-value> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageOut</wsdl-message> <wsdl-message-part-name>parameters</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -157,7 +157,7 @@ <wsdl-operation>pingSource</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource</param-type> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceIn</wsdl-message> <wsdl-message-part-name>parameters</wsdl-message-part-name> @@ -165,7 +165,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse</method-return-value> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceOut</wsdl-message> <wsdl-message-part-name>parameters</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -176,7 +176,7 @@ <wsdl-operation>pingDataHandler</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler</param-type> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerIn</wsdl-message> <wsdl-message-part-name>parameters</wsdl-message-part-name> @@ -184,7 +184,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse</method-return-value> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerOut</wsdl-message> <wsdl-message-part-name>parameters</wsdl-message-part-name> </wsdl-return-value-mapping> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -5,9 +5,14 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> + <context-param> + <param-name>jbossws-config-name</param-name>> + <param-value>Standard MTOM Endpoint</param-value> + </context-param> + <servlet> <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPingImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingImpl</servlet-class> </servlet> <servlet-mapping> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/webservices.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -13,7 +13,7 @@ <port-component> <port-component-name>TestServicePort</port-component-name> <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> <service-impl-bean> <servlet-link>TestService</servlet-link> </service-impl-bean> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF/application-client.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -13,11 +13,11 @@ <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> </port-component-ref> <handler> <handler-name>XOPInlineHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.doclit.InlineHandler</handler-class> + <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class> </handler> </service-ref> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -13,10 +13,10 @@ <port-component> <port-component-name>TestServicePort</port-component-name> <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> <handler> <handler-name>XOPInlineHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.doclit.InlineHandler</handler-class> + <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class> </handler> <service-impl-bean> <servlet-link>TestService</servlet-link> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/application-client.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -13,7 +13,7 @@ <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> </port-component-ref> </service-ref> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -4,16 +4,16 @@ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.samples.xop.rpclit</package-type> + <package-type>org.jboss.test.ws.jaxrpc.xop.rpclit</package-type> <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> </package-mapping> <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.samples.xop.shared</package-type> + <package-type>org.jboss.test.ws.jaxrpc.xop.shared</package-type> <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> </package-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type> <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingInType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -27,7 +27,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type> <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingOutType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -37,7 +37,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type> <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -51,7 +51,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type> <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageOutType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -61,7 +61,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type> <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -75,7 +75,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type> <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceOutType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -85,7 +85,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type> <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHandlerType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -99,7 +99,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse</java-type> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type> <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHandlerOutType</root-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> @@ -109,7 +109,7 @@ </java-xml-type-mapping> <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPingService</service-interface> + <service-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingService</service-interface> <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestService</wsdl-service-name> <port-mapping> <port-name>TestServicePort</port-name> @@ -119,7 +119,7 @@ <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:TestService</wsdl-port-type> <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestServiceBinding</wsdl-binding> @@ -128,7 +128,7 @@ <wsdl-operation>ping</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg</param-type> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingIn</wsdl-message> <wsdl-message-part-name>parameters</wsdl-message-part-name> @@ -136,7 +136,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse</method-return-value> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingOut</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -175,7 +175,7 @@ <wsdl-operation>pingImage</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage</param-type> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageIn</wsdl-message> <wsdl-message-part-name>parameters</wsdl-message-part-name> @@ -183,7 +183,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse</method-return-value> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingImageOut</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -194,7 +194,7 @@ <wsdl-operation>pingSource</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource</param-type> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceIn</wsdl-message> <wsdl-message-part-name>parameters</wsdl-message-part-name> @@ -202,7 +202,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse</method-return-value> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingSourceOut</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> @@ -213,7 +213,7 @@ <wsdl-operation>pingDataHandler</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler</param-type> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerIn</wsdl-message> <wsdl-message-part-name>parameters</wsdl-message-part-name> @@ -221,7 +221,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse</method-return-value> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingDataHandlerOut</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -1,13 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + <context-param> + <param-name>jbossws-config-name</param-name>> + <param-value>Standard MTOM Endpoint</param-value> + </context-param> + <servlet> <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPingImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingImpl</servlet-class> </servlet> <servlet-mapping> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/webservices.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -13,7 +13,7 @@ <port-component> <port-component-name>TestServicePort</port-component-name> <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> <service-impl-bean> <servlet-link>TestService</servlet-link> </service-impl-bean> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF/application-client.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -13,11 +13,11 @@ <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> </port-component-ref> <handler> <handler-name>XOPInlineHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.InlineHandler</handler-class> + <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class> </handler> </service-ref> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -13,10 +13,10 @@ <port-component> <port-component-name>TestServicePort</port-component-name> <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> <handler> <handler-name>XOPInlineHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.InlineHandler</handler-class> + <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class> </handler> <service-impl-bean> <servlet-link>TestService</servlet-link>

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r2320 - branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-09 07:27:17 -0500 (Fri, 09 Feb 2007) New Revision: 2320 Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java Log: typo Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-02-09 12:25:45 UTC (rev 2319) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) @@ -61,8 +61,8 @@ URL wsdlURL = new URL(" http://" + getServerHost() + ":8080/jaxws-samples-wsaddressing/TestService?wsdl"); QName serviceName = new QName("http://org.jboss.ws/samples/wsaddressing", "TestService"); - Service service = Service.create(wsdlURL, serviceName); - port1 = (StatefulEndpoint)service.getPort(StatefulEndpoint.class); + Service service1 = Service.create(wsdlURL, serviceName); + port1 = (StatefulEndpoint)service1.getPort(StatefulEndpoint.class); BindingProvider bindingProvider = (BindingProvider)port1; List<Handler> customHandlerChain = new ArrayList<Handler>();

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r2319 - branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-09 07:25:45 -0500 (Fri, 09 Feb 2007) New Revision: 2319 Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java Log: typo Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-02-09 12:06:40 UTC (rev 2318) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-02-09 12:25:45 UTC (rev 2319) @@ -61,8 +61,8 @@ URL wsdlURL = new URL(" http://" + getServerHost() + ":8080/jaxws-samples-wsaddressing/TestService?wsdl"); QName serviceName = new QName("http://org.jboss.ws/samples/wsaddressing", "TestService"); - Service service1 = Service.create(wsdlURL, serviceName); - port1 = (StatefulEndpoint)service1.getPort(StatefulEndpoint.class); + Service service = Service.create(wsdlURL, serviceName); + port1 = (StatefulEndpoint)service.getPort(StatefulEndpoint.class); BindingProvider bindingProvider = (BindingProvider)port1; List<Handler> customHandlerChain = new ArrayList<Handler>();

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r2318 - in branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss: ws/annotation and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-09 07:06:40 -0500 (Fri, 09 Feb 2007) New Revision: 2318 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/annotation/security/SecurityDomain.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/annotation/WebContext.java Log: javadoc Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/annotation/security/SecurityDomain.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/annotation/security/SecurityDomain.java 2007-02-09 11:24:31 UTC (rev 2317) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/annotation/security/SecurityDomain.java 2007-02-09 12:06:40 UTC (rev 2318) @@ -21,6 +21,8 @@ */ package org.jboss.annotation.security; +// $Id$ + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -28,18 +30,24 @@ /** * Annotation for specifying the JBoss security domain for an EJB - * DO NOT USE THE JNDI NAME: - * - "java:/jaas/MyDomain" ILLEGAL - * - "MyDomain" GOOD - * + * * @author <a href="mailto:bill@jboss.org">Bill Burke</a> - * @version $Revision$ - * **/ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface SecurityDomain { + /** + * The required name for the security domain. + * + * Do not use the JNDI name + * + * Good: "MyDomain" + * Bad: "java:/jaas/MyDomain" + */ String value(); + /** + * The name for the unauthenticated pricipal + */ String unauthenticatedPrincipal() default ""; } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java 2007-02-09 11:24:31 UTC (rev 2317) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java 2007-02-09 12:06:40 UTC (rev 2318) @@ -55,5 +55,4 @@ * Client side default: standard-jaxws-client-config.xml */ String configFile() default ""; - } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/annotation/WebContext.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/annotation/WebContext.java 2007-02-09 11:24:31 UTC (rev 2317) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/annotation/WebContext.java 2007-02-09 12:06:40 UTC (rev 2318) @@ -88,8 +88,7 @@ * A secure endpoint does not by default publish it's wsdl on an unsecure transport. * You can override this behaviour by explicitly setting the secureWSDLAccess flag to false. * - * Protect access to WSDL - * http://jira.jboss.org/jira/browse/JBWS-723 + * Protect access to WSDL. See http://jira.jboss.org/jira/browse/JBWS-723 */ boolean secureWSDLAccess() default true;

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r2317 - branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/annotation.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-09 06:24:31 -0500 (Fri, 09 Feb 2007) New Revision: 2317 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java Log: javadoc Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java 2007-02-09 11:16:25 UTC (rev 2316) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java 2007-02-09 11:24:31 UTC (rev 2317) @@ -1,13 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.annotation; +// $Id: $ + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** + * Defines an endpoint or client configuration. + * This annotation is valid on an endpoint implementaion bean or a SEI. + * * @author Heiko.Braun(a)jboss.org - * @version $Id$ * @since 16.01.2007 */ @Retention(value = RetentionPolicy.RUNTIME) @@ -15,7 +40,7 @@ public @interface EndpointConfig { /** - * The optional config-name element gives the client configuration name that must be present in + * The optional config-name element gives the configuration name that must be present in * the configuration given by element config-file. * * Server side default: Standard Endpoint @@ -24,10 +49,10 @@ String configName() default ""; /** - * The optional config-file element gives the to a URL or resource name for the configuration. + * The optional config-file element is a URL or resource name for the configuration. * - * Server side default: standard-jaxrpc-endpoint-config.xml, standard-jaxws-endpoint-config.xml - * Client side default: standard-jaxrpc-client-config.xml, standard-jaxws-client-config.xml + * Server side default: standard-jaxws-endpoint-config.xml + * Client side default: standard-jaxws-client-config.xml */ String configFile() default "";

17 years, 7 months

1
0
0 / 0

JBossWS SVN: r2316 - in branches/jbossws-1.2.0: jbossws-tests and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-09 06:16:25 -0500 (Fri, 09 Feb 2007) New Revision: 2316 Modified: branches/jbossws-1.2.0/build/hudson/jboss/bin/jboss.sh branches/jbossws-1.2.0/build/hudson/jboss/bin/runjboss.sh branches/jbossws-1.2.0/jbossws-tests/build.xml Log: echo jboss startup env Modified: branches/jbossws-1.2.0/build/hudson/jboss/bin/jboss.sh =================================================================== --- branches/jbossws-1.2.0/build/hudson/jboss/bin/jboss.sh 2007-02-09 10:55:59 UTC (rev 2315) +++ branches/jbossws-1.2.0/build/hudson/jboss/bin/jboss.sh 2007-02-09 11:16:25 UTC (rev 2316) @@ -23,7 +23,7 @@ # This version of run.sh obtains the pid of the JVM and saves it as jboss.pid # It relies on bash specific features # Do you want to hide jboss output? - /bin/bash $DIRNAME/runjboss.sh &> /dev/null & + /bin/bash $DIRNAME/runjboss.sh & sleep 20 ;; stop) Modified: branches/jbossws-1.2.0/build/hudson/jboss/bin/runjboss.sh =================================================================== --- branches/jbossws-1.2.0/build/hudson/jboss/bin/runjboss.sh 2007-02-09 10:55:59 UTC (rev 2315) +++ branches/jbossws-1.2.0/build/hudson/jboss/bin/runjboss.sh 2007-02-09 11:16:25 UTC (rev 2316) @@ -140,7 +140,7 @@ "$JAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -classpath "$JBOSS_CLASSPATH" \ - org.jboss.Main "$@" & + org.jboss.Main "$@" &> /dev/null & echo $! > $JBOSS_HOME/bin/jboss.pid fg STATUS=$? Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-09 10:55:59 UTC (rev 2315) +++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-09 11:16:25 UTC (rev 2316) @@ -421,9 +421,8 @@  <target name="tests-main" depends="init"> <mkdir dir="${tests.output.dir}/reports"/> - <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}" fork="yes" forkmode="perBatch"> + <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}"> <jvmarg value="-Djava.security.manager"/> - <jvmarg value="-DXmx256m"/> <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> <sysproperty key="client.scenario" value="${client.scenario}"/> <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>

17 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits February 2007