Author: thomas.diesler(a)jboss.com Date: 2007-05-21 16:59:35 -0400 (Mon, 21 May 2007) New Revision: 3167 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericLogicalHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericSOAPHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wseventing/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloService.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/XOPTestSupport.java trunk/testsuite/src/resources/jaxws/samples/ trunk/testsuite/src/resources/jaxws/samples/asynchronous/ trunk/testsuite/src/resources/jaxws/samples/context/ trunk/testsuite/src/resources/jaxws/samples/eardeployment/ trunk/testsuite/src/resources/jaxws/samples/eardeployment/META-INF/ trunk/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/ trunk/testsuite/src/resources/jaxws/samples/exception/ trunk/testsuite/src/resources/jaxws/samples/handlerchain/ trunk/testsuite/src/resources/jaxws/samples/httpbinding/ trunk/testsuite/src/resources/jaxws/samples/jsr181ejb/ trunk/testsuite/src/resources/jaxws/samples/jsr181pojo/ trunk/testsuite/src/resources/jaxws/samples/logicalhandler/ trunk/testsuite/src/resources/jaxws/samples/oneway/ trunk/testsuite/src/resources/jaxws/samples/provider/ trunk/testsuite/src/resources/jaxws/samples/retail/ trunk/testsuite/src/resources/jaxws/samples/soapbinding/ trunk/testsuite/src/resources/jaxws/samples/webmethod/ trunk/testsuite/src/resources/jaxws/samples/webparam/ trunk/testsuite/src/resources/jaxws/samples/webresult/ trunk/testsuite/src/resources/jaxws/samples/webservice/ trunk/testsuite/src/resources/jaxws/samples/webserviceref/ trunk/testsuite/src/resources/jaxws/samples/wsaddressing/ trunk/testsuite/src/resources/jaxws/samples/wseventing/ trunk/testsuite/src/resources/jaxws/samples/wssecurity/ trunk/testsuite/src/resources/jaxws/samples/xop/ Removed: trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/XOPTestSupport.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/ trunk/jbossws-core/src/test/resources/jaxws/samples/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jsr181pojo/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wseventing/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/ trunk/testsuite/src/resources/jaxws/eardeployment/ trunk/testsuite/src/resources/jaxws/samples/asynchronous/ trunk/testsuite/src/resources/jaxws/samples/context/ trunk/testsuite/src/resources/jaxws/samples/eardeployment/META-INF/ trunk/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/ trunk/testsuite/src/resources/jaxws/samples/exception/ trunk/testsuite/src/resources/jaxws/samples/handlerchain/ trunk/testsuite/src/resources/jaxws/samples/httpbinding/ trunk/testsuite/src/resources/jaxws/samples/jsr181ejb/ trunk/testsuite/src/resources/jaxws/samples/jsr181pojo/ trunk/testsuite/src/resources/jaxws/samples/logicalhandler/ trunk/testsuite/src/resources/jaxws/samples/oneway/ trunk/testsuite/src/resources/jaxws/samples/provider/ trunk/testsuite/src/resources/jaxws/samples/retail/ trunk/testsuite/src/resources/jaxws/samples/soapbinding/ trunk/testsuite/src/resources/jaxws/samples/webmethod/ trunk/testsuite/src/resources/jaxws/samples/webparam/ trunk/testsuite/src/resources/jaxws/samples/webresult/ trunk/testsuite/src/resources/jaxws/samples/webservice/ trunk/testsuite/src/resources/jaxws/samples/webserviceref/ trunk/testsuite/src/resources/jaxws/samples/wsaddressing/ trunk/testsuite/src/resources/jaxws/samples/wseventing/ trunk/testsuite/src/resources/jaxws/samples/wssecurity/ trunk/testsuite/src/resources/jaxws/samples/xop/ Modified: trunk/build/version.properties trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB3.java trunk/integration/jbws/ant-import/build-testsuite.xml trunk/integration/jbws/src/test/resources/excludes-jboss50.txt trunk/integration/spi/ant-import/build-thirdparty.xml trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/sunri/src/test/resources/excludes-jboss50.txt trunk/integration/sunri/version.properties trunk/integration/xfire/ant-import/build-testsuite.xml trunk/integration/xfire/src/test/resources/excludes-jboss50.txt trunk/jbossws-core/ant-import-tests/build-testsuite.xml trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java trunk/jbossws-core/version.properties trunk/testsuite/.classpath trunk/testsuite/ant-import/build-jars-jaxws.xml trunk/testsuite/ant-import/build-testsuite.xml trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java trunk/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/web.xml Log: Migrate jaxws samples to testsuite Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/build/version.properties 2007-05-21 20:59:35 UTC (rev 3167) @@ -23,6 +23,7 @@ jboss-microcontainer=2.0.0.Beta3 junit=3.8.1 sun-jaf=1.1 +sun-jaxb=2.1.3 sun-jaxrpc=1.1 sun-jaxws=2.1.1 sun-servlet=2.5 Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB3.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityRolesHandlerEJB3.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -57,7 +57,7 @@ { for (String role : anRolesAllowed.value()) { - webApp.addElement("security-role").addElement("role-name").addText((String)it.next()); + webApp.addElement("security-role").addElement("role-name").addText(role); } } } Modified: trunk/integration/jbws/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -10,36 +10,22 @@ <project> - <property name="tests.dir" value="${int.jbws.dir}/src/test"/> - <property name="tests.output.dir" value="${int.jbws.dir}/output-tests"/> - - <import file="${build.dir}/ant-import/build-testsuite.xml"/> + <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> - <!-- - Run tests against jboss50 - --> - <target name="tests-jboss50" depends="tests-prepare-jboss50,tests"/> - <target name="tests-prepare-jboss50"> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="excludesfile" value="${int.jbws.dir}/src/test/resources/excludes-jboss50.txt"/> - </target> + <!-- Define excludesfile --> + <condition property="excludesfile" value="${int.jbws.dir}/src/test/resources/excludes-jboss50.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="excludesfile" value="${int.jbws.dir}/src/test/resources/excludes-jboss42.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> <!-- - Run tests against jboss42 - --> - <target name="tests-jboss42" depends="tests-prepare-jboss42,tests"/> - <target name="tests-prepare-jboss42"> - <property name="jboss.home" value="${jboss42.home}"/> - <property name="excludesfile" value="${int.jbws.dir}/src/test/resources/excludes-jboss42.txt"/> - </target> - - <!-- Init the various classpaths --> <target name="tests-init" depends="tests-prepare"> <path id="jbossws.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> @@ -50,56 +36,30 @@ <!-- The combined compile classpath --> <path id="javac.classpath"> <path refid="jbossws.classpath"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/jaxb-api.jar"/> + <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.client}/jboss-common-core.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> </path> <!-- The test client classpath --> <path id="tests.client.classpath"> - <pathelement location="${jboss.client}/activation.jar"/> <pathelement location="${jboss.client}/javassist.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> <pathelement location="${jboss.client}/mail.jar"/> <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> <path refid="javac.classpath"/> </path> </target> - - <!-- ================================================================== --> - <!-- Compiling --> - <!-- ================================================================== --> - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <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}" excludesfile="${excludesfile}"> - <src path="${testsuite.dir}/src/java"/> - <src path="${tests.java.dir}"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <!-- Copy resources --> - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy-test-resources srcdir="${testsuite.dir}/src"/> - <copy-test-resources srcdir="${int.jbws.dir}/src/test"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the deployments."/> - </project> Modified: trunk/integration/jbws/src/test/resources/excludes-jboss50.txt =================================================================== --- trunk/integration/jbws/src/test/resources/excludes-jboss50.txt 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/jbws/src/test/resources/excludes-jboss50.txt 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,2 +1,12 @@ -# Nothing to exclude +org/jboss/test/ws/jaxws/samples/context/** +org/jboss/test/ws/jaxws/samples/handlerchain/** +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/jaxr/** +org/jboss/test/ws/jaxws/samples/jsr181ejb/** +org/jboss/test/ws/jaxws/samples/logicalhandler/** +org/jboss/test/ws/jaxws/samples/provider/** +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/webservice/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/samples/wssecurity/** Modified: trunk/integration/spi/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/spi/ant-import/build-thirdparty.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/spi/ant-import/build-thirdparty.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -54,6 +54,9 @@ <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <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-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericHandler.java (from rev 3165, trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,81 @@ +/* + * 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.wsf.spi.handler; + +// $Id: $ + +import javax.xml.ws.handler.Handler; +import javax.xml.ws.handler.MessageContext; + +/** + * A generic jaxws handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 13-Aug-2006 + */ +public abstract class GenericHandler implements Handler +{ + private String handlerName; + + public String getHandlerName() + { + return handlerName; + } + + public void setHandlerName(String handlerName) + { + this.handlerName = handlerName; + } + + public boolean handleMessage(MessageContext msgContext) + { + Boolean outbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); + if (outbound == null) + throw new IllegalStateException("Cannot obtain required property: " + MessageContext.MESSAGE_OUTBOUND_PROPERTY); + + return outbound ? handleOutbound(msgContext) : handleInbound(msgContext); + } + + protected boolean handleOutbound(MessageContext msgContext) + { + return true; + } + + protected boolean handleInbound(MessageContext msgContext) + { + return true; + } + + public boolean handleFault(MessageContext messagecontext) + { + return true; + } + + public void close(MessageContext messageContext) + { + } + + public String toString() + { + return (handlerName != null ? handlerName : super.toString()); + } +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericLogicalHandler.java (from rev 3165, trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericLogicalHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericLogicalHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,37 @@ +/* + * 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.wsf.spi.handler; + +// $Id$ + +import javax.xml.ws.handler.LogicalHandler; +import javax.xml.ws.handler.LogicalMessageContext; + +/** + * A generic jaxws logical handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 13-Aug-2006 + */ +public class GenericLogicalHandler<C extends LogicalMessageContext> extends GenericHandler implements LogicalHandler +{ +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericSOAPHandler.java (from rev 3165, trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericSOAPHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericSOAPHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,58 @@ +/* + * 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.wsf.spi.handler; + +// $Id: $ + +import java.util.HashSet; +import java.util.Set; + +import javax.xml.namespace.QName; +import javax.xml.ws.handler.LogicalMessageContext; +import javax.xml.ws.handler.soap.SOAPHandler; + + +/** + * A generic jaxws soap handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 13-Aug-2006 + */ +public abstract class GenericSOAPHandler<C extends LogicalMessageContext> extends GenericHandler implements SOAPHandler +{ + // The header blocks that can be processed by this Handler instance + private Set<QName> headers = new HashSet<QName>(); + + /** Gets the header blocks that can be processed by this Handler instance. + */ + public Set<QName> getHeaders() + { + return headers; + } + + /** Sets the header blocks that can be processed by this Handler instance. + */ + public void setHeaders(Set<QName> headers) + { + this.headers = headers; + } +} Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -10,29 +10,16 @@ <project> - <property name="tests.dir" value="${int.sunri.dir}/src/test"/> - <property name="tests.output.dir" value="${int.sunri.dir}/output-tests"/> + <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> + + <!-- Define excludesfile --> + <condition property="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss50.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss42.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> - <import file="${build.dir}/ant-import/build-testsuite.xml"/> - - <!-- - Run tests against jboss50 - --> - <target name="tests-jboss50" depends="tests-prepare-jboss50,tests"/> - <target name="tests-prepare-jboss50"> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss50.txt"/> - </target> - - <!-- - Run tests against jboss42 - --> - <target name="tests-jboss42" depends="tests-prepare-jboss42,tests"/> - <target name="tests-prepare-jboss42"> - <property name="jboss.home" value="${jboss42.home}"/> - <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss42.txt"/> - </target> - <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> @@ -63,53 +50,25 @@ <path id="javac.classpath"> <path refid="sunri.classpath"/> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/jaxb-api.jar"/> + <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.client}/jboss-common-core.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> </path> <!-- The test client classpath --> <path id="tests.client.classpath"> <path refid="sunri.classpath"/> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> </path> </target> - <!-- ================================================================== --> - <!-- Compiling --> - <!-- ================================================================== --> - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <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}" excludesfile="${excludesfile}"> - <src path="${testsuite.dir}/src/java"/> - <src path="${tests.java.dir}"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <!-- Copy resources --> - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy-test-resources srcdir="${testsuite.dir}/src"/> - <copy-test-resources srcdir="${int.sunri.dir}/src/test"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the deployments."/> - </project> Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt =================================================================== --- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,2 +1,24 @@ -# Nothing to exclude +org/jboss/test/ws/jaxws/samples/asynchronous/** +org/jboss/test/ws/jaxws/samples/context/** +# org/jboss/test/ws/jaxws/samples/eardeployment/** +org/jboss/test/ws/jaxws/samples/exception/** +org/jboss/test/ws/jaxws/samples/handlerchain/** +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/jaxr/** +org/jboss/test/ws/jaxws/samples/jsr181ejb/** +org/jboss/test/ws/jaxws/samples/jsr181pojo/** +org/jboss/test/ws/jaxws/samples/logicalhandler/** +org/jboss/test/ws/jaxws/samples/oneway/** +org/jboss/test/ws/jaxws/samples/provider/** +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/soapbinding/** +org/jboss/test/ws/jaxws/samples/webmethod/** +org/jboss/test/ws/jaxws/samples/webparam/** +org/jboss/test/ws/jaxws/samples/webresult/** +org/jboss/test/ws/jaxws/samples/webservice/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/samples/wsaddressing/** +org/jboss/test/ws/jaxws/samples/wseventing/** +org/jboss/test/ws/jaxws/samples/wssecurity/** +org/jboss/test/ws/jaxws/samples/xop/** Modified: trunk/integration/sunri/version.properties =================================================================== --- trunk/integration/sunri/version.properties 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/sunri/version.properties 2007-05-21 20:59:35 UTC (rev 3167) @@ -7,7 +7,6 @@ jboss-jaxr=1.2.0.GA jboss-jbossws-spi=SNAPSHOT jboss-security-spi=2.0.0.Beta -sun-jaxb=2.1.3 sun-jaxws=2.1.1 sun-servlet=2.5 Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -10,29 +10,16 @@ <project> - <property name="tests.dir" value="${int.xfire.dir}/src/test"/> - <property name="tests.output.dir" value="${int.xfire.dir}/output-tests"/> + <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> + + <!-- Define excludesfile --> + <condition property="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss50.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss42.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> - <import file="${build.dir}/ant-import/build-testsuite.xml"/> - - <!-- - Run tests against jboss50 - --> - <target name="tests-jboss50" depends="tests-prepare-jboss50,tests"/> - <target name="tests-prepare-jboss50"> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss50.txt"/> - </target> - - <!-- - Run tests against jboss42 - --> - <target name="tests-jboss42" depends="tests-prepare-jboss42,tests"/> - <target name="tests-prepare-jboss42"> - <property name="jboss.home" value="${jboss42.home}"/> - <property name="excludesfile" value="${int.xfire.dir}/src/test/resources/excludes-jboss42.txt"/> - </target> - <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> @@ -88,10 +75,15 @@ <!-- The combined compile classpath --> <path id="javac.classpath"> <path refid="xfire.classpath"/> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/jaxb-api.jar"/> + <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.client}/jboss-common-core.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> </path> <!-- The test client classpath --> @@ -108,34 +100,4 @@ </target> - <!-- ================================================================== --> - <!-- Compiling --> - <!-- ================================================================== --> - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <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}" excludesfile="${excludesfile}"> - <src path="${testsuite.dir}/src/java"/> - <src path="${tests.java.dir}"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <!-- Copy resources --> - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy-test-resources srcdir="${testsuite.dir}/src"/> - <copy-test-resources srcdir="${int.xfire.dir}/src/test"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the deployments."/> - </project> Modified: trunk/integration/xfire/src/test/resources/excludes-jboss50.txt =================================================================== --- trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,2 +1,24 @@ -# Nothing to exclude +org/jboss/test/ws/jaxws/samples/asynchronous/** +org/jboss/test/ws/jaxws/samples/context/** +# org/jboss/test/ws/jaxws/samples/eardeployment/** +org/jboss/test/ws/jaxws/samples/exception/** +org/jboss/test/ws/jaxws/samples/handlerchain/** +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/jaxr/** +org/jboss/test/ws/jaxws/samples/jsr181ejb/** +org/jboss/test/ws/jaxws/samples/jsr181pojo/** +org/jboss/test/ws/jaxws/samples/logicalhandler/** +org/jboss/test/ws/jaxws/samples/oneway/** +org/jboss/test/ws/jaxws/samples/provider/** +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/soapbinding/** +org/jboss/test/ws/jaxws/samples/webmethod/** +org/jboss/test/ws/jaxws/samples/webparam/** +org/jboss/test/ws/jaxws/samples/webresult/** +org/jboss/test/ws/jaxws/samples/webservice/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/samples/wsaddressing/** +org/jboss/test/ws/jaxws/samples/wseventing/** +org/jboss/test/ws/jaxws/samples/wssecurity/** +org/jboss/test/ws/jaxws/samples/xop/** Deleted: trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,472 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ============================================================ --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- ============================================================ --> - -<!-- $Id$ --> - -<project> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <target name="build-samples-jaxws" description="Build the jaxws sample deployments."> - - <mkdir dir="${tests.output.dir}/libs"/> - - <!-- jaxws-samples-asynchronous --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/> - </classes> - </war> - - <!-- jaxws-samples-context --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context-jboss4x.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.class"/> - </fileset> - </jar> - - <!-- jaxws-samples-exception --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/UserException.class"/> - </classes> - </war> - - <!-- jaxws-samples-handlerchain --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-server.xml"/> - </classes> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-handlerchain-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-client.xml"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/handlerchain/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.handlerchain.HandlerChainClient"/> - </manifest> - </jar> - - <!-- jaxws-samples-httpbinding --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> - <include name="wsdl/HttpBinding.wsdl"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> - <include name="wsdl/HttpBinding.wsdl"/> - </webinf> - </war> - - <!-- jaxws-samples-jsr181ejb --> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/> - <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF"> - <include name="jboss-wsse-server.xml"/> - <include name="wsse.*"/> - </metainf> - </jar> - - <!-- jaxws-samples-jsr181pojo --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/> - </classes> - </war> - - <!-- jaxws-samples-jsr181pojo-docwrapped --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war" - webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/> - </classes> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxws-samples-logicalhandler --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war" - webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml"/> - </classes> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war" - webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ObjectFactory.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml"/> - </classes> - </war> - - <!-- jaxws-samples-oneway --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/> - </classes> - </war> - - <!-- jaxws-samples-provider --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> - <include name="wsdl/Provider.wsdl"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> - <include name="wsdl/Provider.wsdl"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> - <include name="wsdl/Provider.wsdl"/> - </webinf> - </war> - - <!-- jaxws-samples-retail --> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> - <include name="wsdl/*"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxws-samples-soapbinding --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.class"/> - </classes> - </war> - - <!-- jaxws-samples-webmethod --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/> - </classes> - </war> - - <!-- jaxws-samples-webparam --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/> - </classes> - </war> - - <!-- jaxws-samples-webresult --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/> - </classes> - </war> - - <!-- jaxws-samples-webservice --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/> - </classes> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02"> - <include name="wsdl/**"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> - </classes> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02"> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> - </fileset> - </jar> - - <!-- jaxws-webserviceref --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/> - </classes> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/> - </manifest> - </jar> - <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war" - webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="jboss.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.class"/> - </fileset> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-secure"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/> - </manifest> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-override"> - <include name="jbossws-client-config.xml"/> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="wsdl/**"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/> - </manifest> - </jar> - - <!-- jaxws-samples-wsaddressing --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws-handlers.xml"/> - </classes> - </war> - - <!-- jaxws-samples-wseventing.war --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/wseventing/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF"> - <include name="wsdl/jboss-web.xml"/> - <include name="wsdl/sysmon.wsdl"/> - <include name="wsdl/ws-eventing.wsdl"/> - <include name="wsdl/ws-eventing.xsd"/> - <include name="wsdl/ws-addr.xsd"/> - </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 --> - <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/> - </classes> - </war> - - <!-- Please add alphabetically --> - - </target> - -</project> \ No newline at end of file Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -57,7 +57,6 @@ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> - <pathelement location="${jboss.client}/jbossretro-rt.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/> @@ -241,7 +240,6 @@ <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/> <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> </target> <target name="tests-main" depends="tests-jars" description="Build the deployments."/> Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws.handler; - -// $Id: $ - -import javax.xml.ws.handler.Handler; -import javax.xml.ws.handler.MessageContext; - -/** - * A generic jaxws handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 13-Aug-2006 - */ -public abstract class GenericHandler implements Handler -{ - private String handlerName; - - public String getHandlerName() - { - return handlerName; - } - - public void setHandlerName(String handlerName) - { - this.handlerName = handlerName; - } - - public boolean handleMessage(MessageContext msgContext) - { - Boolean outbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); - if (outbound == null) - throw new IllegalStateException("Cannot obtain required property: " + MessageContext.MESSAGE_OUTBOUND_PROPERTY); - - return outbound ? handleOutbound(msgContext) : handleInbound(msgContext); - } - - protected boolean handleOutbound(MessageContext msgContext) - { - return true; - } - - protected boolean handleInbound(MessageContext msgContext) - { - return true; - } - - public boolean handleFault(MessageContext messagecontext) - { - return true; - } - - public void close(MessageContext messageContext) - { - } - - public String toString() - { - return (handlerName != null ? handlerName : super.toString()); - } -} Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws.handler; - -// $Id$ - -import javax.xml.ws.handler.LogicalHandler; -import javax.xml.ws.handler.LogicalMessageContext; - -/** - * A generic jaxws logical handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 13-Aug-2006 - */ -public class GenericLogicalHandler<C extends LogicalMessageContext> extends GenericHandler implements LogicalHandler -{ -} Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws.handler; - -// $Id: $ - -import java.util.HashSet; -import java.util.Set; - -import javax.xml.namespace.QName; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.soap.SOAPHandler; - -/** - * A generic jaxws soap handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 13-Aug-2006 - */ -public abstract class GenericSOAPHandler<C extends LogicalMessageContext> extends GenericHandler implements SOAPHandler -{ - // The header blocks that can be processed by this Handler instance - private Set<QName> headers = new HashSet<QName>(); - - /** Gets the header blocks that can be processed by this Handler instance. - */ - public Set<QName> getHeaders() - { - return headers; - } - - /** Sets the header blocks that can be processed by this Handler instance. - */ - public void setHeaders(Set<QName> headers) - { - this.headers = headers; - } -} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -49,6 +49,8 @@ import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; import org.jboss.ws.metadata.umdm.ServiceMetaData; +import org.jboss.wsf.spi.handler.GenericHandler; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -33,8 +33,8 @@ import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; /** * A client side handler that reads/writes the addressing properties Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -34,10 +34,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; import org.jboss.ws.metadata.umdm.OperationMetaData; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; /** * A server side handler that reads/writes the addressing properties Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -35,7 +35,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.security.Constants; import org.jboss.ws.extensions.security.WSSecurityDispatcher; import org.jboss.ws.integration.UnifiedVirtualFile; @@ -43,6 +42,7 @@ import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; /** * An abstract JAXWS handler that delegates to the WSSecurityDispatcher Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/XOPTestSupport.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/XOPTestSupport.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/XOPTestSupport.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,106 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws; - -// $Id$ - -import java.awt.Image; -import java.awt.Toolkit; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.activation.DataHandler; -import javax.xml.transform.stream.StreamSource; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @since 22-Sep-2006 - */ -public class XOPTestSupport -{ - - public static byte[] getBytesFromFile(File file) throws IOException - { - InputStream is = new FileInputStream(file); - - long length = file.length(); - byte[] bytes = new byte[(int)length]; - - int offset = 0; - int numRead = 0; - while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) - { - offset += numRead; - } - - is.close(); - return bytes; - } - - public static Image createTestImage(File imgFile) - { - Image image = null; - try - { - URL url = imgFile.toURL(); - - image = null; - try - { - image = Toolkit.getDefaultToolkit().createImage(url); - } - catch (Throwable th) - { - //log.warn("Cannot create Image: " + th); - } - } - catch (MalformedURLException e) - { - throw new RuntimeException(e); - } - - return image; - } - - public static StreamSource createTestSource() - { - return new StreamSource(new ByteArrayInputStream("<some><nestedXml/></some>".getBytes())); - } - - public static DataHandler createDataHandler(File imgFile) - { - try - { - URL url = imgFile.toURL(); - return new DataHandler(url); - } - catch (MalformedURLException e) - { - throw new RuntimeException(e); - } - } -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java (from rev 3165, trunk/jbossws-core/src/test/java/org/jboss/test/ws/XOPTestSupport.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,106 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.xop; + +// $Id$ + +import java.awt.Image; +import java.awt.Toolkit; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.activation.DataHandler; +import javax.xml.transform.stream.StreamSource; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @since 22-Sep-2006 + */ +public class XOPTestSupport +{ + + public static byte[] getBytesFromFile(File file) throws IOException + { + InputStream is = new FileInputStream(file); + + long length = file.length(); + byte[] bytes = new byte[(int)length]; + + int offset = 0; + int numRead = 0; + while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) + { + offset += numRead; + } + + is.close(); + return bytes; + } + + public static Image createTestImage(File imgFile) + { + Image image = null; + try + { + URL url = imgFile.toURL(); + + image = null; + try + { + image = Toolkit.getDefaultToolkit().createImage(url); + } + catch (Throwable th) + { + //log.warn("Cannot create Image: " + th); + } + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } + + return image; + } + + public static StreamSource createTestSource() + { + return new StreamSource(new ByteArrayInputStream("<some><nestedXml/></some>".getBytes())); + } + + public static DataHandler createDataHandler(File imgFile) + { + try + { + URL url = imgFile.toURL(); + return new DataHandler(url); + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } + } +} Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -29,7 +29,7 @@ import javax.xml.transform.Source; import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.XOPTestSupport; +import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -30,7 +30,7 @@ import javax.xml.transform.Source; import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.XOPTestSupport; +import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -29,7 +29,7 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; /** * A client side handler Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -28,7 +28,7 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; public class ProtocolHandler extends GenericSOAPHandler { Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -21,9 +21,9 @@ */ package org.jboss.test.ws.jaxws.wsdd; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.core.soap.TextImpl; import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; Modified: trunk/jbossws-core/version.properties =================================================================== --- trunk/jbossws-core/version.properties 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/jbossws-core/version.properties 2007-05-21 20:59:35 UTC (rev 3167) @@ -7,7 +7,6 @@ javassist=3.5.0.CR1 jbossws-wsconsume-impl=2.0.0 jbpm-bpel=1.1.0.Beta5 -sun-jaxb=2.1.3 stax-api=1.0 # Thirdparty library versions Modified: trunk/testsuite/.classpath =================================================================== --- trunk/testsuite/.classpath 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/testsuite/.classpath 2007-05-21 20:59:35 UTC (rev 3167) @@ -10,5 +10,8 @@ <classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/junit.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/activation.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-impl.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/testsuite/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -20,20 +20,48 @@ <mkdir dir="${tests.output.dir}/libs"/> + <!-- jaxws-samples-asynchronous --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/> + </classes> + </war> + + <!-- jaxws-samples-context --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context-jboss4x.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.class"/> + </fileset> + </jar> + <!-- jaxws-eardeployment --> - <war warfile="${tests.output.dir}/libs/jaxws-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/eardeployment/JSEBean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF"> <include name="wsdl/**"/> </webinf> </war> <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF"> <include name="wsdl/**"/> </metainf> </jar> @@ -42,7 +70,7 @@ <include name="jaxws-eardeployment.jar"/> <include name="jaxws-eardeployment.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF"> <include name="jboss-app.xml"/> </metainf> </jar> @@ -51,11 +79,430 @@ <include name="jaxws-eardeployment.jar"/> <include name="jaxws-eardeployment.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF"> <include name="application.xml"/> </metainf> </jar> + <!-- jaxws-samples-exception --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/UserException.class"/> + </classes> + </war> + + <!-- jaxws-samples-handlerchain --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-server.xml"/> + </classes> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-handlerchain-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClient.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-client.xml"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/handlerchain/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.handlerchain.HandlerChainClient"/> + </manifest> + </jar> + + <!-- jaxws-samples-httpbinding --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <include name="wsdl/HttpBinding.wsdl"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <include name="wsdl/HttpBinding.wsdl"/> + </webinf> + </war> + + <!-- jaxws-samples-jsr181ejb --> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/> + <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF"> + <include name="jboss-wsse-server.xml"/> + <include name="wsse.*"/> + </metainf> + </jar> + + <!-- jaxws-samples-jsr181pojo --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/> + </classes> + </war> + + <!-- jaxws-samples-jsr181pojo-docwrapped --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war" + webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/> + </classes> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/> + <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/> + <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + + <!-- jaxws-samples-logicalhandler --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war" + webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml"/> + </classes> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war" + webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ObjectFactory.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml"/> + </classes> + </war> + + <!-- jaxws-samples-oneway --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/> + </classes> + </war> + + <!-- jaxws-samples-provider --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> + <include name="wsdl/Provider.wsdl"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> + <include name="wsdl/Provider.wsdl"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> + <include name="wsdl/Provider.wsdl"/> + </webinf> + </war> + + <!-- jaxws-samples-retail --> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> + <include name="wsdl/*"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + + <!-- jaxws-samples-soapbinding --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.class"/> + </classes> + </war> + + <!-- jaxws-samples-webmethod --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/> + </classes> + </war> + + <!-- jaxws-samples-webparam --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/> + </classes> + </war> + + <!-- jaxws-samples-webresult --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/> + </classes> + </war> + + <!-- jaxws-samples-webservice --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/> + </classes> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02"> + <include name="wsdl/**"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> + </classes> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02"> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> + </fileset> + </jar> + + <!-- jaxws-webserviceref --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/> + </classes> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/> + </manifest> + </jar> + <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war" + webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <include name="jboss.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.class"/> + </fileset> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-secure"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/> + </manifest> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-override"> + <include name="jbossws-client-config.xml"/> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <include name="wsdl/**"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/> + </manifest> + </jar> + + <!-- jaxws-samples-wsaddressing --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws-handlers.xml"/> + </classes> + </war> + + <!-- jaxws-samples-wseventing.war --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wseventing/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF"> + <include name="wsdl/jboss-web.xml"/> + <include name="wsdl/sysmon.wsdl"/> + <include name="wsdl/ws-eventing.wsdl"/> + <include name="wsdl/ws-eventing.xsd"/> + <include name="wsdl/ws-addr.xsd"/> + </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 --> + <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/> + </classes> + </war> + <!-- Please add alphabetically --> </target> Modified: trunk/testsuite/ant-import/build-testsuite.xml =================================================================== --- trunk/testsuite/ant-import/build-testsuite.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/testsuite/ant-import/build-testsuite.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -5,36 +5,26 @@ <import file="${build.dir}/ant-import/build-testsuite.xml"/> - <property name="excludesfile" value="${testsuite.dir}/src/resources/dummy-excludes.txt"/> + <!-- Define jboss.home --> + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> <!-- Init the various classpaths --> <target name="tests-init" depends="tests-prepare"> - - <!-- Define jboss.home --> - <condition property="jboss.home" value="${jboss50.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="jboss.home" value="${jboss42.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - <!-- The combined compile classpath --> - <path id="javac.classpath"> - <pathelement location="${spi.dir}/output/classes"/> - <path refid="spi.thirdparty.classpath"/> - </path> - </target> <!-- ================================================================== --> <!-- Compiling --> <!-- ================================================================== --> - <target name="tests-compile" depends="tests-compile15" description="Compile sources"/> - - <target name="tests-compile15" depends="tests-init" if="HAVE_JDK_1.5"> + <target name="tests-compile" depends="tests-init" description="Compile sources"> <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}" excludesfile="${excludesfile}"> @@ -49,7 +39,7 @@ <!-- Copy resources --> <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy-test-resources srcdir="${basedir}/src"/> + <copy-test-resources srcdir="${tests.dir}"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples (from rev 3165, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/context) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment (from rev 3165, trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment) Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.eardeployment; - -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.annotation.WebContext; - -// Test that the wsdl can be read from the nested deployment -@WebService(name="TestEndpoint", serviceName="TestEndpointService", wsdlLocation="META-INF/wsdl/TestEndpoint.wsdl") -@SOAPBinding(style = SOAPBinding.Style.RPC) -@WebContext(contextRoot="/earejb3") -@Stateless -public class EJB3Bean -{ - private static Logger log = Logger.getLogger(EJB3Bean.class); - - @WebMethod - public String echo(String input) - { - log.info("echo: " + input); - return input; - } -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java (from rev 3166, trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.eardeployment; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.annotation.WebContext; + +// Test that the wsdl can be read from the nested deployment +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") +@SOAPBinding(style = SOAPBinding.Style.RPC) +@WebContext(contextRoot = "/earejb3") +@Stateless +public class EJB3Bean +{ + private static Logger log = Logger.getLogger(EJB3Bean.class); + + @WebMethod + @WebResult(name = "return") + public String echo(@WebParam(name = "arg0") String input) + { + log.info("echo: " + input); + return input; + } +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,71 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.eardeployment; - -import java.net.URL; - -import javax.xml.namespace.QName; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestHelper; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * Test ear deployment - * - * @author Thomas.Diesler(a)jboss.org - * @since 08-Dec-2006 - */ -public class EarTestCase extends JBossWSTest -{ - public static Test suite() - { - String earName = (JBossWSTestHelper.isTargetJBoss50() ? "jaxws-eardeployment.ear" : "jaxws-eardeployment42.ear"); - return JBossWSTestSetup.newTestSetup(EarTestCase.class, earName); - } - - public void testEJB3Endpoint() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/earejb3/EJB3Bean?wsdl"); - QName serviceName = new QName("http://eardeployment.jaxws.ws.test.jboss.org/";, "TestEndpointService"); - TestEndpointService service = new TestEndpointService(wsdlURL, serviceName); - TestEndpoint port = service.getTestEndpointPort(); - - String helloWorld = "Hello world!"; - String retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testJSEEndpoint() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/earjse/JSEBean?wsdl"); - QName serviceName = new QName("http://eardeployment.jaxws.ws.test.jboss.org/";, "TestEndpointService"); - TestEndpointService service = new TestEndpointService(wsdlURL, serviceName); - TestEndpoint port = service.getTestEndpointPort(); - - String helloWorld = "Hello world!"; - String retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java (from rev 3166, trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,81 @@ +/* + * 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.eardeployment; + +import java.net.URL; + +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.JBossWSTestHelper; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * Test ear deployment + * + * @author Thomas.Diesler(a)jboss.org + * @since 08-Dec-2006 + */ +public class EarTestCase extends JBossWSTest +{ + public static Test suite() + { + String earName = (JBossWSTestHelper.isTargetJBoss50() ? "jaxws-eardeployment.ear" : "jaxws-eardeployment42.ear"); + return JBossWSTestSetup.newTestSetup(EarTestCase.class, earName); + } + + public void testEJB3Endpoint() throws Exception + { + String soapAddress = "http://" + getServerHost() + ":8080/earejb3/EJB3Bean"; + QName serviceName = new QName("http://eardeployment.jaxws/", "TestEndpointService"); + Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); + TestEndpoint port = service.getPort(TestEndpoint.class); + + // [JBWS-1655] Add support for endpoint address rewriting + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); + + String helloWorld = "Hello world!"; + String retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testJSEEndpoint() throws Exception + { + String soapAddress = "http://" + getServerHost() + ":8080/earjse/JSEBean"; + QName serviceName = new QName("http://eardeployment.jaxws/", "TestEndpointService"); + Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); + TestEndpoint port = service.getPort(TestEndpoint.class); + + // [JBWS-1655] Add support for endpoint address rewriting + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); + + String helloWorld = "Hello world!"; + String retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/JSEBean.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.eardeployment; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.logging.Logger; - -//Test that the wsdl can be read from the nested deployment -@WebService(name="TestEndpoint", serviceName="TestEndpointService", wsdlLocation="WEB-INF/wsdl/TestEndpoint.wsdl") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class JSEBean -{ - private static Logger log = Logger.getLogger(JSEBean.class); - - @WebMethod - public String echo(String input) - { - log.info("echo: " + input); - return input; - } -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java (from rev 3166, trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/JSEBean.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,46 @@ +/* + * 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.eardeployment; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; + +//Test that the wsdl can be read from the nested deployment +@WebService(name="TestEndpoint", serviceName="TestEndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation="WEB-INF/wsdl/TestEndpoint.wsdl") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class JSEBean +{ + private static Logger log = Logger.getLogger(JSEBean.class); + + @WebMethod + @WebResult(name="return") + public String echo(@WebParam(name="arg0") String input) + { + log.info("echo: " + input); + return input; + } +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpoint.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,34 +0,0 @@ - -package org.jboss.test.ws.jaxws.eardeployment; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.1-11/15/2006 04:41 PM(vivek)-EA3 - * Generated source version: 2.1 - * - */ -@WebService(name = "TestEndpoint", targetNamespace = "http://eardeployment.jaxws.ws.test.jboss.org/") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint { - - - /** - * - * @param arg0 - * @return - * returns java.lang.String - */ - @WebMethod - @WebResult(partName = "return") - public String echo( - @WebParam(name = "arg0", partName = "arg0") - String arg0); - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java (from rev 3166, trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpoint.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,34 @@ + +package org.jboss.test.ws.jaxws.samples.eardeployment; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.1-11/15/2006 04:41 PM(vivek)-EA3 + * Generated source version: 2.1 + * + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://eardeployment.jaxws/") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpointService.java 2007-05-21 17:30:28 UTC (rev 3165) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -1,67 +0,0 @@ - -package org.jboss.test.ws.jaxws.eardeployment; - -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebEndpoint; -import javax.xml.ws.WebServiceClient; -import javax.xml.ws.WebServiceFeature; - - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.1-11/15/2006 04:41 PM(vivek)-EA3 - * Generated source version: 2.1 - * - */ -@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://eardeployment.jaxws.ws.test.jboss.org/", wsdlLocation = "file:/home/tdiesler/svn/jbossws/trunk/src/test/resources/jaxws/eardeployment/META-INF/wsdl/TestEndpoint.wsdl") -public class TestEndpointService - extends Service -{ - - private final static URL TESTENDPOINTSERVICE_WSDL_LOCATION; - - static { - URL url = null; - try { - url = new URL("file:/home/tdiesler/svn/jbossws/trunk/src/test/resources/jaxws/eardeployment/META-INF/wsdl/TestEndpoint.wsdl"); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - TESTENDPOINTSERVICE_WSDL_LOCATION = url; - } - - public TestEndpointService(URL wsdlLocation, QName serviceName) { - super(wsdlLocation, serviceName); - } - - public TestEndpointService() { - super(TESTENDPOINTSERVICE_WSDL_LOCATION, new QName("http://eardeployment.jaxws.ws.test.jboss.org/";, "TestEndpointService")); - } - - /** - * - * @return - * returns TestEndpoint - */ - @WebEndpoint(name = "TestEndpointPort") - public TestEndpoint getTestEndpointPort() { - return (TestEndpoint)super.getPort(new QName("http://eardeployment.jaxws.ws.test.jboss.org/";, "TestEndpointPort"), TestEndpoint.class); - } - - /** - * - * @param features - * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values. - * @return - * returns TestEndpoint - */ - @WebEndpoint(name = "TestEndpointPort") - public TestEndpoint getTestEndpointPort(WebServiceFeature... features) { - return (TestEndpoint)super.getPort(new QName("http://eardeployment.jaxws.ws.test.jboss.org/";, "TestEndpointPort"), TestEndpoint.class, features); - } - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java (from rev 3166, trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/TestEndpointService.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpointService.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,66 @@ + +package org.jboss.test.ws.jaxws.samples.eardeployment; + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.1-11/15/2006 04:41 PM(vivek)-EA3 + * Generated source version: 2.1 + * + */ +@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://eardeployment.jaxws.ws.test.jboss.org/", wsdlLocation = "file:/home/tdiesler/svn/jbossws/trunk/src/test/resources/jaxws/eardeployment/META-INF/wsdl/TestEndpoint.wsdl") +public class TestEndpointService + extends Service +{ + + private final static URL TESTENDPOINTSERVICE_WSDL_LOCATION; + + static { + URL url = null; + try { + url = new URL("file:/home/tdiesler/svn/jbossws/trunk/src/test/resources/jaxws/eardeployment/META-INF/wsdl/TestEndpoint.wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + TESTENDPOINTSERVICE_WSDL_LOCATION = url; + } + + public TestEndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public TestEndpointService() { + super(TESTENDPOINTSERVICE_WSDL_LOCATION, new QName("http://eardeployment.jaxws.ws.test.jboss.org/";, "TestEndpointService")); + } + + /** + * + * @return + * returns TestEndpoint + */ + @WebEndpoint(name = "TestEndpointPort") + public TestEndpoint getTestEndpointPort() { + return (TestEndpoint)super.getPort(new QName("http://eardeployment.jaxws.ws.test.jboss.org/";, "TestEndpointPort"), TestEndpoint.class); + } + + /** + * TDI: commented out because WebServiceFeature is not part of xfire-jsr181-api (xfire-1.2.6) + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values. + * @return + * returns TestEndpoint + @WebEndpoint(name = "TestEndpointPort") + public TestEndpoint getTestEndpointPort(WebServiceFeature... features) { + return (TestEndpoint)super.getPort(new QName("http://eardeployment.jaxws.ws.test.jboss.org/";, "TestEndpointPort"), TestEndpoint.class, features); + } + */ +} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/exception) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding) Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -39,8 +39,6 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; @@ -64,9 +62,8 @@ public void testWSDLAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-httpbinding-payload?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); + Element wsdl = DOMUtils.parse(wsdlURL.openStream()); + assertNotNull(wsdl); } public void testProviderDispatch() throws Exception Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181ejb) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jsr181pojo (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/jsr181pojo) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler) Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -28,7 +28,7 @@ import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; -import org.jboss.ws.core.jaxws.handler.GenericLogicalHandler; +import org.jboss.wsf.spi.handler.GenericLogicalHandler; public class LogicalJAXBHandler extends GenericLogicalHandler { Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/oneway) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/provider) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/retail) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/soapbinding) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webmethod) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webparam) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webresult) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webservice) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wseventing (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing) Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity) Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -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 May 21 19:38:54 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. + * + * 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: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloService.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloService.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloService.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,59 @@ + +package org.jboss.test.ws.jaxws.samples.wssecurity; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; + + +/** + * JBossWS Generated Source + * + * Generation Date: Mon May 21 19:38:54 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. + * + * JAX-WS Version: 2.0 + * + */ +@WebServiceClient(name = "HelloService", targetNamespace = "http://org.jboss.ws/samples/wssecurity", wsdlLocation = "file:/home/tdiesler/svn/jbossws/trunk/jbossws-core/src/test/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl") +public class HelloService + extends Service +{ + + private final static URL HELLOSERVICE_WSDL_LOCATION; + + static { + URL url = null; + try { + url = new URL("file:/home/tdiesler/svn/jbossws/trunk/jbossws-core/src/test/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + HELLOSERVICE_WSDL_LOCATION = url; + } + + public HelloService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public HelloService() { + super(HELLOSERVICE_WSDL_LOCATION, new QName("http://org.jboss.ws/samples/wssecurity", "HelloService")); + } + + /** + * + * @return + * returns Hello + */ + @WebEndpoint(name = "HelloPort") + public Hello getHelloPort() { + return (Hello)super.getPort(new QName("http://org.jboss.ws/samples/wssecurity", "HelloPort"), Hello.class); + } + +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -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: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop (from rev 3166, trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/xop) Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/XOPTestSupport.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/XOPTestSupport.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/XOPTestSupport.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -0,0 +1,106 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.xop; + +// $Id$ + +import java.awt.Image; +import java.awt.Toolkit; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.activation.DataHandler; +import javax.xml.transform.stream.StreamSource; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @since 22-Sep-2006 + */ +public class XOPTestSupport +{ + + public static byte[] getBytesFromFile(File file) throws IOException + { + InputStream is = new FileInputStream(file); + + long length = file.length(); + byte[] bytes = new byte[(int)length]; + + int offset = 0; + int numRead = 0; + while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) + { + offset += numRead; + } + + is.close(); + return bytes; + } + + public static Image createTestImage(File imgFile) + { + Image image = null; + try + { + URL url = imgFile.toURL(); + + image = null; + try + { + image = Toolkit.getDefaultToolkit().createImage(url); + } + catch (Throwable th) + { + //log.warn("Cannot create Image: " + th); + } + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } + + return image; + } + + public static StreamSource createTestSource() + { + return new StreamSource(new ByteArrayInputStream("<some><nestedXml/></some>".getBytes())); + } + + public static DataHandler createDataHandler(File imgFile) + { + try + { + URL url = imgFile.toURL(); + return new DataHandler(url); + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } + } +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/XOPTestSupport.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-05-21 20:59:35 UTC (rev 3167) @@ -31,7 +31,7 @@ import javax.xml.ws.soap.SOAPBinding; import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.XOPTestSupport; +import org.jboss.test.ws.jaxws.samples.xop.XOPTestSupport; /** * User: hbraun Copied: trunk/testsuite/src/resources/jaxws/samples (from rev 3165, trunk/jbossws-core/src/test/resources/jaxws/samples) Copied: trunk/testsuite/src/resources/jaxws/samples/asynchronous (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/asynchronous) Copied: trunk/testsuite/src/resources/jaxws/samples/context (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/context) Copied: trunk/testsuite/src/resources/jaxws/samples/eardeployment (from rev 3165, trunk/testsuite/src/resources/jaxws/eardeployment) Copied: trunk/testsuite/src/resources/jaxws/samples/eardeployment/META-INF (from rev 3166, trunk/testsuite/src/resources/jaxws/eardeployment/META-INF) Copied: trunk/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF (from rev 3166, trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF) Modified: trunk/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/web.xml =================================================================== --- trunk/testsuite/src/resources/jaxws/eardeployment/WEB-INF/web.xml 2007-05-21 17:48:34 UTC (rev 3166) +++ trunk/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/web.xml 2007-05-21 20:59:35 UTC (rev 3167) @@ -7,7 +7,7 @@ <servlet> <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.eardeployment.JSEBean</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.samples.eardeployment.JSEBean</servlet-class> </servlet> <servlet-mapping> Copied: trunk/testsuite/src/resources/jaxws/samples/exception (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/exception) Copied: trunk/testsuite/src/resources/jaxws/samples/handlerchain (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/handlerchain) Copied: trunk/testsuite/src/resources/jaxws/samples/httpbinding (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/httpbinding) Copied: trunk/testsuite/src/resources/jaxws/samples/jsr181ejb (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/jsr181ejb) Copied: trunk/testsuite/src/resources/jaxws/samples/jsr181pojo (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/jsr181pojo) Copied: trunk/testsuite/src/resources/jaxws/samples/logicalhandler (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/logicalhandler) Copied: trunk/testsuite/src/resources/jaxws/samples/oneway (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/oneway) Copied: trunk/testsuite/src/resources/jaxws/samples/provider (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/provider) Copied: trunk/testsuite/src/resources/jaxws/samples/retail (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/retail) Copied: trunk/testsuite/src/resources/jaxws/samples/soapbinding (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/soapbinding) Copied: trunk/testsuite/src/resources/jaxws/samples/webmethod (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/webmethod) Copied: trunk/testsuite/src/resources/jaxws/samples/webparam (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/webparam) Copied: trunk/testsuite/src/resources/jaxws/samples/webresult (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/webresult) Copied: trunk/testsuite/src/resources/jaxws/samples/webservice (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/webservice) Copied: trunk/testsuite/src/resources/jaxws/samples/webserviceref (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/webserviceref) Copied: trunk/testsuite/src/resources/jaxws/samples/wsaddressing (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/wsaddressing) Copied: trunk/testsuite/src/resources/jaxws/samples/wseventing (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/wseventing) Copied: trunk/testsuite/src/resources/jaxws/samples/wssecurity (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/wssecurity) Copied: trunk/testsuite/src/resources/jaxws/samples/xop (from rev 3166, trunk/jbossws-core/src/test/resources/jaxws/samples/xop)