[jbossws-commits] JBossWS SVN: r2343 - in branches/jbossws-1.2.0: build/ant-import and 24 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-02-12 12:40:10 -0500 (Mon, 12 Feb 2007) New Revision: 2343 Added: branches/jbossws-1.2.0/build/etc/wsconsume.sh branches/jbossws-1.2.0/build/etc/wsprovide.sh branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/jboss-wsse-server.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.keystore branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.truststore Removed: branches/jbossws-1.2.0/build/etc/wsconsume branches/jbossws-1.2.0/build/etc/wsprovide Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml branches/jbossws-1.2.0/build/version.properties branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/wsconsume.java branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml branches/jbossws-1.2.0/jbossws-tests/build.xml branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml Log: Add JAX-WS WS-Security sample Support ServiceExt.setSecurityConfig() Integrate wsconsume,wsprovide in samples Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-12 17:40:10 UTC (rev 2343) @@ -49,6 +49,7 @@ <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar" dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar" dest="${thirdparty.dir}/jbossretro-rt.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <!--get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-src.zip" dest="${thirdparty.dir}/jboss-xml-binding-src.zip" usetimestamp="true" verbose="true"/--> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> @@ -72,7 +73,6 @@ <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/> <mkdir dir="${thirdparty.dir}/jbpm-bpel"/> <unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/> Deleted: branches/jbossws-1.2.0/build/etc/wsconsume =================================================================== --- branches/jbossws-1.2.0/build/etc/wsconsume 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/build/etc/wsconsume 2007-02-12 17:40:10 UTC (rev 2343) @@ -1,81 +0,0 @@ -#!/bin/sh - -# $Id: wsgen.sh 2158 2007-01-27 06:20:59Z jason.greene(a)jboss.com $ - -DIRNAME=`dirname $0` -PROGNAME=`basename $0` - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JBOSS_HOME" ] && - JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Setup JBOSS_HOME -if [ "x$JBOSS_HOME" = "x" ]; then - # get the full path (without any relative bits) - JBOSS_HOME=`cd $DIRNAME/..; pwd` -fi -export JBOSS_HOME - -# Setup the JVM -if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - JAVA="$JAVA_HOME/bin/java" - else - JAVA="java" - fi -fi - -#JPDA options. Uncomment and modify as appropriate to enable remote debugging . -#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" - -# Setup JBoss sepecific properties -JAVA_OPTS="$JAVA_OPTS" - -# Setup the java endorsed dirs -JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" - -# Setup the wstools classpath -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JAVA_HOME/lib/tools.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/wstx.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-wsconsume-impl.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/getopt.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/javassist.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/mail.jar" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - WSCONSUME_CLASSPATH=`cygpath --path --windows "$WSCONSUME_CLASSPATH"` - JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` -fi - -# Execute the JVM -"$JAVA" $JAVA_OPTS \ - -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ - -Dlog4j.configuration=wstools-log4j.xml \ - -classpath "$WSCONSUME_CLASSPATH" \ - org.jboss.ws.tools.jaxws.command.wsconsume "$@" Copied: branches/jbossws-1.2.0/build/etc/wsconsume.sh (from rev 2332, branches/jbossws-1.2.0/build/etc/wsconsume) =================================================================== --- branches/jbossws-1.2.0/build/etc/wsconsume.sh (rev 0) +++ branches/jbossws-1.2.0/build/etc/wsconsume.sh 2007-02-12 17:40:10 UTC (rev 2343) @@ -0,0 +1,81 @@ +#!/bin/sh + +# $Id: wsgen.sh 2158 2007-01-27 06:20:59Z jason.greene(a)jboss.com $ + +DIRNAME=`dirname $0` +PROGNAME=`basename $0` + +# OS specific support (must be 'true' or 'false'). +cygwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JBOSS_HOME" ] && + JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Setup JBOSS_HOME +if [ "x$JBOSS_HOME" = "x" ]; then + # get the full path (without any relative bits) + JBOSS_HOME=`cd $DIRNAME/..; pwd` +fi +export JBOSS_HOME + +# Setup the JVM +if [ "x$JAVA" = "x" ]; then + if [ "x$JAVA_HOME" != "x" ]; then + JAVA="$JAVA_HOME/bin/java" + else + JAVA="java" + fi +fi + +#JPDA options. Uncomment and modify as appropriate to enable remote debugging . +#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" + +# Setup JBoss sepecific properties +JAVA_OPTS="$JAVA_OPTS" + +# Setup the java endorsed dirs +JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" + +# Setup the wstools classpath +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JAVA_HOME/lib/tools.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/wstx.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-wsconsume-impl.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/activation.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/getopt.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/javassist.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/log4j.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/mail.jar" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + WSCONSUME_CLASSPATH=`cygpath --path --windows "$WSCONSUME_CLASSPATH"` + JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` +fi + +# Execute the JVM +"$JAVA" $JAVA_OPTS \ + -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ + -Dlog4j.configuration=wstools-log4j.xml \ + -classpath "$WSCONSUME_CLASSPATH" \ + org.jboss.ws.tools.jaxws.command.wsconsume "$@" Deleted: branches/jbossws-1.2.0/build/etc/wsprovide =================================================================== --- branches/jbossws-1.2.0/build/etc/wsprovide 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/build/etc/wsprovide 2007-02-12 17:40:10 UTC (rev 2343) @@ -1,77 +0,0 @@ -#!/bin/sh - -# $Id$ - -DIRNAME=`dirname $0` -PROGNAME=`basename $0` - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JBOSS_HOME" ] && - JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Setup JBOSS_HOME -if [ "x$JBOSS_HOME" = "x" ]; then - # get the full path (without any relative bits) - JBOSS_HOME=`cd $DIRNAME/..; pwd` -fi -export JBOSS_HOME - -# Setup the JVM -if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - JAVA="$JAVA_HOME/bin/java" - else - JAVA="java" - fi -fi - -#JPDA options. Uncomment and modify as appropriate to enable remote debugging . -#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" - -# Setup JBoss sepecific properties -JAVA_OPTS="$JAVA_OPTS" - -# Setup the java endorsed dirs -JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" - -# Setup the wstools classpath -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/getopt.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/javassist.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/mail.jar" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - WSPROVIDE_CLASSPATH=`cygpath --path --windows "$WSPROVIDE_CLASSPATH"` - JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` -fi - -# Execute the JVM -"$JAVA" $JAVA_OPTS \ - -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ - -Dlog4j.configuration=wstools-log4j.xml \ - -classpath "$WSPROVIDE_CLASSPATH" \ - org.jboss.ws.tools.jaxws.command.wsprovide "$@" Copied: branches/jbossws-1.2.0/build/etc/wsprovide.sh (from rev 2332, branches/jbossws-1.2.0/build/etc/wsprovide) =================================================================== --- branches/jbossws-1.2.0/build/etc/wsprovide.sh (rev 0) +++ branches/jbossws-1.2.0/build/etc/wsprovide.sh 2007-02-12 17:40:10 UTC (rev 2343) @@ -0,0 +1,77 @@ +#!/bin/sh + +# $Id$ + +DIRNAME=`dirname $0` +PROGNAME=`basename $0` + +# OS specific support (must be 'true' or 'false'). +cygwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JBOSS_HOME" ] && + JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Setup JBOSS_HOME +if [ "x$JBOSS_HOME" = "x" ]; then + # get the full path (without any relative bits) + JBOSS_HOME=`cd $DIRNAME/..; pwd` +fi +export JBOSS_HOME + +# Setup the JVM +if [ "x$JAVA" = "x" ]; then + if [ "x$JAVA_HOME" != "x" ]; then + JAVA="$JAVA_HOME/bin/java" + else + JAVA="java" + fi +fi + +#JPDA options. Uncomment and modify as appropriate to enable remote debugging . +#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" + +# Setup JBoss sepecific properties +JAVA_OPTS="$JAVA_OPTS" + +# Setup the java endorsed dirs +JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" + +# Setup the wstools classpath +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/activation.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/getopt.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/javassist.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/log4j.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/mail.jar" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + WSPROVIDE_CLASSPATH=`cygpath --path --windows "$WSPROVIDE_CLASSPATH"` + JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` +fi + +# Execute the JVM +"$JAVA" $JAVA_OPTS \ + -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ + -Dlog4j.configuration=wstools-log4j.xml \ + -classpath "$WSPROVIDE_CLASSPATH" \ + org.jboss.ws.tools.jaxws.command.wsprovide "$@" Modified: branches/jbossws-1.2.0/build/version.properties =================================================================== --- branches/jbossws-1.2.0/build/version.properties 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/build/version.properties 2007-02-12 17:40:10 UTC (rev 2343) @@ -42,7 +42,7 @@ jboss-security=4.0.5.GA jboss-vfs=2.0.0.Beta2 jbossas-core-libs=4.0.5.GA -jbossws-wsconsume-impl=2.0.0 +jbossws-wsconsume=2.0.0 jbpm-bpel=1.1.Beta3 junit=3.8.1 oswego-concurrent=1.3.4 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -23,6 +23,7 @@ // $Id$ +import java.io.IOException; import java.net.URL; import javax.xml.namespace.QName; @@ -30,13 +31,19 @@ import javax.xml.ws.Service; import javax.xml.ws.WebServiceFeature; +import org.jboss.ws.WSException; import org.jboss.ws.core.ConfigProvider; +import org.jboss.ws.core.StubExt; +import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.ServiceMetaData; +import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; +import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; /** * Extends the standard JAXWS Service * * @author Thomas.Diesler(a)jboss.com - * @param <T> * @since 18-Jan-2007 */ public class ServiceExt extends Service implements ConfigProvider @@ -45,12 +52,14 @@ private String configName; // The config file for all created ports private String configFile; - + // The WS-Security config + private String securityConfig; + public ServiceExt(URL wsdlDocumentLocation, QName serviceName) { super(wsdlDocumentLocation, serviceName); } - + /** * Get the port configuration file for newly created ports */ @@ -84,6 +93,22 @@ this.configFile = configFile; } + /** + * Get the WS-Security configuration + */ + public String getSecurityConfig() + { + return securityConfig; + } + + /** + * Set the WS-Security configuration + */ + public void setSecurityConfig(String securityConfig) + { + this.securityConfig = securityConfig; + } + @Override public <T> T getPort(Class<T> serviceEndpointInterface, WebServiceFeature... features) { @@ -123,11 +148,31 @@ configurePort(port); return port; } - + private void configurePort(Object port) { ConfigProvider cp = (ConfigProvider)port; if (configName != null || configFile != null) cp.setConfigName(configName, configFile); + + if (securityConfig != null) + { + EndpointMetaData epMetaData = ((StubExt)port).getEndpointMetaData(); + ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData(); + if (serviceMetaData.getSecurityConfiguration() == null) + { + try + { + WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance(); + UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getRootFile(); + WSSecurityConfiguration config = wsseConfFactory.createConfiguration(vfsRoot, securityConfig); + serviceMetaData.setSecurityConfiguration(config); + } + catch (IOException ex) + { + WSException.rethrow("Cannot set security config", ex); + } + } + } } } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -22,6 +22,7 @@ package org.jboss.ws.core.soap; //$Id$ + import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.jaxrpc.Style; @@ -35,6 +36,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Iterator; + /** * A SOAPEnvelope builder for JAXRPC based on DOM * @@ -46,7 +48,7 @@ { // provide logging private static Logger log = Logger.getLogger(EnvelopeBuilderDOM.class); - + private Style style = Style.DOCUMENT; public EnvelopeBuilderDOM(Style style) @@ -60,7 +62,6 @@ Element domEnv = null; try { - // TODO: The parser unescapes special characters, which we need to escape later on again domEnv = DOMUtils.parse(ins); } catch (IOException ex) @@ -100,7 +101,7 @@ { Element srcElement = (Element)it.next(); //registerNamespacesLocally(srcElement); - XMLFragment xmlFragment = new XMLFragment( new DOMSource(srcElement) ); + XMLFragment xmlFragment = new XMLFragment(new DOMSource(srcElement)); Name name = new NameImpl(srcElement.getLocalName(), srcElement.getPrefix(), srcElement.getNamespaceURI()); SOAPContentElement destElement = new SOAPHeaderElementImpl(name); @@ -193,8 +194,8 @@ destElement = (SOAPContentElement)soapBodyElement.addChildElement(destElement); DOMUtils.copyAttributes(destElement, srcElement); - - XMLFragment xmlFragment = new XMLFragment( new DOMSource(srcElement) ); + + XMLFragment xmlFragment = new XMLFragment(new DOMSource(srcElement)); destElement.setXMLFragment(xmlFragment); } } @@ -206,8 +207,8 @@ destElement = (SOAPContentElement)soapBody.addChildElement(destElement); DOMUtils.copyAttributes(destElement, srcElement); - - XMLFragment xmlFragment = new XMLFragment( new DOMSource(srcElement) ); + + XMLFragment xmlFragment = new XMLFragment(new DOMSource(srcElement)); destElement.setXMLFragment(xmlFragment); } else if (style == null) @@ -249,7 +250,7 @@ } } } - + return soapEnv; } @@ -257,14 +258,15 @@ * Register globally available namespaces on element level. * This is necessary to ensure that each xml fragment is valid. */ - private void registerNamespacesLocally(Element srcElement) { - if(srcElement.getPrefix()== null) + private void registerNamespacesLocally(Element srcElement) + { + if (srcElement.getPrefix() == null) { srcElement.setAttribute("xmlns", srcElement.getNamespaceURI()); } else { - srcElement.setAttribute("xmlns:"+srcElement.getPrefix(), srcElement.getNamespaceURI()); + srcElement.setAttribute("xmlns:" + srcElement.getPrefix(), srcElement.getNamespaceURI()); } } } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -554,7 +554,7 @@ } else { - throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Operation only supported for javax.xml.soap.Node, this is a " + node); + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Operation not supported on this type of node: " + node); } return retNode; } @@ -564,9 +564,7 @@ org.w3c.dom.Node domParent = domNode.getParentNode(); if (domParent != null && soapParent == null) throw new WSException("Inconsistent node, has a DOM parent but no SOAP parent [" + this + "] " + DOMWriter.printNode(this, false)); - if (domParent == null && soapParent != null) - throw new WSException("Inconsistent node, has a SOAP parent but no DOM parent [" + this + "] " + DOMWriter.printNode(this, false)); - if (soapParent != null && domParent != soapParent.domNode) + if (domParent != null && soapParent != null && domParent != soapParent.domNode) throw new WSException("Inconsistent node, SOAP parent is not identical with DOM parent [" + this + "] " + DOMWriter.printNode(this, false)); } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -21,6 +21,8 @@ */ package org.jboss.ws.core.soap; +// $Id: $ + import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; @@ -59,40 +61,42 @@ * Aggregates a {@link XMLFragment}. * * @author Heiko.Braun(a)jboss.org - * @version $Id$ * @since 05.02.2007 */ -class XMLContent extends SOAPContent { - +class XMLContent extends SOAPContent +{ private static final Logger log = Logger.getLogger(XMLContent.class); // The well formed XML content of this element. private XMLFragment xmlFragment; - protected XMLContent(SOAPContentElement container) { + protected XMLContent(SOAPContentElement container) + { super(container); } - State getState() { + State getState() + { return State.XML_VALID; } - SOAPContent transitionTo(State nextState) { + SOAPContent transitionTo(State nextState) + { SOAPContent next; - if(State.XML_VALID == nextState) + if (State.XML_VALID == nextState) { next = this; } - else if(State.OBJECT_VALID == nextState) + else if (State.OBJECT_VALID == nextState) { Object obj = unmarshallObjectContents(); SOAPContent objectValid = new ObjectContent(container); objectValid.setObjectValue(obj); next = objectValid; } - else if(State.DOM_VALID == nextState) + else if (State.DOM_VALID == nextState) { expandContainerChildren(); next = new DOMContent(container); @@ -105,7 +109,8 @@ return next; } - private Object unmarshallObjectContents() { + private Object unmarshallObjectContents() + { Object obj; QName xmlType = container.getXmlType(); @@ -172,14 +177,14 @@ try { String contentType = MimeUtils.resolveMimeType(javaType); - log.debug("Adopt DataHandler to " + javaType +", contentType "+ contentType); + log.debug("Adopt DataHandler to " + javaType + ", contentType " + contentType); DataSource ds = new SwapableMemoryDataSource(((DataHandler)obj).getInputStream(), contentType); DataHandler dh = new DataHandler(ds); obj = dh.getContent(); // 'application/octet-stream' will return a byte[] instead fo the stream - if(obj instanceof InputStream) + if (obj instanceof InputStream) { ByteArrayOutputStream bout = new ByteArrayOutputStream(); dh.writeTo(bout); @@ -191,7 +196,7 @@ throw new WSException("Failed to adopt XOP content type", e); } - if(!JavaUtils.isAssignableFrom(javaType, obj.getClass())) + if (!JavaUtils.isAssignableFrom(javaType, obj.getClass())) { throw new WSException("Java type '" + javaType + "' is not assignable from: " + objType.getName()); } @@ -208,7 +213,7 @@ return obj; } -// Get the deserializer factory for a given javaType and xmlType + // Get the deserializer factory for a given javaType and xmlType private static DeserializerFactoryBase getDeserializerFactory(TypeMappingImpl typeMapping, Class javaType, QName xmlType) { DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(javaType, xmlType); @@ -245,7 +250,8 @@ * Turn the xml fragment into a DOM repersentation and append * all children to the container. */ - private void expandContainerChildren() { + private void expandContainerChildren() + { Element contentRoot = xmlFragment.toElement(); @@ -264,7 +270,8 @@ SOAPFactoryImpl soapFactory = new SOAPFactoryImpl(); - try { + try + { NodeList nlist = contentRoot.getChildNodes(); for (int i = 0; i < nlist.getLength(); i++) { @@ -292,33 +299,41 @@ log.trace("Ignore child type: " + childType); } } - } catch (SOAPException e) { + } + catch (SOAPException e) + { throw new WSException("Failed to transition to DOM", e); } } - public Source getPayload() { + public Source getPayload() + { throw new IllegalStateException("Payload not available"); } - public void setPayload(Source source) { + public void setPayload(Source source) + { throw new IllegalStateException("Payload not available"); } - public XMLFragment getXMLFragment() { + public XMLFragment getXMLFragment() + { return this.xmlFragment; } - public void setXMLFragment(XMLFragment xmlFragment) { + public void setXMLFragment(XMLFragment xmlFragment) + { this.xmlFragment = xmlFragment; } - public Object getObjectValue() { + public Object getObjectValue() + { throw new IllegalStateException("Object value not available"); } - public void setObjectValue(Object objValue) { + public void setObjectValue(Object objValue) + { throw new IllegalStateException("Object value not available"); } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -21,6 +21,8 @@ */ package org.jboss.ws.core.soap; +//$Id: $ + import org.jboss.ws.WSException; import org.jboss.ws.core.jaxrpc.binding.BufferedStreamResult; import org.jboss.ws.core.utils.DOMUtils; @@ -43,44 +45,48 @@ * @see XMLContent * * @author Heiko.Braun(a)jboss.org - * @version $Id$ * @since 05.02.2007 */ -public class XMLFragment { +public class XMLFragment +{ private Source source; private Result result; private boolean idempotent = true; - public XMLFragment(Source source) { + public XMLFragment(Source source) + { this.source = source; } - public XMLFragment(Result result) { + public XMLFragment(Result result) + { this.result = result; } - public Source getSource() { - if(null == source) + public Source getSource() + { + if (null == source) throw new IllegalStateException("Source not available"); return source; } - public Result getResult() { - if(null == source) + public Result getResult() + { + if (null == source) throw new IllegalStateException("Result not available"); return result; } public String toStringFragment() { - if(!idempotent) throw new IllegalStateException("Trying to call a non-idempotent operation"); + if (!idempotent) + throw new IllegalStateException("Trying to call a non-idempotent operation"); - if(this.source != null) + if (this.source != null) return sourceToStringFragement(this.source); - else - return resultToStringFragment(this.result); + else return resultToStringFragment(this.result); } /** @@ -89,26 +95,29 @@ */ public Element toElement() { - if(!idempotent) throw new IllegalStateException("Trying to call a non-idempotent operation"); + if (!idempotent) + throw new IllegalStateException("Trying to call a non-idempotent operation"); Element resultingElement = null; try { - if(source != null) + if (source != null) { resultingElement = DOMUtils.sourceToElement(source); // Any Source besides DOMSource is expected not to be idempotent - if(! (source instanceof DOMSource) ) idempotent = false; + if (!(source instanceof DOMSource)) + idempotent = false; } else { - resultingElement = DOMUtils.parse( resultToStringFragment(result)); + resultingElement = DOMUtils.parse(resultToStringFragment(result)); // Any Result besides DOMResult is expected not to be idempotent - if(! (result instanceof DOMResult) ) idempotent = false; + if (!(result instanceof DOMResult)) + idempotent = false; } } catch (IOException e) @@ -130,11 +139,12 @@ return new XMLFragment(source); } - private String resultToStringFragment(Result result) { + private String resultToStringFragment(Result result) + { - if(result instanceof DOMResult) + if (result instanceof DOMResult) { - return DOMWriter.printNode( ((DOMResult)result).getNode(), false); + return DOMWriter.printNode(((DOMResult)result).getNode(), false); } else if (result instanceof BufferedStreamResult) { @@ -146,35 +156,36 @@ throw new IllegalArgumentException("Unable to process javax.xml.transform.Result implementation: " + result); } - private static String sourceToStringFragement(Source source) { + private static String sourceToStringFragement(Source source) + { throw new IllegalArgumentException("Source should never be converted to String"); /*new RuntimeException("sourceToStringFragement").printStackTrace(System.out); - String xmlFragment = null; + String xmlFragment = null; - try { - TransformerFactory tf = TransformerFactory.newInstance(); - ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); - tf.newTransformer().transform(source, new StreamResult(baos)); - xmlFragment = new String(baos.toByteArray()); - if (xmlFragment.startsWith("<?xml")) - { - int index = xmlFragment.indexOf(">"); - xmlFragment = xmlFragment.substring(index + 1); - } - } catch (TransformerException e) { - WSException.rethrow(e); - } + try { + TransformerFactory tf = TransformerFactory.newInstance(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); + tf.newTransformer().transform(source, new StreamResult(baos)); + xmlFragment = new String(baos.toByteArray()); + if (xmlFragment.startsWith("<?xml")) + { + int index = xmlFragment.indexOf(">"); + xmlFragment = xmlFragment.substring(index + 1); + } + } catch (TransformerException e) { + WSException.rethrow(e); + } - return xmlFragment; - */ + return xmlFragment; + */ } public void writeTo(Writer writer) throws IOException { - if(result != null ) + if (result != null) { writeResult(writer); } @@ -184,20 +195,21 @@ } } - /** + /** * Should only be called with <code>jbossws.SOAPMessage==TRACE</code> */ - private void writeSource(Writer writer) throws IOException { + private void writeSource(Writer writer) throws IOException + { //new RuntimeException("writeSource").printStackTrace(System.out); - if(source instanceof DOMSource) + if (source instanceof DOMSource) { DOMSource domSource = (DOMSource)source; DOMWriter dw = new DOMWriter(writer).setPrettyprint(false); dw.print(domSource.getNode()); } - else if(source instanceof StreamSource) + else if (source instanceof StreamSource) { StreamSource streamSource = (StreamSource)source; copyStream(streamSource.getInputStream(), writer); @@ -219,14 +231,15 @@ } } - private void writeResult(Writer writer) { - if(result instanceof DOMResult) + private void writeResult(Writer writer) + { + if (result instanceof DOMResult) { DOMResult domResult = (DOMResult)result; DOMWriter dw = new DOMWriter(writer).setPrettyprint(false); dw.print(domResult.getNode()); } - else if(result instanceof BufferedStreamResult) + else if (result instanceof BufferedStreamResult) { BufferedStreamResult sr = (BufferedStreamResult)result; ByteArrayOutputStream out = (ByteArrayOutputStream)sr.getOutputStream(); @@ -248,11 +261,12 @@ public void writeTo(OutputStream out) throws IOException { - writeTo( new PrintWriter(out) ); + writeTo(new PrintWriter(out)); } - public String toString() { - String contents = source != null ? "source="+source : "result="+result; - return "XMLFragment {"+contents+", idempotent="+idempotent+"}"; + public String toString() + { + String contents = source != null ? "source=" + source : "result=" + result; + return "XMLFragment {" + contents + ", idempotent=" + idempotent + "}"; } } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -32,8 +32,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; +import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.UnifiedVirtualFile; -import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; import org.jboss.ws.extensions.security.WSSecurityDispatcher; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; @@ -62,7 +62,7 @@ { if (getSecurityConfiguration(msgContext) != null) { - WSSecurityDispatcher.handleInbound((SOAPMessageContextJAXRPC)msgContext); + WSSecurityDispatcher.handleInbound((CommonMessageContext)msgContext); } } catch (SOAPException ex) @@ -79,7 +79,7 @@ { if (getSecurityConfiguration(msgContext) != null) { - WSSecurityDispatcher.handleOutbound((SOAPMessageContextJAXRPC)msgContext); + WSSecurityDispatcher.handleOutbound((CommonMessageContext)msgContext); } } catch (SOAPException ex) @@ -96,7 +96,7 @@ */ private WSSecurityConfiguration getSecurityConfiguration(MessageContext msgContext) { - EndpointMetaData epMetaData = ((SOAPMessageContextJAXRPC)msgContext).getEndpointMetaData(); + EndpointMetaData epMetaData = ((CommonMessageContext)msgContext).getEndpointMetaData(); ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData(); WSSecurityConfiguration config = serviceMetaData.getSecurityConfiguration(); Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -93,28 +93,21 @@ EndpointMetaData epMetaData = ((CommonMessageContext)msgContext).getEndpointMetaData(); ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData(); - if(null == serviceMetaData.getSecurityConfiguration()) // might be set through ServiceObjectFactory + if(serviceMetaData.getSecurityConfiguration() == null) // might be set through ServiceObjectFactory { UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getRootFile(); - boolean successful = false; WSSecurityConfiguration config = null; try { WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance(); config = wsseConfFactory.createConfiguration(vfsRoot, getConfigResourceName()); - if(config!=null) successful = true; - } - catch (IOException e) + catch (IOException ex) { - successful = false; + WSException.rethrow("Cannot load ws-security config", ex); } - if(!successful) - throw new WSException("Failed to access security config"); - // it's required further down the processing chain - // TODO: cleanup serviceMetaData.setSecurityConfiguration(config); } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -24,6 +24,7 @@ // $Id: $ import java.io.IOException; +import java.net.MalformedURLException; import java.net.URL; import org.jboss.logging.Logger; @@ -32,7 +33,9 @@ import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; /** - * @author hbraun + * Create a WSSecurityConfiguration + * + * @author Heiko.Braun(a)jboss.com * @author Thomas.Diesler(a)jboss.com */ public class WSSecurityConfigFactory @@ -47,33 +50,46 @@ public WSSecurityConfiguration createConfiguration(UnifiedVirtualFile vfsRoot, String resourceName) throws IOException { + URL configLocation = null; + try + { + configLocation = new URL(resourceName); + } + catch (MalformedURLException ex) + { + // ignore + } + + if (configLocation == null) + configLocation = getResource(vfsRoot, "WEB-INF/" + resourceName, false); + + if (configLocation == null) + configLocation = getResource(vfsRoot, "META-INF/" + resourceName, false); + WSSecurityConfiguration config = null; - - URL location = getResource(vfsRoot, "WEB-INF/" + resourceName, false); - if (null == location) - location = getResource(vfsRoot, "META-INF/" + resourceName, false); - - if (location != null) + if (configLocation != null) { - log.debug("createConfiguration from: " + location); - config = WSSecurityOMFactory.newInstance().parse(location); - + log.debug("createConfiguration from: " + configLocation); + config = WSSecurityOMFactory.newInstance().parse(configLocation); + // Get and set deployment path to the keystore file + URL keystoreLocation = null; if (config.getKeyStoreFile() != null) { - location = getResource(vfsRoot, config.getKeyStoreFile(), true); - log.debug("Add keystore: " + location); - config.setKeyStoreURL(location); + keystoreLocation = getResource(vfsRoot, config.getKeyStoreFile(), true); + log.debug("Add keystore: " + keystoreLocation); + config.setKeyStoreURL(keystoreLocation); } + URL truststoreLocation = null; if (config.getTrustStoreFile() != null) { - location = getResource(vfsRoot, config.getTrustStoreFile(), true); - log.debug("Add truststore: " + location); - config.setTrustStoreURL(location); + truststoreLocation = getResource(vfsRoot, config.getTrustStoreFile(), true); + log.debug("Add truststore: " + truststoreLocation); + config.setTrustStoreURL(truststoreLocation); } } - + return config; } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/wsconsume.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/wsconsume.java 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/ant/wsconsume.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -52,7 +52,7 @@ * <tr><td>binding</td><td>A JAX-WS or JAXB binding file</td><td>none</td></tr> * <tr><td>wsdlLocation</td><td>Value to use for @(a)WebService.wsdlLocation&lt;/td&gt;&lt;td&gt;generated&lt;/td&gt;&lt;/tr&gt; * <tr><td>destdir</td><td>The output directory for generated artifacts.</td><td>"output"</td></tr> - * <tr><td>sourcedir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr> + * <tr><td>sourcedestdir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr> * <tr><td>verbose</td><td>Enables more informational output about command progress.</td><td>false</td><tr> * <tr><td>wsdl*</td><td>The WSDL file or URL</td><td>n/a</td><tr> * </table> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-12 17:40:10 UTC (rev 2343) @@ -36,6 +36,7 @@ <get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> @@ -43,6 +44,7 @@ <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-12 17:40:10 UTC (rev 2343) @@ -262,6 +262,7 @@ <mkdir dir="${tests.output.dir}/classes"/> <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <src path="${tests.output.dir}/wstools/java"/> + <src path="${tests.output.dir}/wsconsume/java"/> <exclude name="org/jboss/test/ws/interop/**"/> <classpath refid="javac.classpath"/> </javac> @@ -295,15 +296,15 @@ <!-- Building --> <!-- ================================================================== --> - <target name="main" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="Build the deployments."> + <target name="main" depends="compile,copy-resources,generate-sources,compile-generated" description="Build the deployments."> <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/> <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> </target> <!-- - Generate samples sources + Generate BPEL sources --> - <target name="generate-sources" depends="compile" description="Generate the deployment resources."> + <target name="generate-bpel-sources" depends="compile" description="Generate the BPEL resources."> <!-- create jbpm process archives --> <mkdir dir="${tests.output.dir}/libs"/> <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"> @@ -319,15 +320,25 @@ <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip" outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" /> + </target> + + <!-- + Generate JAX-RPC sources + --> + <target name="generate-jaxrpc-sources" depends="compile" description="Generate the JAX-RPC artifacts."> - <!-- generate mapping artifacts --> + <!-- Define the JAX-RPC tools task --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath refid="core.classpath"/> <classpath refid="jbossws.classpath"/> + <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/> + <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/> <classpath location="${thirdparty.dir}/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> <classpath location="${tests.output.dir}"/> </taskdef> + + <!-- Generate JAX-RPC artifacts --> <mkdir dir="${tests.output.dir}/libs"/> <mkdir dir="${tests.output.dir}/wstools/java"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> @@ -350,9 +361,7 @@ <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> - </target> - - <target name="copy-generated" depends="init" description="Copy the deployment resources."> + <!-- Copy generated resources --> <copy todir="${tests.output.dir}/resources"> <fileset dir="${tests.output.dir}/wstools/resources"> @@ -369,6 +378,39 @@ </copy> </target> + <!-- + Generate JAX-WS sources + --> + <target name="generate-jaxws-sources" depends="compile" description="Generate the JAX-WS artifacts."> + + <!-- Define the JAX-WS wsprovide task --> + <taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide"> + <classpath refid="core.classpath"/> + <classpath refid="jbossws.classpath"/> + <classpath location="${thirdparty.dir}/concurrent.jar"/> + <classpath location="${tests.output.dir}/classes"/> + </taskdef> + + <!-- Define the JAX-WS wsconsume task --> + <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> + <classpath refid="core.classpath"/> + <classpath refid="jbossws.classpath"/> + <classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/> + <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/> + <classpath location="${tests.output.dir}/classes"/> + </taskdef> + + <!-- Generate JAX-RPC artifacts --> + <mkdir dir="${tests.output.dir}/libs"/> + <mkdir dir="${tests.output.dir}/wstools/java"/> + + <!-- Generate JAX-WS artifacts --> + <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/> + <wsconsume keep="true" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" wsdl="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl"/> + </target> + + <target name="generate-sources" depends="generate-bpel-sources,generate-jaxrpc-sources,generate-jaxws-sources"/> + <!-- ================================================================== --> <!-- Testing --> <!-- ================================================================== --> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-02-12 17:40:10 UTC (rev 2343) @@ -16,6 +16,7 @@ jboss-jbossxb=@jboss-jbossxb@ jboss-security=@jboss-security@ jbossas-core-libs=@jbossas-core-libs@ +jbossws-wsconsume=@jbossws-wsconsume@ oswego-concurrent=@oswego-concurrent@ stax-api=@stax-api@ sun-jaf=@sun-jaf@ Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-12 17:40:10 UTC (rev 2343) @@ -2673,7 +2673,7 @@ </metainf> </jar> - <!-- jaxrpc-wsse-simple-sign-encrypt.war --> + <!-- jaxrpc-wsse-simple-sign-encrypt --> <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-02-12 17:40:10 UTC (rev 2343) @@ -407,6 +407,38 @@ </webinf> </war> + <!-- jaxws-samples-wssecurity-encrypt --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF"> + <include name="jboss-wsse-server.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + + <!-- jaxws-samples-wssecurity-sign --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF"> + <include name="jboss-wsse-server.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + <!-- jaxws-samples-xop-doclit --> <jar jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.jar"> <fileset dir="${tests.output.dir}/classes"> Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-12 17:40:10 UTC (rev 2343) @@ -269,6 +269,7 @@ <mkdir dir="${tests.output.dir}/classes"/> <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <src path="${tests.output.dir}/wstools/java"/> + <src path="${tests.output.dir}/wsconsume/java"/> <exclude name="org/jboss/test/ws/interop/**"/> <classpath refid="javac.classpath"/> </javac> @@ -302,7 +303,7 @@ <!-- Building --> <!-- ================================================================== --> - <target name="main" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="Build the deployments."> + <target name="main" depends="compile,copy-resources,generate-sources,compile-generated" description="Build the deployments."> <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/> <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> <ant antfile="${basedir}/ant-import/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" inheritall="true"/> @@ -310,9 +311,9 @@ </target> <!-- - Generate samples sources + Generate BPEL sources --> - <target name="generate-sources" depends="compile" description="Generate the deployment resources."> + <target name="generate-bpel-sources" depends="compile" description="Generate the BPEL resources."> <!-- create jbpm process archives --> <mkdir dir="${tests.output.dir}/libs"/> <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"> @@ -328,8 +329,14 @@ <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip" outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" /> + </target> + + <!-- + Generate JAX-RPC sources + --> + <target name="generate-jaxrpc-sources" depends="compile" description="Generate the JAX-RPC artifacts."> - <!-- generate mapping artifacts --> + <!-- Define the JAX-RPC tools task --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath refid="core.classpath"/> <classpath refid="jbossws.classpath"/> @@ -339,6 +346,8 @@ <classpath location="${tests.output.dir}/classes"/> <classpath location="${tests.output.dir}"/> </taskdef> + + <!-- Generate JAX-RPC artifacts --> <mkdir dir="${tests.output.dir}/libs"/> <mkdir dir="${tests.output.dir}/wstools/java"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> @@ -361,9 +370,7 @@ <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> - </target> - - <target name="copy-generated" depends="init" description="Copy the deployment resources."> + <!-- Copy generated resources --> <copy todir="${tests.output.dir}/resources"> <fileset dir="${tests.output.dir}/wstools/resources"> @@ -380,6 +387,39 @@ </copy> </target> + <!-- + Generate JAX-WS sources + --> + <target name="generate-jaxws-sources" depends="compile" description="Generate the JAX-WS artifacts."> + + <!-- Define the JAX-WS wsprovide task --> + <taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide"> + <classpath refid="core.classpath"/> + <classpath refid="jbossws.classpath"/> + <classpath location="${thirdparty.dir}/concurrent.jar"/> + <classpath location="${tests.output.dir}/classes"/> + </taskdef> + + <!-- Define the JAX-WS wsconsume task --> + <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> + <classpath refid="core.classpath"/> + <classpath refid="jbossws.classpath"/> + <classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/> + <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/> + <classpath location="${tests.output.dir}/classes"/> + </taskdef> + + <!-- Generate JAX-RPC artifacts --> + <mkdir dir="${tests.output.dir}/libs"/> + <mkdir dir="${tests.output.dir}/wstools/java"/> + + <!-- Generate JAX-WS artifacts --> + <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/> + <wsconsume keep="true" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" wsdl="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl"/> + </target> + + <target name="generate-sources" depends="generate-bpel-sources,generate-jaxrpc-sources,generate-jaxws-sources"/> + <!-- ================================================================== --> <!-- Testing --> <!-- ================================================================== --> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -99,7 +99,7 @@ ports.add((TestEndpoint)service5.getPort(TestEndpoint.class)); ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/TestEndpointService5")).getTestEndpointPort()); ports.add((TestEndpoint)service6.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/Service6")).getTestEndpointPort()); + ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/service6")).getTestEndpointPort()); ports.add((TestEndpoint)iniCtx.lookup("java:comp.ejb3/env/port1")); ports.add(port2); ports.add((TestEndpoint)iniCtx.lookup("java:comp.ejb3/env/Port2")); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -98,7 +98,7 @@ ports.add((TestEndpoint)service5.getPort(TestEndpoint.class)); ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); ports.add((TestEndpoint)service6.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/Service6")).getTestEndpointPort()); + ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/service6")).getTestEndpointPort()); ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/port1")); ports.add(port2); ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/Port2")); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -102,7 +102,7 @@ ports.add((TestEndpoint)service5.getPort(TestEndpoint.class)); ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); ports.add((TestEndpoint)service6.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + TestEndpointClientOne.class.getName() + "/Service6")).getTestEndpointPort()); + ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + TestEndpointClientOne.class.getName() + "/service6")).getTestEndpointPort()); ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/port1")); ports.add(port2); ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/Port2")); Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -0,0 +1,40 @@ + +package org.jboss.test.ws.jaxws.samples.wssecurity; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + + +/** + * JBossWS Generated Source + * + * Generation Date: Mon Feb 12 18:02:31 CET 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. + * + * JAX-WS Version: 2.0 + * + */ +@WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/samples/wssecurity") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface Hello { + + + /** + * + * @param user + * @return + * returns org.jboss.test.ws.jaxws.samples.wssecurity.UserType + */ + @WebMethod + @WebResult(partName = "return") + public UserType echoUserType( + @WebParam(name = "user", partName = "user") + UserType user); + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wssecurity; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; +import org.jboss.ws.annotation.EndpointConfig; + +@WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/samples/wssecurity") +@EndpointConfig(configName = "Standard WSSecurity Endpoint") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class HelloJavaBean +{ + private Logger log = Logger.getLogger(HelloJavaBean.class); + + @WebMethod + public UserType echoUserType(@WebParam(name = "user") UserType in0) + { + log.info(in0); + return in0; + } +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wssecurity; + +import java.io.File; +import java.net.URL; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; +import org.jboss.ws.core.jaxws.client.ServiceExt; + +/** + * Test WS-Security with RPC/Literal + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +public class SimpleEncryptTestCase extends JBossWSTest +{ + /** Construct the test case with a given name + */ + + /** Deploy the test */ + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(SimpleEncryptTestCase.class, "jaxws-samples-wssecurity-encrypt.war"); + } + + /** + * Test JSE endpoint + */ + public void testEndpoint() throws Exception + { + Hello hello = getPort(); + + UserType in0 = new UserType(); + in0.setMsg("Kermit"); + UserType retObj = hello.echoUserType(in0); + assertEquals("Kermit", retObj.getMsg()); + } + + private Hello getPort() throws Exception + { + URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); + URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL(); + QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); + + Service service = Service.create(wsdlURL, serviceName); + ((ServiceExt)service).setSecurityConfig(securityURL.toExternalForm()); + + Hello port = (Hello)service.getPort(Hello.class); + ((StubExt)port).setConfigName("Standard WSSecurity Client"); + + Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); + reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxws-samples-wssecurity-encrypt"); + + return port; + } +} \ No newline at end of file Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wssecurity; + +import java.io.File; +import java.net.URL; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; +import org.jboss.ws.core.jaxws.client.ServiceExt; + +/** + * Test WS-Security with RPC/Literal + * + * @author Thomas.Diesler(a)jboss.com + */ +public class SimpleSignTestCase extends JBossWSTest +{ + /** Deploy the test */ + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(SimpleSignTestCase.class, "jaxws-samples-wssecurity-sign.war"); + } + + /** + * Test JSE endpoint + */ + public void testEndpoint() throws Exception + { + Hello hello = getPort(); + + UserType in0 = new UserType(); + in0.setMsg("Kermit"); + UserType retObj = hello.echoUserType(in0); + assertEquals("Kermit", retObj.getMsg()); + } + + private Hello getPort() throws Exception + { + URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); + URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml").toURL(); + QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); + + Service service = Service.create(wsdlURL, serviceName); + ((ServiceExt)service).setSecurityConfig(securityURL.toExternalForm()); + + Hello port = (Hello)service.getPort(Hello.class); + ((StubExt)port).setConfigName("Standard WSSecurity Client"); + + Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); + reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxws-samples-wssecurity-sign"); + + return port; + } +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java 2007-02-12 17:40:10 UTC (rev 2343) @@ -0,0 +1,60 @@ + +package org.jboss.test.ws.jaxws.samples.wssecurity; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for UserType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="UserType"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="msg" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "UserType", propOrder = { + "msg" +}) +public class UserType { + + protected String msg; + + /** + * Gets the value of the msg property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMsg() { + return msg; + } + + /** + * Sets the value of the msg property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMsg(String value) { + this.msg = value; + } + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2007-02-12 17:40:10 UTC (rev 2343) @@ -49,7 +49,7 @@ @WebServiceRef --> <service-ref> - <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/serviceSetter6</service-ref-name> + <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/service6</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> </service-ref> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml 2007-02-12 17:40:10 UTC (rev 2343) @@ -49,7 +49,7 @@ @WebServiceRef --> <service-ref> - <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/serviceSetter6</service-ref-name> + <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service6</service-ref-name> <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> </service-ref> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-02-12 14:37:26 UTC (rev 2342) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-02-12 17:40:10 UTC (rev 2343) @@ -52,7 +52,7 @@ @WebServiceRef --> <service-ref> - <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/serviceSetter6</service-ref-name> + <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/service6</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> </service-ref> Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/web.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/web.xml 2007-02-12 17:40:10 UTC (rev 2343) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>HelloService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>HelloService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> + Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml 2007-02-12 17:40:10 UTC (rev 2343) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <config> + <encrypt type="x509v3" alias="wsse"/> + <requires> + <encryption/> + </requires> + </config> +</jboss-ws-security> \ No newline at end of file Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml 2007-02-12 17:40:10 UTC (rev 2343) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <key-store-file>WEB-INF/wsse.keystore</key-store-file> + <key-store-password>jbossws</key-store-password> + <trust-store-file>WEB-INF/wsse.truststore</trust-store-file> + <trust-store-password>jbossws</trust-store-password> + <config> + <encrypt type="x509v3" alias="wsse"/> + <requires> + <encryption/> + </requires> + </config> +</jboss-ws-security> \ No newline at end of file Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml 2007-02-12 17:40:10 UTC (rev 2343) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <config> + <sign type="x509v3" alias="wsse"/> + <requires> + <signature/> + </requires> + </config> +</jboss-ws-security> \ No newline at end of file Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/jboss-wsse-server.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/jboss-wsse-server.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/jboss-wsse-server.xml 2007-02-12 17:40:10 UTC (rev 2343) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <key-store-file>WEB-INF/wsse.keystore</key-store-file> + <key-store-password>jbossws</key-store-password> + <trust-store-file>WEB-INF/wsse.truststore</trust-store-file> + <trust-store-password>jbossws</trust-store-password> + <config> + <sign type="x509v3" alias="wsse"/> + <requires> + <signature/> + </requires> + </config> +</jboss-ws-security> \ No newline at end of file Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/jboss-wsse-server.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.keystore =================================================================== (Binary files differ) Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.keystore ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.truststore =================================================================== (Binary files differ) Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.truststore ___________________________________________________________________ Name: svn:mime-type + application/octet-stream