jbossws-commits June 2007

jbossws-commits@lists.jboss.org

1 participants
421 discussions

JBossWS SVN: r3499 - in trunk: jbossws-core/src/main/etc and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-08 04:59:52 -0400 (Fri, 08 Jun 2007) New Revision: 3499 Removed: trunk/build/etc/wspublish.sh trunk/build/etc/wsrunclient.bat trunk/build/etc/wsrunclient.sh trunk/build/etc/wstools.bat trunk/build/etc/wstools.sh Modified: trunk/jbossws-core/src/main/etc/wsrunclient.bat trunk/jbossws-core/src/main/etc/wsrunclient.sh Log: Fix JBWS-1690 Deleted: trunk/build/etc/wspublish.sh =================================================================== --- trunk/build/etc/wspublish.sh 2007-06-08 08:56:06 UTC (rev 3498) +++ trunk/build/etc/wspublish.sh 2007-06-08 08:59:52 UTC (rev 3499) @@ -1,74 +0,0 @@ -#!/bin/sh - -# $Id: wspublish.sh 3101 2007-05-16 08:26:33Z heiko.braun(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 "$TOMCAT_HOME" ] && - TOMCAT_HOME=`cygpath --unix "$TOMCAT_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi -export TOMCAT_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 WSPUBLISH classpath -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/jbossws-thirdparty.jar" -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/jbossws-core.jar" -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/log4j.jar" -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/servlet-api.jar" - - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - TOMCAT_HOME=`cygpath --path --windows "$TOMCAT_HOME"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - WSPUBLISH_CLASSPATH=`cygpath --path --windows "$WSPUBLISH_CLASSPATH"` -fi - -# Display our environment -echo "=========================================================================" -echo "" -echo " WSPUBLISH Environment" -echo "" -echo " TOMCAT_HOME: $TOMCAT_HOME" -echo "" -echo " JAVA: $JAVA" -echo "" -echo " JAVA_OPTS: $JAVA_OPTS" -echo "" -#echo " CLASSPATH: $WSPUBLISH_CLASSPATH" -#echo "" -echo "=========================================================================" -echo "" - -# Execute the JVM -"$JAVA" $JAVA_OPTS \ - -classpath "$WSPUBLISH_CLASSPATH" \ - org.jboss.ws.tools.wspublish -dest $TOMCAT_HOME/webapps "$@" - Deleted: trunk/build/etc/wsrunclient.bat =================================================================== --- trunk/build/etc/wsrunclient.bat 2007-06-08 08:56:06 UTC (rev 3498) +++ trunk/build/etc/wsrunclient.bat 2007-06-08 08:59:52 UTC (rev 3499) @@ -1,63 +0,0 @@ -@echo off - -rem $Id: wsprovide.bat 2325 2007-02-09 22:14:15Z 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% - - -if not [%1] == [] goto start - echo %PROGNAME% is a command line tool that invokes a JBossWS JAX-WS Web Service client. - echo It builds the correct classpath and endorsed libs for you. Feel free to use - echo the code for this script to make your own shell scripts. It is open source - echo after all. - echo. - echo usage: %PROGNAME% [-classpath ^<additional class path^>] ^<java-main-class^> [arguments...] - goto EOF -:start -set ARGS= -:loop -if [%1] == [] goto endloop - if not %1 == -classpath goto argset - set WSRUNCLIENT_CLASSPATH=%2 - shift - shift - goto loop - :argset - set ARGS=%ARGS% %1 - shift - goto loop -:endloop - -set JAVA=%JAVA_HOME%\bin\java -set JBOSS_HOME=%DIRNAME%\.. -rem Setup the java endorsed dirs -set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed - -rem Setup the wstools classpath -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/activation.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-j2ee.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/mail.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar - -rem Execute the JVM -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS% -:EOF Deleted: trunk/build/etc/wsrunclient.sh =================================================================== --- trunk/build/etc/wsrunclient.sh 2007-06-08 08:56:06 UTC (rev 3498) +++ trunk/build/etc/wsrunclient.sh 2007-06-08 08:59:52 UTC (rev 3499) @@ -1,101 +0,0 @@ -#!/bin/sh - -# $Id: wsprovide 2325 2007-02-09 22:14:15Z jason.greene(a)jboss.com $ -DIRNAME=`dirname $0` -PROGNAME=`basename $0` - -if [ $# -eq 0 ]; then - echo "$PROGNAME is a command line tool that invokes a JBossWS JAX-WS Web Service client." - echo "It builds the correct classpath and endorsed libs for you. Feel free to use" - echo "the code for this script to make your own shell scripts. It is open source" - echo "after all." - echo - echo "usage: $PROGNAME [-classpath <additional class path>] <java-main-class> [arguments...]" - exit 1; -fi - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JBOSS_HOME" ] && - JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# 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 -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/getopt.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/javassist.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-j2ee.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-ejb3x.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wstx.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" - -while [ $# -ge 1 ]; do - case $1 in - "-classpath") WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$2"; shift;; - *) args="$args \"$1\"";; - esac - shift -done - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - WSRUNCLIENT_CLASSPATH=`cygpath --path --windows "$WSRUNCLIENT_CLASSPATH"` - JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` -fi - -# Execute the JVM -eval "$JAVA" $JAVA_OPTS \ - -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ - -Dlog4j.configuration=wstools-log4j.xml \ - -classpath "$WSRUNCLIENT_CLASSPATH" \ - "$args" Deleted: trunk/build/etc/wstools.bat =================================================================== --- trunk/build/etc/wstools.bat 2007-06-08 08:56:06 UTC (rev 3498) +++ trunk/build/etc/wstools.bat 2007-06-08 08:59:52 UTC (rev 3499) @@ -1,62 +0,0 @@ -@echo off - -rem $Id: wstools.bat 2156 2007-01-27 05:59:35Z 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 WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/activation.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossretro-rt.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-backport-concurrent.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws14-client.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/mail.jar - -rem Display our environment -echo =========================================================================" -echo . -echo WSTools Environment -echo . -echo JBOSS_HOME: %JBOSS_HOME% -echo . -echo JAVA: %JAVA% -echo . -echo JAVA_OPTS: %JAVA_OPTS% -echo . -rem echo CLASSPATH: %WSTOOLS_CLASSPATH% -rem echo . -echo =========================================================================" -echo . - -rem Execute the JVM -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSTOOLS_CLASSPATH%" org.jboss.ws.tools.WSTools %* - Deleted: trunk/build/etc/wstools.sh =================================================================== --- trunk/build/etc/wstools.sh 2007-06-08 08:56:06 UTC (rev 3498) +++ trunk/build/etc/wstools.sh 2007-06-08 08:59:52 UTC (rev 3499) @@ -1,90 +0,0 @@ -#!/bin/sh - -# $Id: wstools.sh 2157 2007-01-27 06:03:58Z 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 -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/javassist.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossretro-rt.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-backport-concurrent.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws14-client.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_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"` - WSTOOLS_CLASSPATH=`cygpath --path --windows "$WSTOOLS_CLASSPATH"` - JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` -fi - -# Display our environment -echo "=========================================================================" -echo "" -echo " WSTools Environment" -echo "" -echo " JBOSS_HOME: $JBOSS_HOME" -echo "" -echo " JAVA: $JAVA" -echo "" -echo " JAVA_OPTS: $JAVA_OPTS" -echo "" -#echo " CLASSPATH: $WSTOOLS_CLASSPATH" -#echo "" -echo "=========================================================================" -echo "" - -# Execute the JVM -"$JAVA" $JAVA_OPTS \ - -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ - -Dlog4j.configuration=wstools-log4j.xml \ - -classpath "$WSTOOLS_CLASSPATH" \ - org.jboss.ws.tools.WSTools "$@" Modified: trunk/jbossws-core/src/main/etc/wsrunclient.bat =================================================================== --- trunk/jbossws-core/src/main/etc/wsrunclient.bat 2007-06-08 08:56:06 UTC (rev 3498) +++ trunk/jbossws-core/src/main/etc/wsrunclient.bat 2007-06-08 08:59:52 UTC (rev 3499) @@ -56,6 +56,7 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/mail.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar rem Execute the JVM "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS% :EOF Modified: trunk/jbossws-core/src/main/etc/wsrunclient.sh =================================================================== --- trunk/jbossws-core/src/main/etc/wsrunclient.sh 2007-06-08 08:56:06 UTC (rev 3498) +++ trunk/jbossws-core/src/main/etc/wsrunclient.sh 2007-06-08 08:59:52 UTC (rev 3499) @@ -74,6 +74,7 @@ WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wstx.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" while [ $# -ge 1 ]; do case $1 in

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3498 - in trunk: jbossws-core/src/main/etc and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-08 04:56:06 -0400 (Fri, 08 Jun 2007) New Revision: 3498 Modified: trunk/build/etc/wsrunclient.bat trunk/build/etc/wsrunclient.sh trunk/jbossws-core/src/main/etc/wstools.bat trunk/jbossws-core/src/main/etc/wstools.sh Log: Fix JBWS-1690 Modified: trunk/build/etc/wsrunclient.bat =================================================================== --- trunk/build/etc/wsrunclient.bat 2007-06-08 08:47:00 UTC (rev 3497) +++ trunk/build/etc/wsrunclient.bat 2007-06-08 08:56:06 UTC (rev 3498) @@ -56,6 +56,8 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/mail.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar + rem Execute the JVM "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS% :EOF Modified: trunk/build/etc/wsrunclient.sh =================================================================== --- trunk/build/etc/wsrunclient.sh 2007-06-08 08:47:00 UTC (rev 3497) +++ trunk/build/etc/wsrunclient.sh 2007-06-08 08:56:06 UTC (rev 3498) @@ -71,9 +71,11 @@ WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wstx.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" while [ $# -ge 1 ]; do case $1 in Modified: trunk/jbossws-core/src/main/etc/wstools.bat =================================================================== --- trunk/jbossws-core/src/main/etc/wstools.bat 2007-06-08 08:47:00 UTC (rev 3497) +++ trunk/jbossws-core/src/main/etc/wstools.bat 2007-06-08 08:56:06 UTC (rev 3498) @@ -37,8 +37,8 @@ set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossretro-rt.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-backport-concurrent.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws14-client.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/mail.jar rem Display our environment Modified: trunk/jbossws-core/src/main/etc/wstools.sh =================================================================== --- trunk/jbossws-core/src/main/etc/wstools.sh 2007-06-08 08:47:00 UTC (rev 3497) +++ trunk/jbossws-core/src/main/etc/wstools.sh 2007-06-08 08:56:06 UTC (rev 3498) @@ -52,10 +52,10 @@ WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/javassist.jar" WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossretro-rt.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-backport-concurrent.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws14-client.jar" +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-backport-concurrent.jar" WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/log4j.jar" +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/mail.jar" # For Cygwin, switch paths to Windows format before running java

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3497 - trunk/jbossws-core/ant-import-tests.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-08 04:47:00 -0400 (Fri, 08 Jun 2007) New Revision: 3497 Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml Log: Typo Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-07 14:56:10 UTC (rev 3496) +++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-08 08:47:00 UTC (rev 3497) @@ -206,7 +206,7 @@ </classes> </war> -  +  <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1566/**/*.class"/>

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3496 - branches/jbossws-1.2.1.GA_JBWS-1703/build/etc.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 10:56:10 -0400 (Thu, 07 Jun 2007) New Revision: 3496 Modified: branches/jbossws-1.2.1.GA_JBWS-1703/build/etc/wstools.bat branches/jbossws-1.2.1.GA_JBWS-1703/build/etc/wstools.sh Log: JBWS-1703 - Updated wstools scrips to include wsdl4j.jar in the classpath. Modified: branches/jbossws-1.2.1.GA_JBWS-1703/build/etc/wstools.bat =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/build/etc/wstools.bat 2007-06-07 14:20:15 UTC (rev 3495) +++ branches/jbossws-1.2.1.GA_JBWS-1703/build/etc/wstools.bat 2007-06-07 14:56:10 UTC (rev 3496) @@ -40,6 +40,7 @@ set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws14-client.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/mail.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar rem Display our environment echo =========================================================================" Modified: branches/jbossws-1.2.1.GA_JBWS-1703/build/etc/wstools.sh =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/build/etc/wstools.sh 2007-06-07 14:20:15 UTC (rev 3495) +++ branches/jbossws-1.2.1.GA_JBWS-1703/build/etc/wstools.sh 2007-06-07 14:56:10 UTC (rev 3496) @@ -57,6 +57,7 @@ WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/log4j.jar" WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/mail.jar" +WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" # For Cygwin, switch paths to Windows format before running java if $cygwin; then

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3495 - in branches/jbossws-1.2.1.GA_JBWS-1703: jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 10:20:15 -0400 (Thu, 07 Jun 2007) New Revision: 3495 Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/client/ServiceCreator.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java Log: JBWS-1703 - Package updates post merge to old structure. Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/client/ServiceCreator.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-06-07 14:10:06 UTC (rev 3494) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-06-07 14:20:15 UTC (rev 3495) @@ -34,7 +34,7 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.interfaces.ServiceCreatorIntf; -import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.ws.core.utils.JavaUtils;; /** * Creates the Service Interface<br> Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-06-07 14:10:06 UTC (rev 3494) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-06-07 14:20:15 UTC (rev 3495) @@ -24,7 +24,7 @@ import java.io.File; import java.io.FilenameFilter; -import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools;

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3494 - in branches/jbossws-1.2.1.GA_JBWS-1703: jbossws-core/src/java/org/jboss/ws/tools/client and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 10:10:06 -0400 (Thu, 07 Jun 2007) New Revision: 3494 Added: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1691/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBookService.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/wstools-config.xml Removed: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBookService.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/wstools-config.xml Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/client/ServiceCreator.java Log: JBWS-1703 - WSDL To Java - Initial Character of Service and SEI names should be upper case. Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 14:07:03 UTC (rev 3493) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 14:10:06 UTC (rev 3494) @@ -183,7 +183,6 @@ File dirloc = utils.createPackage(dir.getAbsolutePath(), packageName); createSEI(dirloc, wsdl); - //xsdJava.generateJavaSource(wsdl.getTypes().getSchemaModel(), dir, packageName, true); } public Map<String, String> getNamespacePackageMap() @@ -665,7 +664,9 @@ //Check if the portType name conflicts with a service name if (wsdl.getService(seiName) != null) seiName += "_PortType"; - + + seiName = JavaUtils.capitalize(seiName); + return seiName; } Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/client/ServiceCreator.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-06-07 14:07:03 UTC (rev 3493) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-06-07 14:10:06 UTC (rev 3494) @@ -1,24 +1,24 @@ /* -* 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. -*/ + * 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.client; import java.io.File; @@ -34,6 +34,7 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.interfaces.ServiceCreatorIntf; +import org.jboss.wsf.spi.utils.JavaUtils; /** * Creates the Service Interface<br> @@ -50,17 +51,17 @@ */ public class ServiceCreator implements ServiceCreatorIntf -{ +{ /** * The Package Name */ protected String packageName = null; - + /** * Directory Location where the service file has to be created */ - protected File dirLocation = null; - + protected File dirLocation = null; + /** * Root object of the WSDL Object Graph */ @@ -68,26 +69,26 @@ /** Singleton class that handles many utility functions */ private WSDLUtils utils = WSDLUtils.getInstance(); - + /** * Constructor */ public ServiceCreator() - { + { } - + /** * Constructor * @param serviceName Service Name * @param portName Port Name of the endpoint * @param packageName Package Name of the Service interface */ - public ServiceCreator( WSDLDefinitions wsdl, String packageName) - { + public ServiceCreator(WSDLDefinitions wsdl, String packageName) + { this.wsdl = wsdl; this.packageName = packageName; - } - + } + /** * Constructor * WebServices Layer uses this @@ -96,12 +97,12 @@ * @param packageName Package Name of the Service interface * @param location Directory Location where the Service File has to be created */ - public ServiceCreator( WSDLDefinitions wsdl, String packageName, File location ) + public ServiceCreator(WSDLDefinitions wsdl, String packageName, File location) { - this( wsdl, packageName); + this(wsdl, packageName); this.dirLocation = location; - } - + } + /** * @return Returns the dirLocation. */ @@ -132,12 +133,12 @@ public void setPackageName(String packageName) { this.packageName = packageName; - } - + } + /** * @see #wsdl * @return - */ + */ public WSDLDefinitions getWsdl() { return wsdl; @@ -158,23 +159,23 @@ * */ public void createServiceDescriptor() throws IOException - { - if( packageName == null) - throw new WSException("package name is null"); - if(dirLocation == null) - throw new WSException("dir location is null"); - if(wsdl == null) - throw new WSException("wsdl definitions is null"); - + { + if (packageName == null) + throw new WSException("package name is null"); + if (dirLocation == null) + throw new WSException("dir location is null"); + if (wsdl == null) + throw new WSException("wsdl definitions is null"); + WSDLService[] services = wsdl.getServices(); - int len = services != null ? services.length : 0; - for(int i = 0 ; i < len ; i++) + int len = services != null ? services.length : 0; + for (int i = 0; i < len; i++) { generateServiceFile(services[i]); - } + } } - + //PRIVATE METHODS private void generateHeader(StringBuilder buf) { @@ -184,78 +185,77 @@ buf.append("*/" + newLine(2)); buf.append("//Auto Generated by jbossws - Please do not edit!!!"); buf.append(newLine(2)); - } + } private void generatePackageNameAndImport(StringBuilder buf) { - buf.append("package " + packageName + ";" + newLine(3)); + buf.append("package " + packageName + ";" + newLine(3)); buf.append("import javax.xml.rpc.*; " + newLine(3)); } - - + private String getReturnType(WSDLBinding wbind) { String portType = wbind.getInterface().getName().getLocalPart(); portType = utils.chopPortType(portType); - + //Check if it conflicts with a service name - if(wsdl.getService(portType) != null) + if (wsdl.getService(portType) != null) portType += "_PortType"; - return packageName + "." + portType ; + return packageName + "." + JavaUtils.capitalize(portType); } - - private void generateServiceFile(WSDLService wsdlService) throws IOException - { + { String serviceName = wsdlService.getName().getLocalPart(); if (serviceName.endsWith("Service") == false) serviceName = serviceName + "Service"; - + //Check if the serviceName conflicts with a portType or interface name - if(wsdl.getInterface(new QName(wsdl.getTargetNamespace(), serviceName)) != null ) + if (wsdl.getInterface(new QName(wsdl.getTargetNamespace(), serviceName)) != null) serviceName = new StringBuilder(serviceName).insert(serviceName.lastIndexOf("Service"), '_').toString(); - + + serviceName = JavaUtils.capitalize(serviceName); + StringBuilder buf = new StringBuilder(); generateHeader(buf); - generatePackageNameAndImport(buf); - - buf.append("public interface " + serviceName + " extends javax.xml.rpc.Service" + newLine(1)); + generatePackageNameAndImport(buf); + + buf.append("public interface " + serviceName + " extends javax.xml.rpc.Service" + newLine(1)); buf.append("{" + newLine(2)); - + WSDLEndpoint[] endpts = wsdlService.getEndpoints(); - int len = endpts != null ? endpts.length : 0; - - for( int i = 0 ; i < len ; i++) + int len = endpts != null ? endpts.length : 0; + + for (int i = 0; i < len; i++) buf.append(generateServiceMethodForWSDLEndpoint(endpts[i])).append(newLine(1)); - + buf.append("}" + newLine(1)); - + File loc = utils.createPackage(dirLocation.getAbsolutePath(), packageName); File sei = utils.createPhysicalFile(loc, serviceName); FileWriter writer = new FileWriter(sei); writer.write(buf.toString()); writer.flush(); writer.close(); - } - + } + private String generateServiceMethodForWSDLEndpoint(WSDLEndpoint endpt) { StringBuilder buf = new StringBuilder(" public "); QName bindName = endpt.getBinding(); WSDLBinding wbind = wsdl.getBinding(bindName); - - buf.append(getReturnType(wbind)).append(" get"); + + buf.append(getReturnType(wbind)).append(" get"); buf.append(endpt.getName().getLocalPart()).append("()").append(" throws ServiceException;").append(newLine(1)); return buf.toString(); } - + private String newLine(int times) - { + { String newline = "\n"; StringBuilder buf = new StringBuilder(newline); - for(int i = 0; i < times -1 ; i++) + for (int i = 0; i < times - 1; i++) buf.append(newline); return buf.toString(); } -} \ No newline at end of file +} \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1691 (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2007-06-07 12:20:41 UTC (rev 3484) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2007-06-07 14:10:06 UTC (rev 3494) @@ -1,105 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.tools.jbws1691; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.WSToolsTest; -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; - -/** - * Test case for http://jira.jboss.com/jira/browse/JBWS-1691 - * - * WSDL To Java should ensure the first charachter in the - * Service and SEI name are upper case. - * - * @author darran.lofthouse(a)jboss.com - * @since Jun 7, 2007 - */ -public class JBWS1691TestCase extends WSToolsTest -{ - - public void testGenerateLowerCase() throws Exception - { - generateScenario("lowercase"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1691/" + scenario; - String toolsDir = "tools/jbws1691/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1691/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1691"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = false; - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2007-06-07 14:10:06 UTC (rev 3494) @@ -0,0 +1,105 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.tools.jbws1691; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; + +/** + * Test case for http://jira.jboss.com/jira/browse/JBWS-1691 + * + * WSDL To Java should ensure the first charachter in the + * Service and SEI name are upper case. + * + * @author darran.lofthouse(a)jboss.com + * @since Jun 7, 2007 + */ +public class JBWS1691TestCase extends WSToolsTest +{ + + public void testGenerateLowerCase() throws Exception + { + generateScenario("lowercase"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1691/" + scenario; + String toolsDir = "tools/jbws1691/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1691/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1691"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = false; + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691 (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691) Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl 2007-06-07 12:20:41 UTC (rev 3484) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBook.wsdl 2007-06-07 14:10:06 UTC (rev 3494) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1691' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1691/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1691' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1691/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1691/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <element name='lookup' type='string'/> - <element name='lookupResponse' type='string'/> - </schema> - </types> - - <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part element='ns1:lookup' name='lookup'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='lookupResponse'/> - </message> - <portType name='phoneBook'> - <operation name='lookup' parameterOrder='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:phoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='phoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBook.wsdl (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBook.wsdl 2007-06-07 14:10:06 UTC (rev 3494) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1691' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1691/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1691' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1691/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1691/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <element name='lookup' type='string'/> + <element name='lookupResponse' type='string'/> + </schema> + </types> + + <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part element='ns1:lookup' name='lookup'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='lookupResponse'/> + </message> + <portType name='phoneBook'> + <operation name='lookup' parameterOrder='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:phoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='phoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBookService.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java 2007-06-07 12:20:41 UTC (rev 3484) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBookService.java 2007-06-07 14:10:06 UTC (rev 3494) @@ -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.jbws1691; - - -import javax.xml.rpc.*; - - -public interface PhoneBookService extends javax.xml.rpc.Service -{ - - public org.jboss.test.ws.jbws1691.PhoneBook_PortType getPhoneBookPort() throws ServiceException; - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBookService.java (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBookService.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBookService.java 2007-06-07 14:10:06 UTC (rev 3494) @@ -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.jbws1691; + + +import javax.xml.rpc.*; + + +public interface PhoneBookService extends javax.xml.rpc.Service +{ + + public org.jboss.test.ws.jbws1691.PhoneBook_PortType getPhoneBookPort() throws ServiceException; + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java 2007-06-07 12:20:41 UTC (rev 3484) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java 2007-06-07 14:10:06 UTC (rev 3494) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jun 07 13:52:44 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1691; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public java.lang.String lookup(java.lang.String lookup) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java 2007-06-07 14:10:06 UTC (rev 3494) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jun 07 13:52:44 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1691; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public java.lang.String lookup(java.lang.String lookup) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2007-06-07 12:20:41 UTC (rev 3484) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2007-06-07 14:10:06 UTC (rev 3494) @@ -1,37 +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.jbws1691</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1691</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1691.phoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1691'>serviceNS:phoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1691.phoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1691'>portTypeNS:phoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1691'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</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://test.jboss.org/ws/jbws1691'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>lookup</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1691'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2007-06-07 14:10:06 UTC (rev 3494) @@ -0,0 +1,37 @@ +<?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.jbws1691</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1691</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1691.phoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1691'>serviceNS:phoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1691.phoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1691'>portTypeNS:phoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1691'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</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://test.jboss.org/ws/jbws1691'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>lookup</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1691'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml 2007-06-07 12:20:41 UTC (rev 3484) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/wstools-config.xml 2007-06-07 14:10:06 UTC (rev 3494) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1691/lowercase/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/wstools-config.xml (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1691/lowercase/wstools-config.xml 2007-06-07 14:10:06 UTC (rev 3494) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1691/lowercase/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3493 - in branches/jbossws-1.2.1.GA_JBWS-1703: jbossws-tests/src/java/org/jboss/test/ws/tools and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 10:07:03 -0400 (Thu, 07 Jun 2007) New Revision: 3493 Added: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1698/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBookError.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBookFault.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/wstools-config.xml Removed: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBookError.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBookFault.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/wstools-config.xml Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java Log: JBWS-1703 - WSDL To Java - If fault name contains 'Fault' the generated Exception does not match the throws clause on the SEI. Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 14:04:36 UTC (rev 3492) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -327,7 +327,7 @@ if (cl == null) { String faultTypeName = (!xt.getAnonymous()) ? faultXMLType.getLocalPart() : faultXMLName.getLocalPart(); - buf.append(seiPkgName + "." + cleanUpFaultName(faultTypeName)); + buf.append(seiPkgName + "." + JavaUtils.capitalize(faultTypeName)); } else buf.append(cl.getName()); buf.append(","); @@ -441,10 +441,10 @@ XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI()); XSTypeDefinition xt = xe.getTypeDefinition(); QName xmlType = new QName(xt.getNamespace(), xt.getName()); - + // Replace the xt with the real type from the schema. xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); - + if (buf.length() > 0) { buf.append(", "); @@ -754,33 +754,6 @@ return cls.getName() + arraySuffix; } - /** - * WSDL may have appended the Faults with 'Fault' or 'Error' - * @param faultname - * @return - */ - private String cleanUpFaultName(String faultname) - { - //Clean up the faultname from Error and Fault - boolean endsfault = faultname.endsWith("Fault"); - - if (endsfault) - { - int index = faultname.lastIndexOf("Fault"); - faultname = faultname.substring(0, index); - } - else - { - boolean endsError = faultname.endsWith("Error"); - if (endsError) - { - int index = faultname.lastIndexOf("Error"); - faultname = faultname.substring(0, index); - } - } - return JavaUtils.capitalize(faultname); - } - private void checkTypeMapping() { if (typeMapping == null) Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1698 (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1698) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2007-06-06 13:30:09 UTC (rev 3470) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -1,116 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.tools.jbws1698; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.WSToolsTest; -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; - -/** - * Test case for http://jira.jboss.com/jira/browse/JBWS-1698 - * - * WSDL To Java does not use the correct name in the throws - * clause for faults that end in 'Fault' - * - * @author darran.lofthouse(a)jboss.com - * @since Jun 6, 2007 - */ -public class JBWS1698TestCase extends WSToolsTest -{ - - /** - * Test WSDL to Java with a fault called PhoneBookFault - */ - public void testGenerateFault() throws Exception - { - generateScenario("fault"); - } - - /** - * Test WSDL to Java with a fault called PhoneBookError - */ - public void testGenerateError() throws Exception - { - generateScenario("error"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1698/" + scenario; - String toolsDir = "tools/jbws1698/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1698/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1698"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -0,0 +1,116 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.tools.jbws1698; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; + +/** + * Test case for http://jira.jboss.com/jira/browse/JBWS-1698 + * + * WSDL To Java does not use the correct name in the throws + * clause for faults that end in 'Fault' + * + * @author darran.lofthouse(a)jboss.com + * @since Jun 6, 2007 + */ +public class JBWS1698TestCase extends WSToolsTest +{ + + /** + * Test WSDL to Java with a fault called PhoneBookFault + */ + public void testGenerateFault() throws Exception + { + generateScenario("fault"); + } + + /** + * Test WSDL to Java with a fault called PhoneBookError + */ + public void testGenerateError() throws Exception + { + generateScenario("error"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1698/" + scenario; + String toolsDir = "tools/jbws1698/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1698/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1698"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698 (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698) Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/Person.java 2007-06-06 13:30:09 UTC (rev 3470) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/Person.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Jun 06 14:58:58 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1698; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/Person.java (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/Person.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Jun 06 14:58:58 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1698; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBook.wsdl 2007-06-06 13:30:09 UTC (rev 3470) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBook.wsdl 2007-06-07 14:07:03 UTC (rev 3493) @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1698' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1698/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1698' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1698/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1698/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - <complexType name='PhoneBookError'> - <sequence/> - </complexType> - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - <element name='PhoneBookError' type='tns:PhoneBookError'/> - </schema> - </types> - - <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part element='ns1:lookup' name='lookup'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='lookupResponse'/> - </message> - <message name='PhoneBookError'> - <part element='ns1:PhoneBookError' name='PhoneBookError'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup' parameterOrder='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - <fault message='tns:PhoneBookError' name='PhoneBookError'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - <fault name='PhoneBookError'> - <soap:fault name='PhoneBookError' use='literal'/> - </fault> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBook.wsdl (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBook.wsdl 2007-06-07 14:07:03 UTC (rev 3493) @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1698' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1698/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1698' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1698/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1698/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + <complexType name='PhoneBookError'> + <sequence/> + </complexType> + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + <element name='PhoneBookError' type='tns:PhoneBookError'/> + </schema> + </types> + + <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part element='ns1:lookup' name='lookup'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='lookupResponse'/> + </message> + <message name='PhoneBookError'> + <part element='ns1:PhoneBookError' name='PhoneBookError'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup' parameterOrder='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + <fault message='tns:PhoneBookError' name='PhoneBookError'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + <fault name='PhoneBookError'> + <soap:fault name='PhoneBookError' use='literal'/> + </fault> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBookError.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBookError.java 2007-06-06 13:30:09 UTC (rev 3470) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBookError.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -1,18 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Jun 06 14:58:58 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1698; - - -public class PhoneBookError - extends Exception{ -public PhoneBookError(){ -} -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBookError.java (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBookError.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBookError.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBookError.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -0,0 +1,18 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Jun 06 14:58:58 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1698; + + +public class PhoneBookError + extends Exception{ +public PhoneBookError(){ +} +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBook_PortType.java 2007-06-06 13:30:09 UTC (rev 3470) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBook_PortType.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Jun 06 14:58:58 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1698; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1698.TelephoneNumber lookup(org.jboss.test.ws.jbws1698.Person lookup) throws org.jboss.test.ws.jbws1698.PhoneBookError, java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBook_PortType.java (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/PhoneBook_PortType.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Jun 06 14:58:58 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1698; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1698.TelephoneNumber lookup(org.jboss.test.ws.jbws1698.Person lookup) throws org.jboss.test.ws.jbws1698.PhoneBookError, java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/TelephoneNumber.java 2007-06-06 13:30:09 UTC (rev 3470) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/TelephoneNumber.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Jun 06 14:58:58 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1698; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/TelephoneNumber.java (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/TelephoneNumber.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Jun 06 14:58:58 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1698; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/jaxrpc-mapping.xml 2007-06-06 13:30:09 UTC (rev 3470) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/jaxrpc-mapping.xml 2007-06-07 14:07:03 UTC (rev 3493) @@ -1,76 +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.jbws1698</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1698/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1698</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1698</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1698.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1698.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1698.PhoneBookError</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:PhoneBookError</root-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <exception-mapping> - <exception-type>org.jboss.test.ws.jbws1698.PhoneBookError</exception-type> - <wsdl-message xmlns:exMsgNS='http://test.jboss.org/ws/jbws1698'>exMsgNS:PhoneBookError</wsdl-message> - </exception-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1698.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1698'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1698.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1698'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1698'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1698.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1698'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>lookup</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.jbws1698.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1698'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/jaxrpc-mapping.xml (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/jaxrpc-mapping.xml 2007-06-07 14:07:03 UTC (rev 3493) @@ -0,0 +1,76 @@ +<?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.jbws1698</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1698/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1698</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1698</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1698.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1698.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1698.PhoneBookError</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:PhoneBookError</root-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <exception-mapping> + <exception-type>org.jboss.test.ws.jbws1698.PhoneBookError</exception-type> + <wsdl-message xmlns:exMsgNS='http://test.jboss.org/ws/jbws1698'>exMsgNS:PhoneBookError</wsdl-message> + </exception-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1698.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1698'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1698.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1698'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1698'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1698.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1698'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>lookup</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.jbws1698.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1698'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/wstools-config.xml 2007-06-06 13:30:09 UTC (rev 3470) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/wstools-config.xml 2007-06-07 14:07:03 UTC (rev 3493) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1698/error/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/wstools-config.xml (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/error/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/error/wstools-config.xml 2007-06-07 14:07:03 UTC (rev 3493) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1698/error/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/Person.java 2007-06-06 13:30:09 UTC (rev 3470) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/Person.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Jun 06 14:58:58 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1698; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/Person.java (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/Person.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Jun 06 14:58:58 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1698; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBook.wsdl 2007-06-06 13:30:09 UTC (rev 3470) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBook.wsdl 2007-06-07 14:07:03 UTC (rev 3493) @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1698' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1698/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1698' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1698/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1698/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - <complexType name='PhoneBookFault'> - <sequence/> - </complexType> - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - <element name='PhoneBookFault' type='tns:PhoneBookFault'/> - </schema> - </types> - - <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part element='ns1:lookup' name='lookup'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='lookupResponse'/> - </message> - <message name='PhoneBookFault'> - <part element='ns1:PhoneBookFault' name='PhoneBookFault'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup' parameterOrder='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - <fault message='tns:PhoneBookFault' name='PhoneBookFault'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - <fault name='PhoneBookFault'> - <soap:fault name='PhoneBookFault' use='literal'/> - </fault> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBook.wsdl (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBook.wsdl 2007-06-07 14:07:03 UTC (rev 3493) @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1698' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1698/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1698' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1698/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1698/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + <complexType name='PhoneBookFault'> + <sequence/> + </complexType> + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + <element name='PhoneBookFault' type='tns:PhoneBookFault'/> + </schema> + </types> + + <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part element='ns1:lookup' name='lookup'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='lookupResponse'/> + </message> + <message name='PhoneBookFault'> + <part element='ns1:PhoneBookFault' name='PhoneBookFault'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup' parameterOrder='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + <fault message='tns:PhoneBookFault' name='PhoneBookFault'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + <fault name='PhoneBookFault'> + <soap:fault name='PhoneBookFault' use='literal'/> + </fault> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBookFault.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBookFault.java 2007-06-06 13:30:09 UTC (rev 3470) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBookFault.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -1,18 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Jun 06 14:58:58 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1698; - - -public class PhoneBookFault - extends Exception{ -public PhoneBookFault(){ -} -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBookFault.java (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBookFault.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBookFault.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBookFault.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -0,0 +1,18 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Jun 06 14:58:58 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1698; + + +public class PhoneBookFault + extends Exception{ +public PhoneBookFault(){ +} +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBook_PortType.java 2007-06-06 13:30:09 UTC (rev 3470) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBook_PortType.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Jun 06 14:58:58 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1698; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1698.TelephoneNumber lookup(org.jboss.test.ws.jbws1698.Person lookup) throws org.jboss.test.ws.jbws1698.PhoneBookFault, java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBook_PortType.java (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/PhoneBook_PortType.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Jun 06 14:58:58 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1698; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1698.TelephoneNumber lookup(org.jboss.test.ws.jbws1698.Person lookup) throws org.jboss.test.ws.jbws1698.PhoneBookFault, java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/TelephoneNumber.java 2007-06-06 13:30:09 UTC (rev 3470) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/TelephoneNumber.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Jun 06 14:58:58 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1698; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/TelephoneNumber.java (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/TelephoneNumber.java 2007-06-07 14:07:03 UTC (rev 3493) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Jun 06 14:58:58 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1698; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/jaxrpc-mapping.xml 2007-06-06 13:30:09 UTC (rev 3470) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/jaxrpc-mapping.xml 2007-06-07 14:07:03 UTC (rev 3493) @@ -1,76 +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.jbws1698</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1698/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1698</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1698</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1698.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1698.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1698.PhoneBookFault</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:PhoneBookFault</root-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <exception-mapping> - <exception-type>org.jboss.test.ws.jbws1698.PhoneBookFault</exception-type> - <wsdl-message xmlns:exMsgNS='http://test.jboss.org/ws/jbws1698'>exMsgNS:PhoneBookFault</wsdl-message> - </exception-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1698.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1698'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1698.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1698'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1698'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1698.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1698'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>lookup</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.jbws1698.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1698'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/jaxrpc-mapping.xml (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/jaxrpc-mapping.xml 2007-06-07 14:07:03 UTC (rev 3493) @@ -0,0 +1,76 @@ +<?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.jbws1698</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1698/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1698</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1698</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1698.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1698.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1698.PhoneBookFault</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1698/types'>typeNS:PhoneBookFault</root-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <exception-mapping> + <exception-type>org.jboss.test.ws.jbws1698.PhoneBookFault</exception-type> + <wsdl-message xmlns:exMsgNS='http://test.jboss.org/ws/jbws1698'>exMsgNS:PhoneBookFault</wsdl-message> + </exception-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1698.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1698'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1698.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1698'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1698'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1698.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1698'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>lookup</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.jbws1698.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1698'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/wstools-config.xml 2007-06-06 13:30:09 UTC (rev 3470) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/wstools-config.xml 2007-06-07 14:07:03 UTC (rev 3493) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1698/fault/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/wstools-config.xml (from rev 3470, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1698/fault/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1698/fault/wstools-config.xml 2007-06-07 14:07:03 UTC (rev 3493) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1698/fault/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3492 - in branches/jbossws-1.2.1.GA_JBWS-1703: jbossws-core/src/java/org/jboss/ws/tools/helpers and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 10:04:36 -0400 (Thu, 07 Jun 2007) New Revision: 3492 Added: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1697/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/wstools-config.xml Removed: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/wstools-config.xml Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: JBWS-1703 - WSDL To Java - Incorrect handling of Simple types derived by restriction for holders. Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 14:02:07 UTC (rev 3491) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 14:04:36 UTC (rev 3492) @@ -441,7 +441,10 @@ XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI()); XSTypeDefinition xt = xe.getTypeDefinition(); QName xmlType = new QName(xt.getNamespace(), xt.getName()); - + + // Replace the xt with the real type from the schema. + xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); + if (buf.length() > 0) { buf.append(", "); Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-07 14:02:07 UTC (rev 3491) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-07 14:04:36 UTC (rev 3492) @@ -373,6 +373,11 @@ XSTypeDefinition xt = xe.getTypeDefinition(); QName xmlType = new QName(xt.getNamespace(), xt.getName()); + // Replace the xt with the real type from the schema. + xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); + if (xt instanceof XSSimpleTypeDefinition) + xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); + String partName = header.getPartName(); MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition, wsdlMessageName, mode, partName, false, true); @@ -460,11 +465,11 @@ wrvm.setWsdlMessagePartName(partName); semm.setWsdlReturnValueMapping(wrvm); } - + if (bindingOperation != null) { constructHeaderParameters(semm, wiop, bindingOperation); - } + } } public void constructJavaXmlTypeMapping(JavaWsdlMapping jwm) Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1697 (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2007-06-06 11:07:27 UTC (rev 3466) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2007-06-07 14:04:36 UTC (rev 3492) @@ -1,121 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.tools.jbws1697; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.WSToolsTest; -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; - -/** - * Test case for http://jira.jboss.com/jira/browse/JBWS-1697 - * - * WSDL to Java, handling of holders for simple types defined by restriction. - * - * @author darran.lofthouse(a)jboss.com - * @since Jun 6, 2007 - */ -public class JBWS1697TestCase extends WSToolsTest -{ - - /** - * Test WSDL to Java with the a document/literal endpoint - * where the message part is the same for both the input - * and output message. - * - */ - public void testGenerateDocLitInOut() throws Exception - { - generateScenario("doclit_inout"); - } - - /** - * Test WSDL to Java with a rpc/literal endpoint - * where a matching message part is in the request - * and response messages. - * - */ - public void testGenerateRpcLitInOut() throws Exception - { - generateScenario("rpclit_inout"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1697/" + scenario; - String toolsDir = "tools/jbws1697/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1697/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1697"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2007-06-07 14:04:36 UTC (rev 3492) @@ -0,0 +1,121 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.tools.jbws1697; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.WSToolsTest; +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; + +/** + * Test case for http://jira.jboss.com/jira/browse/JBWS-1697 + * + * WSDL to Java, handling of holders for simple types defined by restriction. + * + * @author darran.lofthouse(a)jboss.com + * @since Jun 6, 2007 + */ +public class JBWS1697TestCase extends WSToolsTest +{ + + /** + * Test WSDL to Java with the a document/literal endpoint + * where the message part is the same for both the input + * and output message. + * + */ + public void testGenerateDocLitInOut() throws Exception + { + generateScenario("doclit_inout"); + } + + /** + * Test WSDL to Java with a rpc/literal endpoint + * where a matching message part is in the request + * and response messages. + * + */ + public void testGenerateRpcLitInOut() throws Exception + { + generateScenario("rpclit_inout"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1697/" + scenario; + String toolsDir = "tools/jbws1697/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1697/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1697"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697 (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697) Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl 2007-06-06 11:07:27 UTC (rev 3466) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl 2007-06-07 14:04:36 UTC (rev 3492) @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1697' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1697/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1697' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1697/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1697/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <simpleType name='Person'> - <restriction base='string'> - <pattern value="[a-zA-Z]*"/> - </restriction> - </simpleType> - - <simpleType name='BillingAccount'> - <restriction base='string'> - <pattern value="[a-zA-Z]*"/> - </restriction> - </simpleType> - - <element name='lookup' type='tns:Person'/> - <element name='account' type='tns:BillingAccount'/> - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='lookup'/> - <part element='ns1:account' name='header'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookup' name='lookup'/> - <part element='ns1:account' name='header'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal' parts='lookup'/> - <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' /> - </input> - <output> - <soap:body use='literal' parts='lookup'/> - <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' /> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl 2007-06-07 14:04:36 UTC (rev 3492) @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1697' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1697/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1697' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1697/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1697/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <simpleType name='Person'> + <restriction base='string'> + <pattern value="[a-zA-Z]*"/> + </restriction> + </simpleType> + + <simpleType name='BillingAccount'> + <restriction base='string'> + <pattern value="[a-zA-Z]*"/> + </restriction> + </simpleType> + + <element name='lookup' type='tns:Person'/> + <element name='account' type='tns:BillingAccount'/> + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='lookup'/> + <part element='ns1:account' name='header'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookup' name='lookup'/> + <part element='ns1:account' name='header'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='lookup'/> + <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' /> + </input> + <output> + <soap:body use='literal' parts='lookup'/> + <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' /> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java 2007-06-06 11:07:27 UTC (rev 3466) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java 2007-06-07 14:04:36 UTC (rev 3492) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Jun 06 11:54:39 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1697; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public void lookup(javax.xml.rpc.holders.StringHolder lookup, javax.xml.rpc.holders.StringHolder header) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/PhoneBook_PortType.java 2007-06-07 14:04:36 UTC (rev 3492) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Jun 06 11:54:39 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1697; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public void lookup(javax.xml.rpc.holders.StringHolder lookup, javax.xml.rpc.holders.StringHolder header) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml 2007-06-06 11:07:27 UTC (rev 3466) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml 2007-06-07 14:04:36 UTC (rev 3492) @@ -1,41 +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.jbws1697</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1697</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1697.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1697'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1697.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1697'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1697'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</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://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>lookup</wsdl-message-part-name> - <parameter-mode>INOUT</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>header</wsdl-message-part-name> - <parameter-mode>INOUT</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/jaxrpc-mapping.xml 2007-06-07 14:04:36 UTC (rev 3492) @@ -0,0 +1,41 @@ +<?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.jbws1697</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1697</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1697.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1697'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1697.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1697'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1697'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</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://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>lookup</wsdl-message-part-name> + <parameter-mode>INOUT</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>1</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>header</wsdl-message-part-name> + <parameter-mode>INOUT</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml 2007-06-06 11:07:27 UTC (rev 3466) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/wstools-config.xml 2007-06-07 14:04:36 UTC (rev 3492) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/wstools-config.xml (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/doclit_inout/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/doclit_inout/wstools-config.xml 2007-06-07 14:04:36 UTC (rev 3492) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1697/doclit_inout/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl 2007-06-06 11:07:27 UTC (rev 3466) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl 2007-06-07 14:04:36 UTC (rev 3492) @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1697' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1697/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1697' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1697/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1697/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <simpleType name='Person'> - <restriction base='string'> - <pattern value="[a-zA-Z]*"/> - </restriction> - </simpleType> - - <simpleType name='BillingAccount'> - <restriction base='string'> - <pattern value="[a-zA-Z]*"/> - </restriction> - </simpleType> - - <element name='billingAccount' type='tns:BillingAccount'/> - </schema> - </types> - - <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='Person_1' type='ns1:Person'/> - <part name='Account_1' element='ns1:billingAccount'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part name='Person_1' type='ns1:Person'/> - <part name='Account_1' element='ns1:billingAccount'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup' parameterOrder='Person_1'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' /> - <soap:header message="tns:PhoneBook_lookup" - part="Account_1" use="literal" /> - </input> - <output> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> - <soap:header message="tns:PhoneBook_lookupResponse" - part="Account_1" use="literal" /> - </output> - </operation> - </binding> - - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl 2007-06-07 14:04:36 UTC (rev 3492) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1697' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1697/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1697' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1697/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1697/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <simpleType name='Person'> + <restriction base='string'> + <pattern value="[a-zA-Z]*"/> + </restriction> + </simpleType> + + <simpleType name='BillingAccount'> + <restriction base='string'> + <pattern value="[a-zA-Z]*"/> + </restriction> + </simpleType> + + <element name='billingAccount' type='tns:BillingAccount'/> + </schema> + </types> + + <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='Person_1' type='ns1:Person'/> + <part name='Account_1' element='ns1:billingAccount'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part name='Person_1' type='ns1:Person'/> + <part name='Account_1' element='ns1:billingAccount'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup' parameterOrder='Person_1'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' /> + <soap:header message="tns:PhoneBook_lookup" + part="Account_1" use="literal" /> + </input> + <output> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> + <soap:header message="tns:PhoneBook_lookupResponse" + part="Account_1" use="literal" /> + </output> + </operation> + </binding> + + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java 2007-06-06 11:07:27 UTC (rev 3466) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java 2007-06-07 14:04:36 UTC (rev 3492) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Jun 06 12:40:50 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1697; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public void lookup(javax.xml.rpc.holders.StringHolder person_1, javax.xml.rpc.holders.StringHolder Account_1) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/PhoneBook_PortType.java 2007-06-07 14:04:36 UTC (rev 3492) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Jun 06 12:40:50 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1697; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public void lookup(javax.xml.rpc.holders.StringHolder person_1, javax.xml.rpc.holders.StringHolder Account_1) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml 2007-06-06 11:07:27 UTC (rev 3466) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml 2007-06-07 14:04:36 UTC (rev 3492) @@ -1,41 +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.jbws1697</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1697</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1697.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1697'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1697.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1697'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1697'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</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://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Person_1</wsdl-message-part-name> - <parameter-mode>INOUT</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>Account_1</wsdl-message-part-name> - <parameter-mode>INOUT</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/jaxrpc-mapping.xml 2007-06-07 14:04:36 UTC (rev 3492) @@ -0,0 +1,41 @@ +<?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.jbws1697</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1697</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1697.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1697'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1697.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1697'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1697'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</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://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Person_1</wsdl-message-part-name> + <parameter-mode>INOUT</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>1</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1697'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>Account_1</wsdl-message-part-name> + <parameter-mode>INOUT</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml 2007-06-06 11:07:27 UTC (rev 3466) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/wstools-config.xml 2007-06-07 14:04:36 UTC (rev 3492) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/wstools-config.xml (from rev 3466, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1697/rpclit_inout/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1697/rpclit_inout/wstools-config.xml 2007-06-07 14:04:36 UTC (rev 3492) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1697/rpclit_inout/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3491 - in branches/jbossws-1.2.1.GA_JBWS-1703: jbossws-core/src/java/org/jboss/ws/tools and 14 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 10:02:07 -0400 (Thu, 07 Jun 2007) New Revision: 3491 Added: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/HeaderUtil.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/NickName.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/NickName.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/wstools-config.xml Removed: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/NickName.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/NickName.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/wstools-config.xml Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java Log: JBWS-1703 - WSDL To Java - Add support for bound headers. Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2007-06-07 13:53:53 UTC (rev 3490) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -189,6 +189,11 @@ WSDLInterfaceOperationOutput opOutput = (WSDLInterfaceOperationOutput)outputs.get(qname); return opOutput; } + + public void removeOutput(QName element) + { + outputs.remove(element); + } public WSDLInterfaceOperationOutput getOutputByPartName(String partName) { Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/HeaderUtil.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/HeaderUtil.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/HeaderUtil.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/HeaderUtil.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,94 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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; + +import java.util.ArrayList; + +import javax.xml.namespace.QName; + +import org.jboss.ws.metadata.wsdl.WSDLBinding; +import org.jboss.ws.metadata.wsdl.WSDLBindingMessageReference; +import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLInterface; +import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; +import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; + +/** + * Collection of static methods required for processing + * bound headers in WSDL to Java so they can be re-used for + * the JAX-RPC generation. + * + * @author darran.lofthouse(a)jboss.com + * @since 29 May 2007 + */ +public class HeaderUtil +{ + + public static WSDLBindingOperation getWSDLBindingOperation(final WSDLDefinitions wsdl, final WSDLInterfaceOperation operation) + { + WSDLBindingOperation bindingOperation = null; + + WSDLInterface wsdlInterface = operation.getWsdlInterface(); + QName operationName = operation.getName(); + + WSDLBinding binding = wsdl.getBindingByInterfaceName(wsdlInterface.getName()); + bindingOperation = binding.getOperationByRef(operationName); + + return bindingOperation; + } + + public static WSDLSOAPHeader[] getSignatureHeaders(final WSDLBindingMessageReference[] refs) + { + ArrayList<WSDLSOAPHeader> headers = new ArrayList<WSDLSOAPHeader>(); + + if (refs != null) + { + for (WSDLBindingMessageReference current : refs) + { + for (WSDLSOAPHeader header : current.getSoapHeaders()) + { + headers.add(header); + } + } + } + + return headers.toArray(new WSDLSOAPHeader[headers.size()]); + } + + public static boolean containsMatchingPart(WSDLSOAPHeader[] headers, WSDLSOAPHeader header) + { + for (WSDLSOAPHeader current : headers) + { + if (current.getPartName().equals(header.getPartName())) + { + if (current.getElement().equals(header.getElement())) + { + return true; + } + } + } + + return false; + } + +} Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 13:53:53 UTC (rev 3490) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -45,6 +45,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.jaxrpc.LiteralTypeMapping; import org.jboss.ws.core.utils.JavaUtils; +import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLException; import org.jboss.ws.metadata.wsdl.WSDLInterface; @@ -54,6 +55,7 @@ import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutfault; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; import org.jboss.ws.metadata.wsdl.WSDLRPCPart; +import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; @@ -195,7 +197,7 @@ public void setNamespacePackageMap(Map<String, String> map) { //Lets convert the package->namespace map to namespace->package map - Set keys = map.keySet(); + Set<String> keys = map.keySet(); Iterator<String> iter = keys.iterator(); while (iter != null && iter.hasNext()) { @@ -271,10 +273,12 @@ throw new IllegalArgumentException("Interface " + itfname + " doesn't have operations"); int len = ops != null ? ops.length : 0; - // FIXME - Add support for headers for (int i = 0; i < len; i++) { WSDLInterfaceOperation op = ops[i]; + + WSDLBindingOperation bindingOperation = HeaderUtil.getWSDLBindingOperation(wsdl, op); + //TODO: Take care of multiple outputs String returnType = null; @@ -284,11 +288,11 @@ WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(op); if (isDocument()) { - returnType = appendDocParameters(paramBuffer, input, output); + returnType = appendDocParameters(paramBuffer, input, output, bindingOperation); } else { - returnType = appendRpcParameters(paramBuffer, op, output); + returnType = appendRpcParameters(paramBuffer, op, output, bindingOperation); } if (returnType == null) @@ -334,7 +338,8 @@ } } - private String appendRpcParameters(StringBuilder paramBuffer, WSDLInterfaceOperation op, WSDLInterfaceOperationOutput output) throws IOException + private String appendRpcParameters(StringBuilder paramBuffer, WSDLInterfaceOperation op, WSDLInterfaceOperationOutput output, WSDLBindingOperation bindingOperation) + throws IOException { String returnType = null; boolean first = true; @@ -366,10 +371,16 @@ returnType = getReturnType(xmlName, xmlType, xt); } + if (bindingOperation != null) + { + appendHeaderParameters(paramBuffer, bindingOperation); + } + return returnType; } - private String appendDocParameters(StringBuilder paramBuffer, WSDLInterfaceOperationInput input, WSDLInterfaceOperationOutput output) throws IOException + private String appendDocParameters(StringBuilder paramBuffer, WSDLInterfaceOperationInput input, WSDLInterfaceOperationOutput output, + WSDLBindingOperation bindingOperation) throws IOException { String returnType = null; boolean holder = false; @@ -391,9 +402,55 @@ returnType = getReturnType(xmlName, xmlType, xt); } + if (bindingOperation != null) + { + appendHeaderParameters(paramBuffer, bindingOperation); + } + return returnType; } + private void appendHeaderParameters(StringBuilder buf, WSDLBindingOperation bindingOperation) throws IOException + { + WSDLSOAPHeader[] inputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getInputs()); + WSDLSOAPHeader[] outputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getOutputs()); + + // Process Inputs First + for (WSDLSOAPHeader currentInput : inputHeaders) + { + boolean holder = HeaderUtil.containsMatchingPart(outputHeaders, currentInput); + appendHeaderParameter(buf, currentInput, holder); + } + + for (WSDLSOAPHeader currentOutput : outputHeaders) + { + boolean input = HeaderUtil.containsMatchingPart(inputHeaders, currentOutput); + + if (input == true) + continue; + + appendHeaderParameter(buf, currentOutput, true); + } + } + + private void appendHeaderParameter(StringBuilder buf, WSDLSOAPHeader header, boolean holder) throws IOException + { + QName elementName = header.getElement(); + + JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); + XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI()); + XSTypeDefinition xt = xe.getTypeDefinition(); + QName xmlType = new QName(xt.getNamespace(), xt.getName()); + + if (buf.length() > 0) + { + buf.append(", "); + } + + generateParameter(buf, "", xmlType, xsmodel, xt, false, true, holder); + buf.append(" ").append(header.getPartName()); + } + private void appendParameters(StringBuilder buf, WSDLInterfaceOperationInput in, WSDLInterfaceOperationOutput output, String containingElement) throws IOException { @@ -778,4 +835,5 @@ { this.parameterStyle = paramStyle; } + } Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-07 13:53:53 UTC (rev 3490) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -59,6 +59,7 @@ import org.jboss.ws.metadata.jaxrpcmapping.WsdlMessageMapping; import org.jboss.ws.metadata.jaxrpcmapping.WsdlReturnValueMapping; import org.jboss.ws.metadata.wsdl.WSDLBinding; +import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLInterface; @@ -69,11 +70,13 @@ import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; import org.jboss.ws.metadata.wsdl.WSDLProperty; import org.jboss.ws.metadata.wsdl.WSDLRPCPart; +import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLTypes; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; +import org.jboss.ws.tools.HeaderUtil; import org.jboss.ws.tools.RPCSignature; import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.WSToolsConstants; @@ -216,15 +219,22 @@ semm.setWsdlOperation(opname); semm.setWrappedElement(isWrapped()); + WSDLBindingOperation bindingOperation = HeaderUtil.getWSDLBindingOperation(wsdlDefinitions, wiop); + if (isDocStyle()) - constructDOCParameters(semm, wiop); - else constructRPCParameters(semm, wiop); + { + constructDOCParameters(semm, wiop, bindingOperation); + } + else + { + constructRPCParameters(semm, wiop, bindingOperation); + } seim.addServiceEndpointMethodMapping(semm); } } - private void constructDOCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop) + private void constructDOCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop, WSDLBindingOperation bindingOperation) { WSDLInterfaceOperationInput win = WSDLUtils.getWsdl11Input(wiop); WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(wiop); @@ -301,26 +311,92 @@ } } - //Check it is a holder. If it is, return - if (wiop.getInputByPartName(xmlName.getLocalPart()) != null) - return; + //Check it is a holder. + if (wiop.getInputByPartName(xmlName.getLocalPart()) == null) + { - if (xt instanceof XSSimpleTypeDefinition) - xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); + if (xt instanceof XSSimpleTypeDefinition) + xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); - String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive); + String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive); - if (isDocStyle() == false && "void".equals(javaType)) - return; + if ((isDocStyle() == false && "void".equals(javaType)) == false) + { + WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm); + wrvm.setMethodReturnValue(javaType); + wrvm.setWsdlMessage(messageName); + wrvm.setWsdlMessagePartName(partName); + semm.setWsdlReturnValueMapping(wrvm); + } + } + } - WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm); - wrvm.setMethodReturnValue(javaType); - wrvm.setWsdlMessage(messageName); - wrvm.setWsdlMessagePartName(partName); - semm.setWsdlReturnValueMapping(wrvm); + if (bindingOperation != null) + { + constructHeaderParameters(semm, wiop, bindingOperation); } } + private void constructHeaderParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop, WSDLBindingOperation bindingOperation) + { + WSDLSOAPHeader[] inputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getInputs()); + WSDLSOAPHeader[] outputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getOutputs()); + + String wsdlMessageName = bindingOperation.getWsdlBinding().getInterface().getName().getLocalPart(); + int paramPosition = 1; + + for (WSDLSOAPHeader currentInput : inputHeaders) + { + boolean inOutput = HeaderUtil.containsMatchingPart(outputHeaders, currentInput); + String mode = getMode(true, inOutput); + + constructHeaderParameter(semm, currentInput, paramPosition++, wsdlMessageName, mode); + } + + for (WSDLSOAPHeader currentOutput : outputHeaders) + { + boolean inInput = HeaderUtil.containsMatchingPart(inputHeaders, currentOutput); + + if (inInput == true) + continue; + + constructHeaderParameter(semm, currentOutput, paramPosition++, wsdlMessageName, "OUT"); + } + } + + private void constructHeaderParameter(ServiceEndpointMethodMapping semm, WSDLSOAPHeader header, int paramPosition, String wsdlMessageName, String mode) + { + QName elementName = header.getElement(); + + JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); + XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI()); + XSTypeDefinition xt = xe.getTypeDefinition(); + QName xmlType = new QName(xt.getNamespace(), xt.getName()); + + String partName = header.getPartName(); + + MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition, wsdlMessageName, mode, partName, false, true); + semm.addMethodParamPartsMapping(mpin); + } + + private String getMode(final boolean input, final boolean output) + { + if (input == true & output == true) + { + return "INOUT"; + } + else if (input == true) + { + return "IN"; + } + else if (output == true) + { + return "OUT"; + } + + return ""; + } + private String getMode(WSDLInterfaceOperation op, String name) { WSDLInterfaceOperationInput in = WSDLUtils.getWsdl11Input(op); @@ -341,7 +417,7 @@ return "IN"; } - private void constructRPCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop) + private void constructRPCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop, WSDLBindingOperation bindingOperation) { WSDLInterfaceOperationInput win = WSDLUtils.getWsdl11Input(wiop); if (win == null) @@ -384,6 +460,11 @@ wrvm.setWsdlMessagePartName(partName); semm.setWsdlReturnValueMapping(wrvm); } + + if (bindingOperation != null) + { + constructHeaderParameters(semm, wiop, bindingOperation); + } } public void constructJavaXmlTypeMapping(JavaWsdlMapping jwm) @@ -447,10 +528,32 @@ jwm.addExceptionMappings(exceptionMapping); } } + + WSDLBindingOperation bindingOperation = HeaderUtil.getWSDLBindingOperation(wsdlDefinitions, op); + if (bindingOperation != null) + { + constructHeaderJavaXmlTypeMapping(jwm, HeaderUtil.getSignatureHeaders(bindingOperation.getInputs())); + constructHeaderJavaXmlTypeMapping(jwm, HeaderUtil.getSignatureHeaders(bindingOperation.getOutputs())); + } + }//end for } } + public void constructHeaderJavaXmlTypeMapping(JavaWsdlMapping jwm, WSDLSOAPHeader[] headers) + { + for (WSDLSOAPHeader current : headers) + { + QName elementName = current.getElement(); + + JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); + XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI()); + XSTypeDefinition xt = xe.getTypeDefinition(); + + addJavaXMLTypeMap(xt, elementName.getLocalPart(), "", "", jwm, true); + } + } + private boolean unwrapRequest(ServiceEndpointMethodMapping methodMapping, String messageName, String containingElement, XSTypeDefinition xt) { if (xt instanceof XSComplexTypeDefinition == false) @@ -761,14 +864,12 @@ */ if (xmlType.getNamespaceURI().equals(Constants.NS_SCHEMA_XSD) && "anyType".equals(xmlType.getLocalPart()) && javaType == Element.class) javaType = SOAPElement.class; - javaType = this.makeCustomDecisions(javaType, xmlName, xmlType); + javaType = this.makeCustomDecisions(javaType, xmlType); if (javaType == null) { - if (log.isDebugEnabled()) - log.debug("Typemapping lookup failed for " + xmlName); - if (log.isDebugEnabled()) - log.debug("Falling back to identifier generation"); + log.debug("Typemapping lookup failed for " + xmlName); + log.debug("Falling back to identifier generation"); String className = xmlType.getLocalPart(); if (className.charAt(0) == '>') className = className.substring(1); @@ -833,7 +934,7 @@ * @param xmlName * @param xmlType */ - private Class makeCustomDecisions(Class javaType, QName xmlName, QName xmlType) + private Class makeCustomDecisions(Class javaType, QName xmlType) { if (javaType != null && xmlType != null) { Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-06-07 13:53:53 UTC (rev 3490) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1105,7 +1105,7 @@ { WSDLInterfaceOperationOutput destIntfOutput = destIntfOperation.getOutput(element); if (destIntfOutput != null) - destIntfOperation.removeInput(element); + destIntfOperation.removeOutput(element); } public void removeRPCPart(String partName) Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597 (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1597) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,136 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.tools.jbws1597; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 27 Apr 2007 - */ -public class JBWS1597TestCase extends JBossWSTest -{ - - public void testGenerateDocLitIn() throws Exception - { - generateScenario("doclit_in"); - } - - public void testGenerateDocLitOut() throws Exception - { - generateScenario("doclit_out"); - } - - public void testGenerateDocLitInOut() throws Exception - { - generateScenario("doclit_inout"); - } - - public void testGenerateDocLitInAndOut() throws Exception - { - generateScenario("doclit_in_and_out"); - } - - public void testGenerateRpcLitIn() throws Exception - { - generateScenario("rpclit_in"); - } - - public void testGenerateRpcLitOut() throws Exception - { - generateScenario("rpclit_out"); - } - - public void testGenerateRpcLitInOut() throws Exception - { - generateScenario("rpclit_inout"); - } - - public void testGenerateRpcLitInAndOut() throws Exception - { - generateScenario("rpclit_in_and_out"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1597/" + scenario; - String toolsDir = "tools/jbws1597/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1597/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1597"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,136 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.tools.jbws1597; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 27 Apr 2007 + */ +public class JBWS1597TestCase extends JBossWSTest +{ + + public void testGenerateDocLitIn() throws Exception + { + generateScenario("doclit_in"); + } + + public void testGenerateDocLitOut() throws Exception + { + generateScenario("doclit_out"); + } + + public void testGenerateDocLitInOut() throws Exception + { + generateScenario("doclit_inout"); + } + + public void testGenerateDocLitInAndOut() throws Exception + { + generateScenario("doclit_in_and_out"); + } + + public void testGenerateRpcLitIn() throws Exception + { + generateScenario("rpclit_in"); + } + + public void testGenerateRpcLitOut() throws Exception + { + generateScenario("rpclit_out"); + } + + public void testGenerateRpcLitInOut() throws Exception + { + generateScenario("rpclit_inout"); + } + + public void testGenerateRpcLitInAndOut() throws Exception + { + generateScenario("rpclit_in_and_out"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1597/" + scenario; + String toolsDir = "tools/jbws1597/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1597/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1597"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597 (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597) Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/BillingAccount.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 15:19:38 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class BillingAccount -{ - -protected java.lang.String sortCode; - -protected java.lang.String accountNumber; -public BillingAccount(){} - -public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ -this.sortCode=sortCode; -this.accountNumber=accountNumber; -} -public java.lang.String getSortCode() { return sortCode ;} - -public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } - -public java.lang.String getAccountNumber() { return accountNumber ;} - -public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/BillingAccount.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 15:19:38 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class BillingAccount +{ + +protected java.lang.String sortCode; + +protected java.lang.String accountNumber; +public BillingAccount(){} + +public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ +this.sortCode=sortCode; +this.accountNumber=accountNumber; +} +public java.lang.String getSortCode() { return sortCode ;} + +public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } + +public java.lang.String getAccountNumber() { return accountNumber ;} + +public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/Person.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 15:19:38 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 15:19:38 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1597' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1597' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1597/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='BillingAccount'> - <sequence> - <element name='sortCode' nillable='true' type='string'/> - <element name='accountNumber' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - <element name='billingAccount' type='tns:BillingAccount'/> - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - <part element='ns1:billingAccount' name='header'/> - </message> - - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal' parts='parameters'/> - <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' /> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1597' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1597' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1597/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='BillingAccount'> + <sequence> + <element name='sortCode' nillable='true' type='string'/> + <element name='accountNumber' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + <element name='billingAccount' type='tns:BillingAccount'/> + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + <part element='ns1:billingAccount' name='header'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters'/> + <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' /> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 15:19:38 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1597; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccount header) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 15:19:38 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1597; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccount header) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/TelephoneNumber.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 15:19:38 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 15:19:38 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,89 +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.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>sortCode</java-variable-name> - <xml-element-name>sortCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>accountNumber</java-variable-name> - <xml-element-name>accountNumber</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1597.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</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>org.jboss.test.ws.jbws1597.BillingAccount</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>header</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.jbws1597.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,89 @@ +<?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.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>sortCode</java-variable-name> + <xml-element-name>sortCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>accountNumber</java-variable-name> + <xml-element-name>accountNumber</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1597.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</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>org.jboss.test.ws.jbws1597.BillingAccount</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>header</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.jbws1597.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/wstools-config.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1597/doclit_in/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1597/doclit_in/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 17:26:46 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class BillingAccount -{ - -protected java.lang.String sortCode; - -protected java.lang.String accountNumber; -public BillingAccount(){} - -public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ -this.sortCode=sortCode; -this.accountNumber=accountNumber; -} -public java.lang.String getSortCode() { return sortCode ;} - -public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } - -public java.lang.String getAccountNumber() { return accountNumber ;} - -public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 17:26:46 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class BillingAccount +{ + +protected java.lang.String sortCode; + +protected java.lang.String accountNumber; +public BillingAccount(){} + +public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ +this.sortCode=sortCode; +this.accountNumber=accountNumber; +} +public java.lang.String getSortCode() { return sortCode ;} + +public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } + +public java.lang.String getAccountNumber() { return accountNumber ;} + +public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,28 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 17:26:46 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - -public class BillingAccountHolder implements javax.xml.rpc.holders.Holder -{ - - public org.jboss.test.ws.jbws1597.BillingAccount value; - - public BillingAccountHolder() - { - this.value = new org.jboss.test.ws.jbws1597.BillingAccount(); - } - - public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value) - { - this.value = value; - } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/BillingAccountHolder.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,28 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 17:26:46 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + +public class BillingAccountHolder implements javax.xml.rpc.holders.Holder +{ + + public org.jboss.test.ws.jbws1597.BillingAccount value; + + public BillingAccountHolder() + { + this.value = new org.jboss.test.ws.jbws1597.BillingAccount(); + } + + public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value) + { + this.value = value; + } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/NickName.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/NickName.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/NickName.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 17:26:46 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class NickName -{ - -protected java.lang.String name; -public NickName(){} - -public NickName(java.lang.String name){ -this.name=name; -} -public java.lang.String getName() { return name ;} - -public void setName(java.lang.String name){ this.name=name; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/NickName.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/NickName.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/NickName.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/NickName.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 17:26:46 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class NickName +{ + +protected java.lang.String name; +public NickName(){} + +public NickName(java.lang.String name){ +this.name=name; +} +public java.lang.String getName() { return name ;} + +public void setName(java.lang.String name){ this.name=name; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/Person.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 17:26:46 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 17:26:46 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1597' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1597' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1597/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='NickName'> - <sequence> - <element name='name' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='BillingAccount'> - <sequence> - <element name='sortCode' nillable='true' type='string'/> - <element name='accountNumber' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - <element name='nickName' type='tns:NickName'/> - <element name='billingAccount' type='tns:BillingAccount'/> - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - <part element='ns1:nickName' name='inHeader'/> - </message> - - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - <part element='ns1:billingAccount' name='outHeader'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal' parts='parameters' /> - <soap:header use='literal' message='tns:PhoneBook_lookup' part='inHeader' /> - </input> - <output> - <soap:body use='literal' parts='result' /> - <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='outHeader' /> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1597' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1597' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1597/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='NickName'> + <sequence> + <element name='name' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='BillingAccount'> + <sequence> + <element name='sortCode' nillable='true' type='string'/> + <element name='accountNumber' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + <element name='nickName' type='tns:NickName'/> + <element name='billingAccount' type='tns:BillingAccount'/> + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + <part element='ns1:nickName' name='inHeader'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + <part element='ns1:billingAccount' name='outHeader'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters' /> + <soap:header use='literal' message='tns:PhoneBook_lookup' part='inHeader' /> + </input> + <output> + <soap:body use='literal' parts='result' /> + <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='outHeader' /> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 17:26:46 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1597; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.NickName inHeader, org.jboss.test.ws.jbws1597.BillingAccountHolder outHeader) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 17:26:46 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1597; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.NickName inHeader, org.jboss.test.ws.jbws1597.BillingAccountHolder outHeader) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 17:26:46 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 17:26:46 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,107 +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.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.NickName</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:NickName</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>name</java-variable-name> - <xml-element-name>name</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>sortCode</java-variable-name> - <xml-element-name>sortCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>accountNumber</java-variable-name> - <xml-element-name>accountNumber</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1597.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</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>org.jboss.test.ws.jbws1597.NickName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>inHeader</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>2</param-position> - <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>outHeader</wsdl-message-part-name> - <parameter-mode>OUT</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,107 @@ +<?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.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.NickName</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:NickName</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>name</java-variable-name> + <xml-element-name>name</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>sortCode</java-variable-name> + <xml-element-name>sortCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>accountNumber</java-variable-name> + <xml-element-name>accountNumber</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1597.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</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>org.jboss.test.ws.jbws1597.NickName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>inHeader</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>2</param-position> + <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>outHeader</wsdl-message-part-name> + <parameter-mode>OUT</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_in_and_out/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1597/doclit_in_and_out/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccount.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccount.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 16:46:43 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class BillingAccount -{ - -protected java.lang.String sortCode; - -protected java.lang.String accountNumber; -public BillingAccount(){} - -public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ -this.sortCode=sortCode; -this.accountNumber=accountNumber; -} -public java.lang.String getSortCode() { return sortCode ;} - -public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } - -public java.lang.String getAccountNumber() { return accountNumber ;} - -public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccount.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccount.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 16:46:43 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class BillingAccount +{ + +protected java.lang.String sortCode; + +protected java.lang.String accountNumber; +public BillingAccount(){} + +public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ +this.sortCode=sortCode; +this.accountNumber=accountNumber; +} +public java.lang.String getSortCode() { return sortCode ;} + +public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } + +public java.lang.String getAccountNumber() { return accountNumber ;} + +public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,28 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 16:46:43 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - -public class BillingAccountHolder implements javax.xml.rpc.holders.Holder -{ - - public org.jboss.test.ws.jbws1597.BillingAccount value; - - public BillingAccountHolder() - { - this.value = new org.jboss.test.ws.jbws1597.BillingAccount(); - } - - public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value) - { - this.value = value; - } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/BillingAccountHolder.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,28 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 16:46:43 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + +public class BillingAccountHolder implements javax.xml.rpc.holders.Holder +{ + + public org.jboss.test.ws.jbws1597.BillingAccount value; + + public BillingAccountHolder() + { + this.value = new org.jboss.test.ws.jbws1597.BillingAccount(); + } + + public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value) + { + this.value = value; + } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/Person.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 16:46:43 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 16:46:43 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1597' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1597' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1597/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='BillingAccount'> - <sequence> - <element name='sortCode' nillable='true' type='string'/> - <element name='accountNumber' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - <element name='billingAccount' type='tns:BillingAccount'/> - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - <part element='ns1:billingAccount' name='header'/> - </message> - - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - <part element='ns1:billingAccount' name='header'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal' parts='parameters' /> - <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' /> - </input> - <output> - <soap:body use='literal' parts='result' /> - <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' /> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1597' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1597' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1597/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='BillingAccount'> + <sequence> + <element name='sortCode' nillable='true' type='string'/> + <element name='accountNumber' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + <element name='billingAccount' type='tns:BillingAccount'/> + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + <part element='ns1:billingAccount' name='header'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + <part element='ns1:billingAccount' name='header'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters' /> + <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' /> + </input> + <output> + <soap:body use='literal' parts='result' /> + <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' /> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 16:46:43 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1597; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccountHolder header) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 16:46:43 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1597; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccountHolder header) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 16:46:43 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 16:46:43 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,89 +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.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>sortCode</java-variable-name> - <xml-element-name>sortCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>accountNumber</java-variable-name> - <xml-element-name>accountNumber</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1597.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</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>org.jboss.test.ws.jbws1597.BillingAccount</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>header</wsdl-message-part-name> - <parameter-mode>INOUT</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,89 @@ +<?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.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>sortCode</java-variable-name> + <xml-element-name>sortCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>accountNumber</java-variable-name> + <xml-element-name>accountNumber</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1597.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</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>org.jboss.test.ws.jbws1597.BillingAccount</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>header</wsdl-message-part-name> + <parameter-mode>INOUT</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/wstools-config.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_inout/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_inout/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1597/doclit_inout/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccount.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 16:35:22 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class BillingAccount -{ - -protected java.lang.String sortCode; - -protected java.lang.String accountNumber; -public BillingAccount(){} - -public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ -this.sortCode=sortCode; -this.accountNumber=accountNumber; -} -public java.lang.String getSortCode() { return sortCode ;} - -public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } - -public java.lang.String getAccountNumber() { return accountNumber ;} - -public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccount.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 16:35:22 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class BillingAccount +{ + +protected java.lang.String sortCode; + +protected java.lang.String accountNumber; +public BillingAccount(){} + +public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ +this.sortCode=sortCode; +this.accountNumber=accountNumber; +} +public java.lang.String getSortCode() { return sortCode ;} + +public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } + +public java.lang.String getAccountNumber() { return accountNumber ;} + +public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,28 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 16:35:22 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - -public class BillingAccountHolder implements javax.xml.rpc.holders.Holder -{ - - public org.jboss.test.ws.jbws1597.BillingAccount value; - - public BillingAccountHolder() - { - this.value = new org.jboss.test.ws.jbws1597.BillingAccount(); - } - - public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value) - { - this.value = value; - } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,28 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 16:35:22 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + +public class BillingAccountHolder implements javax.xml.rpc.holders.Holder +{ + + public org.jboss.test.ws.jbws1597.BillingAccount value; + + public BillingAccountHolder() + { + this.value = new org.jboss.test.ws.jbws1597.BillingAccount(); + } + + public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value) + { + this.value = value; + } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/Person.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 16:35:22 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 16:35:22 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1597' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1597' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1597/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='BillingAccount'> - <sequence> - <element name='sortCode' nillable='true' type='string'/> - <element name='accountNumber' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - <element name='billingAccount' type='tns:BillingAccount'/> - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - <part element='ns1:billingAccount' name='header'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal' parts='result' /> - <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' /> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1597' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1597' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1597/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='BillingAccount'> + <sequence> + <element name='sortCode' nillable='true' type='string'/> + <element name='accountNumber' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + <element name='billingAccount' type='tns:BillingAccount'/> + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + <part element='ns1:billingAccount' name='header'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal' parts='result' /> + <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' /> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 16:35:22 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1597; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccountHolder header) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 16:35:22 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1597; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccountHolder header) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/TelephoneNumber.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 29 16:35:22 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 16:35:22 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,89 +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.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>sortCode</java-variable-name> - <xml-element-name>sortCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>accountNumber</java-variable-name> - <xml-element-name>accountNumber</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1597.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</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>org.jboss.test.ws.jbws1597.BillingAccount</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>header</wsdl-message-part-name> - <parameter-mode>OUT</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,89 @@ +<?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.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>sortCode</java-variable-name> + <xml-element-name>sortCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>accountNumber</java-variable-name> + <xml-element-name>accountNumber</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1597.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</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>org.jboss.test.ws.jbws1597.BillingAccount</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>header</wsdl-message-part-name> + <parameter-mode>OUT</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/wstools-config.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1597/doclit_out/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/doclit_out/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1597/doclit_out/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/BillingAccount.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/BillingAccount.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Fri Jun 01 17:17:30 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class BillingAccount -{ - -protected java.lang.String sortCode; - -protected java.lang.String accountNumber; -public BillingAccount(){} - -public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ -this.sortCode=sortCode; -this.accountNumber=accountNumber; -} -public java.lang.String getSortCode() { return sortCode ;} - -public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } - -public java.lang.String getAccountNumber() { return accountNumber ;} - -public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/BillingAccount.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/BillingAccount.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Fri Jun 01 17:17:30 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class BillingAccount +{ + +protected java.lang.String sortCode; + +protected java.lang.String accountNumber; +public BillingAccount(){} + +public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ +this.sortCode=sortCode; +this.accountNumber=accountNumber; +} +public java.lang.String getSortCode() { return sortCode ;} + +public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } + +public java.lang.String getAccountNumber() { return accountNumber ;} + +public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/Person.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Fri Jun 01 17:17:30 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Fri Jun 01 17:17:30 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1597' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1597' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1597/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - - <complexType name='BillingAccount'> - <sequence> - <element name='sortCode' nillable='true' type='string'/> - <element name='accountNumber' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='billingAccount' type='tns:BillingAccount'/> - </schema> - </types> - - <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='Person_1' type='ns1:Person'/> - <part name='Account_1' element='ns1:billingAccount'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part name='result' type='ns1:TelephoneNumber'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup' parameterOrder='Person_1'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' /> - <soap:header message="tns:PhoneBook_lookup" - part="Account_1" use="literal" /> - </input> - <output> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> - </output> - </operation> - </binding> - - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1597' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1597' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1597/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + + <complexType name='BillingAccount'> + <sequence> + <element name='sortCode' nillable='true' type='string'/> + <element name='accountNumber' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='billingAccount' type='tns:BillingAccount'/> + </schema> + </types> + + <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='Person_1' type='ns1:Person'/> + <part name='Account_1' element='ns1:billingAccount'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part name='result' type='ns1:TelephoneNumber'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup' parameterOrder='Person_1'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' /> + <soap:header message="tns:PhoneBook_lookup" + part="Account_1" use="literal" /> + </input> + <output> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> + </output> + </operation> + </binding> + + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Fri Jun 01 17:17:30 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1597; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.BillingAccount Account_1) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Fri Jun 01 17:17:30 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1597; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.BillingAccount Account_1) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Fri Jun 01 17:17:30 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Fri Jun 01 17:17:30 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,89 +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.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>sortCode</java-variable-name> - <xml-element-name>sortCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>accountNumber</java-variable-name> - <xml-element-name>accountNumber</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1597.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Person_1</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>org.jboss.test.ws.jbws1597.BillingAccount</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>Account_1</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.jbws1597.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,89 @@ +<?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.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>sortCode</java-variable-name> + <xml-element-name>sortCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>accountNumber</java-variable-name> + <xml-element-name>accountNumber</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1597.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Person_1</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>org.jboss.test.ws.jbws1597.BillingAccount</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>Account_1</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.jbws1597.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/wstools-config.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1597/rpclit_in/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sat Jun 02 16:59:45 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class BillingAccount -{ - -protected java.lang.String sortCode; - -protected java.lang.String accountNumber; -public BillingAccount(){} - -public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ -this.sortCode=sortCode; -this.accountNumber=accountNumber; -} -public java.lang.String getSortCode() { return sortCode ;} - -public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } - -public java.lang.String getAccountNumber() { return accountNumber ;} - -public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sat Jun 02 16:59:45 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class BillingAccount +{ + +protected java.lang.String sortCode; + +protected java.lang.String accountNumber; +public BillingAccount(){} + +public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ +this.sortCode=sortCode; +this.accountNumber=accountNumber; +} +public java.lang.String getSortCode() { return sortCode ;} + +public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } + +public java.lang.String getAccountNumber() { return accountNumber ;} + +public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,28 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sat Jun 02 16:59:45 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - -public class BillingAccountHolder implements javax.xml.rpc.holders.Holder -{ - - public org.jboss.test.ws.jbws1597.BillingAccount value; - - public BillingAccountHolder() - { - this.value = new org.jboss.test.ws.jbws1597.BillingAccount(); - } - - public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value) - { - this.value = value; - } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/BillingAccountHolder.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,28 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sat Jun 02 16:59:45 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + +public class BillingAccountHolder implements javax.xml.rpc.holders.Holder +{ + + public org.jboss.test.ws.jbws1597.BillingAccount value; + + public BillingAccountHolder() + { + this.value = new org.jboss.test.ws.jbws1597.BillingAccount(); + } + + public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value) + { + this.value = value; + } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/NickName.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/NickName.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/NickName.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sat Jun 02 16:59:45 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class NickName -{ - -protected java.lang.String name; -public NickName(){} - -public NickName(java.lang.String name){ -this.name=name; -} -public java.lang.String getName() { return name ;} - -public void setName(java.lang.String name){ this.name=name; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/NickName.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/NickName.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/NickName.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/NickName.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sat Jun 02 16:59:45 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class NickName +{ + +protected java.lang.String name; +public NickName(){} + +public NickName(java.lang.String name){ +this.name=name; +} +public java.lang.String getName() { return name ;} + +public void setName(java.lang.String name){ this.name=name; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/Person.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sat Jun 02 16:59:45 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sat Jun 02 16:59:45 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1597' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1597' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1597/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='NickName'> - <sequence> - <element name='name' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - - <complexType name='BillingAccount'> - <sequence> - <element name='sortCode' nillable='true' type='string'/> - <element name='accountNumber' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='nickName' type='tns:NickName'/> - <element name='billingAccount' type='tns:BillingAccount'/> - </schema> - </types> - - <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='Person_1' type='ns1:Person'/> - <part name='NickName_1' element='ns1:nickName'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part name='result' type='ns1:TelephoneNumber'/> - <part name='Account_1' element='ns1:billingAccount'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup' parameterOrder='Person_1'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' /> - <soap:header message="tns:PhoneBook_lookup" - part="NickName_1" use="literal" /> - </input> - <output> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> - <soap:header message="tns:PhoneBook_lookupResponse" - part="Account_1" use="literal" /> - </output> - </operation> - </binding> - - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1597' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1597' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1597/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='NickName'> + <sequence> + <element name='name' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + + <complexType name='BillingAccount'> + <sequence> + <element name='sortCode' nillable='true' type='string'/> + <element name='accountNumber' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='nickName' type='tns:NickName'/> + <element name='billingAccount' type='tns:BillingAccount'/> + </schema> + </types> + + <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='Person_1' type='ns1:Person'/> + <part name='NickName_1' element='ns1:nickName'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part name='result' type='ns1:TelephoneNumber'/> + <part name='Account_1' element='ns1:billingAccount'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup' parameterOrder='Person_1'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' /> + <soap:header message="tns:PhoneBook_lookup" + part="NickName_1" use="literal" /> + </input> + <output> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> + <soap:header message="tns:PhoneBook_lookupResponse" + part="Account_1" use="literal" /> + </output> + </operation> + </binding> + + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sat Jun 02 16:59:45 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1597; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.NickName NickName_1, org.jboss.test.ws.jbws1597.BillingAccountHolder Account_1) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sat Jun 02 16:59:45 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1597; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.NickName NickName_1, org.jboss.test.ws.jbws1597.BillingAccountHolder Account_1) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sat Jun 02 16:59:45 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sat Jun 02 16:59:45 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,107 +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.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.NickName</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:NickName</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>name</java-variable-name> - <xml-element-name>name</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>sortCode</java-variable-name> - <xml-element-name>sortCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>accountNumber</java-variable-name> - <xml-element-name>accountNumber</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1597.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Person_1</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>org.jboss.test.ws.jbws1597.NickName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>NickName_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>2</param-position> - <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>Account_1</wsdl-message-part-name> - <parameter-mode>OUT</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,107 @@ +<?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.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.NickName</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:NickName</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>name</java-variable-name> + <xml-element-name>name</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>sortCode</java-variable-name> + <xml-element-name>sortCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>accountNumber</java-variable-name> + <xml-element-name>accountNumber</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1597.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Person_1</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>org.jboss.test.ws.jbws1597.NickName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>NickName_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>2</param-position> + <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>Account_1</wsdl-message-part-name> + <parameter-mode>OUT</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_in_and_out/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1597/rpclit_in_and_out/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/BillingAccount.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccount.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Fri Jun 01 17:41:43 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class BillingAccount -{ - -protected java.lang.String sortCode; - -protected java.lang.String accountNumber; -public BillingAccount(){} - -public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ -this.sortCode=sortCode; -this.accountNumber=accountNumber; -} -public java.lang.String getSortCode() { return sortCode ;} - -public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } - -public java.lang.String getAccountNumber() { return accountNumber ;} - -public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccount.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/BillingAccount.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Fri Jun 01 17:41:43 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class BillingAccount +{ + +protected java.lang.String sortCode; + +protected java.lang.String accountNumber; +public BillingAccount(){} + +public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ +this.sortCode=sortCode; +this.accountNumber=accountNumber; +} +public java.lang.String getSortCode() { return sortCode ;} + +public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } + +public java.lang.String getAccountNumber() { return accountNumber ;} + +public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,28 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Fri Jun 01 17:41:43 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - -public class BillingAccountHolder implements javax.xml.rpc.holders.Holder -{ - - public org.jboss.test.ws.jbws1597.BillingAccount value; - - public BillingAccountHolder() - { - this.value = new org.jboss.test.ws.jbws1597.BillingAccount(); - } - - public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value) - { - this.value = value; - } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/BillingAccountHolder.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,28 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Fri Jun 01 17:41:43 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + +public class BillingAccountHolder implements javax.xml.rpc.holders.Holder +{ + + public org.jboss.test.ws.jbws1597.BillingAccount value; + + public BillingAccountHolder() + { + this.value = new org.jboss.test.ws.jbws1597.BillingAccount(); + } + + public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value) + { + this.value = value; + } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/Person.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Fri Jun 01 17:41:43 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Fri Jun 01 17:41:43 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1597' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1597' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1597/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - - <complexType name='BillingAccount'> - <sequence> - <element name='sortCode' nillable='true' type='string'/> - <element name='accountNumber' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='billingAccount' type='tns:BillingAccount'/> - </schema> - </types> - - <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='Person_1' type='ns1:Person'/> - <part name='Account_1' element='ns1:billingAccount'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part name='result' type='ns1:TelephoneNumber'/> - <part name='Account_1' element='ns1:billingAccount'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup' parameterOrder='Person_1'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' /> - <soap:header message="tns:PhoneBook_lookup" - part="Account_1" use="literal" /> - </input> - <output> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> - <soap:header message="tns:PhoneBook_lookupResponse" - part="Account_1" use="literal" /> - </output> - </operation> - </binding> - - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1597' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1597' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1597/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + + <complexType name='BillingAccount'> + <sequence> + <element name='sortCode' nillable='true' type='string'/> + <element name='accountNumber' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='billingAccount' type='tns:BillingAccount'/> + </schema> + </types> + + <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='Person_1' type='ns1:Person'/> + <part name='Account_1' element='ns1:billingAccount'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part name='result' type='ns1:TelephoneNumber'/> + <part name='Account_1' element='ns1:billingAccount'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup' parameterOrder='Person_1'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' /> + <soap:header message="tns:PhoneBook_lookup" + part="Account_1" use="literal" /> + </input> + <output> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> + <soap:header message="tns:PhoneBook_lookupResponse" + part="Account_1" use="literal" /> + </output> + </operation> + </binding> + + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Fri Jun 01 17:41:43 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1597; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.BillingAccountHolder Account_1) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Fri Jun 01 17:41:43 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1597; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.BillingAccountHolder Account_1) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Fri Jun 01 17:41:43 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Fri Jun 01 17:41:43 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,89 +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.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>sortCode</java-variable-name> - <xml-element-name>sortCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>accountNumber</java-variable-name> - <xml-element-name>accountNumber</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1597.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Person_1</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>org.jboss.test.ws.jbws1597.BillingAccount</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>Account_1</wsdl-message-part-name> - <parameter-mode>INOUT</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,89 @@ +<?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.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>sortCode</java-variable-name> + <xml-element-name>sortCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>accountNumber</java-variable-name> + <xml-element-name>accountNumber</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1597.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Person_1</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>org.jboss.test.ws.jbws1597.BillingAccount</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>Account_1</wsdl-message-part-name> + <parameter-mode>INOUT</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/wstools-config.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_inout/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_inout/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1597/rpclit_inout/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/BillingAccount.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccount.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Fri Jun 01 17:29:46 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class BillingAccount -{ - -protected java.lang.String sortCode; - -protected java.lang.String accountNumber; -public BillingAccount(){} - -public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ -this.sortCode=sortCode; -this.accountNumber=accountNumber; -} -public java.lang.String getSortCode() { return sortCode ;} - -public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } - -public java.lang.String getAccountNumber() { return accountNumber ;} - -public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/BillingAccount.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccount.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/BillingAccount.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/BillingAccount.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Fri Jun 01 17:29:46 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class BillingAccount +{ + +protected java.lang.String sortCode; + +protected java.lang.String accountNumber; +public BillingAccount(){} + +public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ +this.sortCode=sortCode; +this.accountNumber=accountNumber; +} +public java.lang.String getSortCode() { return sortCode ;} + +public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } + +public java.lang.String getAccountNumber() { return accountNumber ;} + +public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,28 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Fri Jun 01 17:29:46 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - -public class BillingAccountHolder implements javax.xml.rpc.holders.Holder -{ - - public org.jboss.test.ws.jbws1597.BillingAccount value; - - public BillingAccountHolder() - { - this.value = new org.jboss.test.ws.jbws1597.BillingAccount(); - } - - public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value) - { - this.value = value; - } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/BillingAccountHolder.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,28 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Fri Jun 01 17:29:46 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + +public class BillingAccountHolder implements javax.xml.rpc.holders.Holder +{ + + public org.jboss.test.ws.jbws1597.BillingAccount value; + + public BillingAccountHolder() + { + this.value = new org.jboss.test.ws.jbws1597.BillingAccount(); + } + + public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value) + { + this.value = value; + } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/Person.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Fri Jun 01 17:29:46 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/Person.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/Person.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Fri Jun 01 17:29:46 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1597' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1597' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1597/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - - <complexType name='BillingAccount'> - <sequence> - <element name='sortCode' nillable='true' type='string'/> - <element name='accountNumber' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='billingAccount' type='tns:BillingAccount'/> - </schema> - </types> - - <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='Person_1' type='ns1:Person'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part name='result' type='ns1:TelephoneNumber'/> - <part name='Account_1' element='ns1:billingAccount'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup' parameterOrder='Person_1'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' /> - - </input> - <output> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='result' /> - <soap:header message="tns:PhoneBook_lookupResponse" - part="Account_1" use="literal" /> - </output> - </operation> - </binding> - - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1597' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1597' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1597/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + + <complexType name='BillingAccount'> + <sequence> + <element name='sortCode' nillable='true' type='string'/> + <element name='accountNumber' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='billingAccount' type='tns:BillingAccount'/> + </schema> + </types> + + <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='Person_1' type='ns1:Person'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part name='result' type='ns1:TelephoneNumber'/> + <part name='Account_1' element='ns1:billingAccount'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup' parameterOrder='Person_1'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' /> + + </input> + <output> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='result' /> + <soap:header message="tns:PhoneBook_lookupResponse" + part="Account_1" use="literal" /> + </output> + </operation> + </binding> + + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Fri Jun 01 17:29:46 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1597; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.BillingAccountHolder Account_1) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/PhoneBook_PortType.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Fri Jun 01 17:29:46 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1597; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person person_1, org.jboss.test.ws.jbws1597.BillingAccountHolder Account_1) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Fri Jun 01 17:29:46 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1597; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/TelephoneNumber.java 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Fri Jun 01 17:29:46 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1597; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,89 +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.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1597</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>sortCode</java-variable-name> - <xml-element-name>sortCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>accountNumber</java-variable-name> - <xml-element-name>accountNumber</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1597.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Person_1</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>org.jboss.test.ws.jbws1597.BillingAccount</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>Account_1</wsdl-message-part-name> - <parameter-mode>OUT</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/jaxrpc-mapping.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,89 @@ +<?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.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:BillingAccount</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>sortCode</java-variable-name> + <xml-element-name>sortCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>accountNumber</java-variable-name> + <xml-element-name>accountNumber</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1597.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1597.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Person_1</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>org.jboss.test.ws.jbws1597.BillingAccount</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>Account_1</wsdl-message-part-name> + <parameter-mode>OUT</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/wstools-config.xml 2007-06-05 15:08:16 UTC (rev 3451) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/wstools-config.xml (from rev 3451, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1597/rpclit_out/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1597/rpclit_out/wstools-config.xml 2007-06-07 14:02:07 UTC (rev 3491) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1597/rpclit_out/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

18 years, 10 months

1
0
0 / 0

JBossWS SVN: r3490 - in branches/jbossws-1.2.1.GA_JBWS-1703: jbossws-core/src/java/org/jboss/ws/tools/helpers and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 09:53:53 -0400 (Thu, 07 Jun 2007) New Revision: 3490 Added: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/NickName.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml Removed: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/NickName.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/Person.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: JBWS-1703 - WSDL To Java - Array Unwrapping uses incorect case to reference array type. Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-06-07 13:50:41 UTC (rev 3489) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-06-07 13:53:53 UTC (rev 3490) @@ -63,6 +63,7 @@ protected LiteralTypeMapping typeMapping = null; protected WSDLUtils utils = WSDLUtils.getInstance(); protected SchemaUtils schemautils = SchemaUtils.getInstance(); + protected WSDLUtils wsdlUtils = WSDLUtils.getInstance(); protected JavaWriter jwriter = new JavaWriter(); @@ -600,6 +601,7 @@ } else { + String temp = this.fname; // Unwrap any array wrappers if (SchemaUtils.isWrapperArrayType(xstypedef)) { @@ -621,8 +623,6 @@ qn = new QName(xstypedef.getNamespace(), xstypename); } - String temp = this.fname; - if (xstypename != null && xstypedef instanceof XSComplexTypeDefinition) { this.fname = utils.firstLetterUpperCase(xstypename); @@ -648,15 +648,15 @@ if (tempqn != null) qn = tempqn; } - String clname = ""; + String qualifiedClassName = ""; Class cls = typeMapping.getJavaType(qn); VAR v = null; if (cls != null) { - clname = JavaUtils.getSourceName(cls); - String primitive = utils.getPrimitive(clname); + qualifiedClassName = JavaUtils.getSourceName(cls); + String primitive = utils.getPrimitive(qualifiedClassName); if ((!elem.getNillable()) && primitive != null) - clname = primitive; + qualifiedClassName = primitive; } else { @@ -669,14 +669,15 @@ { String nsuri = typename.getNamespaceURI(); if (!nsuri.equals(Constants.NS_SCHEMA_XSD)) - clname = pkgname + "."; - clname += typename.getLocalPart(); + qualifiedClassName = pkgname + "."; + String className = wsdlUtils.firstLetterUpperCase(typename.getLocalPart()); + qualifiedClassName += className; } else if (qn != null) - clname = qn.getLocalPart(); + qualifiedClassName = qn.getLocalPart(); } - v = new VAR(Introspector.decapitalize(varstr), clname, arrayType); + v = new VAR(Introspector.decapitalize(varstr), qualifiedClassName, arrayType); return v; } Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-07 13:50:41 UTC (rev 3489) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-07 13:53:53 UTC (rev 3490) @@ -403,7 +403,7 @@ if (isDocStyle()) { XSTypeDefinition xt = getXSType(input); - addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, !isDocStyle()); + addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, !isWrapped()); } else { @@ -417,7 +417,7 @@ if (isDocStyle()) { XSTypeDefinition xt = getXSType(output); - addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, false); + addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, !isWrapped()); } else { @@ -721,7 +721,7 @@ tempContainingType = containingType; } - addJavaXMLTypeMap(typeDefinition, xe.getName(), tempContainingElement, tempContainingType, jwm, !isDocStyle()); + addJavaXMLTypeMap(typeDefinition, xe.getName(), tempContainingElement, tempContainingType, jwm, !isWrapped()); } } } Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627 (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-06-07 13:53:53 UTC (rev 3490) @@ -1,107 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.tools.jbws1627; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; - -/** - * Test case for http://jira.jboss.com/jira/browse/JBWS-1627 - * - * WSDL to Java, Unwrapping arrays the wrong case is used to - * reference the generated class. - * - * @author darran.lofthouse(a)jboss.com - * @since 26 Apr 2007 - */ -public class JBWS1627TestCase extends JBossWSTest -{ - - /** - * Test generation of the SEI. - * - * @throws Exception - */ - public void testGenerate() throws Exception - { - String resourceDir = "resources/tools/jbws1627"; - String toolsDir = "tools/jbws1627"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1627/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1627"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-06-07 13:53:53 UTC (rev 3490) @@ -0,0 +1,107 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, 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.tools.jbws1627; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; + +/** + * Test case for http://jira.jboss.com/jira/browse/JBWS-1627 + * + * WSDL to Java, Unwrapping arrays the wrong case is used to + * reference the generated class. + * + * @author darran.lofthouse(a)jboss.com + * @since 26 Apr 2007 + */ +public class JBWS1627TestCase extends JBossWSTest +{ + + /** + * Test generation of the SEI. + * + * @throws Exception + */ + public void testGenerate() throws Exception + { + String resourceDir = "resources/tools/jbws1627"; + String toolsDir = "tools/jbws1627"; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1627/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1627"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627 (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/NickName.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/NickName.java 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/NickName.java 2007-06-07 13:53:53 UTC (rev 3490) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun May 06 14:14:38 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1627; - - -public class NickName -{ - -protected java.lang.String name; -public NickName(){} - -public NickName(java.lang.String name){ -this.name=name; -} -public java.lang.String getName() { return name ;} - -public void setName(java.lang.String name){ this.name=name; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/NickName.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/NickName.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/NickName.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/NickName.java 2007-06-07 13:53:53 UTC (rev 3490) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sun May 06 14:14:38 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1627; + + +public class NickName +{ + +protected java.lang.String name; +public NickName(){} + +public NickName(java.lang.String name){ +this.name=name; +} +public java.lang.String getName() { return name ;} + +public void setName(java.lang.String name){ this.name=name; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/Person.java 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/Person.java 2007-06-07 13:53:53 UTC (rev 3490) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun May 06 14:14:38 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1627; - - -public class Person -{ - -protected java.lang.String surname; - -protected org.jboss.test.ws.jbws1627.NickName[] nickNames; -public Person(){} - -public Person(java.lang.String surname, org.jboss.test.ws.jbws1627.NickName[] nickNames){ -this.surname=surname; -this.nickNames=nickNames; -} -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -public org.jboss.test.ws.jbws1627.NickName[] getNickNames() { return nickNames ;} - -public void setNickNames(org.jboss.test.ws.jbws1627.NickName[] nickNames){ this.nickNames=nickNames; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/Person.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/Person.java 2007-06-07 13:53:53 UTC (rev 3490) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sun May 06 14:14:38 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1627; + + +public class Person +{ + +protected java.lang.String surname; + +protected org.jboss.test.ws.jbws1627.NickName[] nickNames; +public Person(){} + +public Person(java.lang.String surname, org.jboss.test.ws.jbws1627.NickName[] nickNames){ +this.surname=surname; +this.nickNames=nickNames; +} +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +public org.jboss.test.ws.jbws1627.NickName[] getNickNames() { return nickNames ;} + +public void setNickNames(org.jboss.test.ws.jbws1627.NickName[] nickNames){ this.nickNames=nickNames; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-06-07 13:53:53 UTC (rev 3490) @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1627' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1627/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1627' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1627/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1627/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='surname' nillable='true' type='string'/> - <element name='nickNames' nillable='true' type='tns:ArrayOf_nickNames'/> - </sequence> - </complexType> - - <complexType name='ArrayOf_nickNames'> - <sequence> - <element name='names' maxOccurs='unbounded' nillable='true' type='tns:nickName'/> - </sequence> - </complexType> - - <complexType name='nickName'> - <sequence> - <element name='name' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-06-07 13:53:53 UTC (rev 3490) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1627' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1627/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1627' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1627/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1627/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='surname' nillable='true' type='string'/> + <element name='nickNames' nillable='true' type='tns:ArrayOf_nickNames'/> + </sequence> + </complexType> + + <complexType name='ArrayOf_nickNames'> + <sequence> + <element name='names' maxOccurs='unbounded' nillable='true' type='tns:nickName'/> + </sequence> + </complexType> + + <complexType name='nickName'> + <sequence> + <element name='name' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java 2007-06-07 13:53:53 UTC (rev 3490) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun May 06 14:14:38 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1627; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1627.TelephoneNumber lookup(org.jboss.test.ws.jbws1627.Person lookup) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java 2007-06-07 13:53:53 UTC (rev 3490) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sun May 06 14:14:38 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1627; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1627.TelephoneNumber lookup(org.jboss.test.ws.jbws1627.Person lookup) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java 2007-06-07 13:53:53 UTC (rev 3490) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun May 06 14:14:38 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1627; - - -public class TelephoneNumber -{ - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String number){ -this.number=number; -} -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java 2007-06-07 13:53:53 UTC (rev 3490) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sun May 06 14:14:38 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1627; + + +public class TelephoneNumber +{ + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String number){ +this.number=number; +} +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml 2007-06-07 13:53:53 UTC (rev 3490) @@ -1,72 +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.jbws1627</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1627/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1627</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1627</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1627.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>nickNames</java-variable-name> - <xml-element-name>nickNames</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1627.NickName</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:nickName</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>name</java-variable-name> - <xml-element-name>name</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1627.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1627.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1627'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1627.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1627'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1627'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1627.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookup</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.jbws1627.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml 2007-06-07 13:53:53 UTC (rev 3490) @@ -0,0 +1,72 @@ +<?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.jbws1627</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1627/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1627</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1627</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1627.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>nickNames</java-variable-name> + <xml-element-name>nickNames</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1627.NickName</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:nickName</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>name</java-variable-name> + <xml-element-name>name</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1627.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1627.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1627'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1627.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1627'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1627'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1627.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookup</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.jbws1627.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookupResponse</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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-06-07 13:53:53 UTC (rev 3490) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1627/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-06-07 13:53:53 UTC (rev 3490) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1627/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

18 years, 10 months

1
0
0 / 0

← Newer
1
...
25
26
27
28
29
30
31
...
43
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits June 2007