[jbossws-commits] JBossWS SVN: r2607 - in trunk: jbossws-tests and 15 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-03-13 11:10:18 -0400 (Tue, 13 Mar 2007) New Revision: 2607 Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws-handlers.xml Removed: trunk/jbossws-tests/src/resources/jaxws/handlerscope/META-INF/ trunk/jbossws-tests/src/resources/jaxws/handlerscope/WEB-INF/jaxws-server-handlers.xml trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-jaxb-handlers.xml trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-source-handlers.xml trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-jaxb-handlers.xml trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-source-handlers.xml trunk/jbossws-tests/src/resources/jaxws/samples/retail/META-INF/jaxws-handler.xml trunk/jbossws-tests/src/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java trunk/jbossws-tests/ant-import/build-jars-jaxws.xml trunk/jbossws-tests/ant-import/build-samples-jaxws.xml trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSource.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceImpl.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java Log: Add handler lifecycle test case Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -169,7 +169,7 @@ return; URL fileURL = null; - if(log.isDebugEnabled()) log.debug("processHandlerChain [" + filename + "] on: " + wsClass.getName()); + log.debug("processHandlerChain [" + filename + "] on: " + wsClass.getName()); // Try the filename as URL try @@ -205,8 +205,16 @@ // Try the filename relative to class if (fileURL == null) { + String filepath = filename; String packagePath = wsClass.getPackage().getName().replace('.', '/'); - fileURL = epMetaData.getClassLoader().getResource(packagePath + "/" + filename); + String resourcePath = packagePath + "/" + filepath; + while (filepath.startsWith("../")) + { + packagePath = packagePath.substring(0, packagePath.lastIndexOf("/")); + filepath = filepath.substring(3); + resourcePath = packagePath + "/" + filepath; + } + fileURL = epMetaData.getClassLoader().getResource(resourcePath); } if (fileURL == null) Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -122,16 +122,24 @@ </webinf> </war> + <!-- jaxws-handlerlifecycle --> + <war warfile="${tests.output.dir}/libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.class"/> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml"/> + </classes> + </war> + <!-- jaxws-handlerscope --> <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class"/> + <include name="org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF"> - <include name="jaxws-server-handlers.xml"/> - </webinf> </war> <!-- jaxws-jbws860 --> Modified: trunk/jbossws-tests/ant-import/build-samples-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -56,8 +56,6 @@ </war> <!-- jaxws-samples-handlerchain --> - <copy todir="${tests.output.dir}/classes/org/jboss/test/ws/jaxws/samples/handlerchain" - file="${tests.output.dir}/resources/jaxws/samples/handlerchain/jaxws-handlers.xml"/> <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"/> @@ -132,10 +130,8 @@ <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> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF"> - <include name="jaxws-server-source-handlers.xml"/> - </webinf> </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"> @@ -147,10 +143,8 @@ <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> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF"> - <include name="jaxws-server-jaxb-handlers.xml"/> - </webinf> </war> <!-- jaxws-samples-oneway --> @@ -192,10 +186,10 @@ <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/*"/> - <include name="jaxws-handler.xml"/> </metainf> </jar> <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail-client.jar"> @@ -389,10 +383,8 @@ <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> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF"> - <include name="jaxws-handlers.xml"/> - </webinf> </war> <!-- jaxws-samples-wseventing.war --> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/build.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -395,6 +395,14 @@ <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/> <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/> + <!-- copy handler definitions --> + <copy todir="${tests.output.dir}/classes"> + <fileset dir="${tests.java.dir}"> + <include name="**/*.xml"/> + </fileset> + </copy> + + <!-- copy non binary files --> <copy todir="${tests.output.dir}/resources"> <fileset dir="${tests.resources.dir}"> <include name="**/*.wsdl"/> Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,61 @@ +/* + * 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.handlerlifecycle; + +// $Id$ + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * Test JAXWS handler lifecycle + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Aug-2006 + */ +public class HandlerLifecycleTestCase extends JBossWSTest +{ + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(HandlerLifecycleTestCase.class, "jaxws-handlerlifecycle.war"); + } + + public void testClientAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-handlerlifecycle?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jaxws/handlerlifecycle", "SOAPEndpointService"); + Service service = Service.create(wsdlURL, serviceName); + SOAPEndpoint port = (SOAPEndpoint)service.getPort(SOAPEndpoint.class); + + String retStr = port.echo("hello"); + + StringBuffer expStr = new StringBuffer("hello:ServerHandler:endpoint:ServerHandler"); + assertEquals(expStr.toString(), retStr); + } +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.handlerlifecycle; + +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; + +public class LifecycleHandler extends GenericSOAPHandler +{ + @Override + public boolean handleOutbound(MessageContext msgContext) + { + return appendHandlerName(msgContext); + } + + @Override + public boolean handleInbound(MessageContext msgContext) + { + return appendHandlerName(msgContext); + } + + private boolean appendHandlerName(MessageContext msgContext) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next(); + soapElement = (SOAPElement)soapElement.getChildElements().next(); + String value = soapElement.getValue(); + + String handlerName = getHandlerName(); + soapElement.setValue(value + ":" + handlerName); + + return true; + } + catch (SOAPException ex) + { + throw new WebServiceException(ex); + } + } +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,34 @@ +/* + * 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.handlerlifecycle; + +//$Id$ + +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService +public interface SOAPEndpoint +{ + @WebMethod + public String echo(String msg); +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,47 @@ +/* + * 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.handlerlifecycle; + +// $Id$ + +import javax.jws.HandlerChain; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + +import org.jboss.logging.Logger; + +@WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/handlerlifecycle") +@HandlerChain(file = "jaxws-server-handlers.xml") +@SOAPBinding(style = Style.RPC) +public class SOAPEndpointBean +{ + private static Logger log = Logger.getLogger(SOAPEndpointBean.class); + + @WebMethod + public String echo(String msg) + { + log.info("echo: " + msg); + return msg + ":endpoint"; + } +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <handler> + <handler-name> ServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerlifecycle.LifecycleHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -30,7 +30,7 @@ @WebService @BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/") -@HandlerChain(file = "resources/jaxws/handlerscope/META-INF/jaxws-client-handlers.xml") +@HandlerChain(file = "jaxws-client-handlers.xml") public interface SOAPEndpoint { @WebMethod Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -34,7 +34,7 @@ @WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/handlerscope") @BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/") // SOAP-1.2 -@HandlerChain(file = "WEB-INF/jaxws-server-handlers.xml") +@HandlerChain(file = "jaxws-server-handlers.xml") @SOAPBinding(style = Style.RPC) public class SOAPEndpointBean { Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml (from rev 2604, trunk/jbossws-tests/src/resources/jaxws/handlerscope/META-INF/jaxws-client-handlers.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <protocol-bindings>##SOAP12_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP12ClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP ##SOAP12_HTTP</protocol-bindings> + <handler> + <handler-name> SOAPClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:SOAPEndpointService</service-name-pattern> + <handler> + <handler-name> ServiceClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:SOAPEndpointSer*</service-name-pattern> + <handler> + <handler-name> ServiceWildcardClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:InvalidService</service-name-pattern> + <handler> + <handler-name> InvalidServiceClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> + <handler> + <handler-name> PortClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPo*</port-name-pattern> + <handler> + <handler-name> PortWildcardClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:InvalidPort</port-name-pattern> + <handler> + <handler-name> InvalidPortClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <handler> + <handler-name> GeneralClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml (from rev 2604, trunk/jbossws-tests/src/resources/jaxws/handlerscope/WEB-INF/jaxws-server-handlers.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <protocol-bindings>##SOAP12_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP12ServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP ##SOAP12_HTTP</protocol-bindings> + <handler> + <handler-name> SOAPServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:SOAPEndpointService</service-name-pattern> + <handler> + <handler-name> ServiceServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:SOAPEndpointSer*</service-name-pattern> + <handler> + <handler-name> ServiceWildcardServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:InvalidService</service-name-pattern> + <handler> + <handler-name> InvalidServiceServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> + <handler> + <handler-name> PortServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPo*</port-name-pattern> + <handler> + <handler-name> PortWildcardServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:InvalidPort</port-name-pattern> + <handler> + <handler-name> InvalidPortServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <handler> + <handler-name> GeneralServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -32,7 +32,7 @@ import javax.xml.ws.ResponseWrapper; @WebService() -@HandlerChain(file = "resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-jaxb-handlers.xml") +@HandlerChain(file = "jaxws-client-jaxb-handlers.xml") public interface SOAPEndpointJAXB { Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -34,7 +34,7 @@ import org.jboss.logging.Logger; @WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler") -@HandlerChain(file = "WEB-INF/jaxws-server-jaxb-handlers.xml") +@HandlerChain(file = "jaxws-server-jaxb-handlers.xml") public class SOAPEndpointJAXBImpl { private static Logger log = Logger.getLogger(SOAPEndpointJAXBImpl.class); Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSource.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSource.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSource.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -32,7 +32,7 @@ import javax.xml.ws.ResponseWrapper; @WebService() -@HandlerChain(file = "resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-source-handlers.xml") +@HandlerChain(file = "jaxws-client-source-handlers.xml") public interface SOAPEndpointSource { Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceImpl.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceImpl.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceImpl.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -34,7 +34,7 @@ import org.jboss.logging.Logger; @WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler") -@HandlerChain(file = "WEB-INF/jaxws-server-source-handlers.xml") +@HandlerChain(file = "jaxws-server-source-handlers.xml") public class SOAPEndpointSourceImpl { private static Logger log = Logger.getLogger(SOAPEndpointSourceImpl.class); Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml (from rev 2604, trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-jaxb-handlers.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <handler> + <handler-name> LogicalClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalJAXBHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> + <handler> + <handler-name> PortClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml (from rev 2604, trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-source-handlers.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <handler> + <handler-name> LogicalClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalSourceHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> + <handler> + <handler-name> PortClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml (from rev 2606, trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-jaxb-handlers.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <handler> + <handler-name> LogicalServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalJAXBHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> + <handler> + <handler-name> PortServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml (from rev 2606, trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-source-handlers.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <handler> + <handler-name> LogicalServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalSourceHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> + <handler> + <handler-name> PortServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -42,7 +42,7 @@ */ @Stateless @WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.OrderMgmt", name="OrderMgmt", serviceName = "OrderMgmtService") -@HandlerChain(file = "META-INF/jaxws-handler.xml") +@HandlerChain(file = "jaxws-handler.xml") public class OrderMgmtBean implements OrderMgmt { private static final Logger log = Logger.getLogger(OrderMgmtBean.class); Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -30,7 +30,7 @@ @Stateless @WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.cc.CCVerification", name="CCVerification") -@HandlerChain(file = "META-INF/jaxws-handler.xml") +@HandlerChain(file = "../jaxws-handler.xml") public class CCVerificationBean implements CCVerification { private static final Logger log = Logger.getLogger(CCVerificationBean.class); Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml (from rev 2604, trunk/jbossws-tests/src/resources/jaxws/samples/retail/META-INF/jaxws-handler.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name>SOAPMessageTrace</handler-name> + <handler-class>org.jboss.test.ws.jaxws.samples.retail.handler.SOAPMessageTrace</handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -27,7 +27,7 @@ @Stateless @WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.profile.ProfileMgmt", name="ProfileMgmt", serviceName = "ProfileMgmtService") -@HandlerChain(file = "META-INF/jaxws-handler.xml") +@HandlerChain(file = "../jaxws-handler.xml") public class ProfileMgmtBean implements ProfileMgmt { public DiscountResponse getCustomerDiscount(DiscountRequest request) { Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -48,7 +48,7 @@ */ @WebService(name = "StatefulEndpoint", targetNamespace = "http://org.jboss.ws/samples/wsaddressing", serviceName = "TestService") @EndpointConfig(configName = "Standard WSAddressing Endpoint") -@HandlerChain(file = "WEB-INF/jaxws-handlers.xml") +@HandlerChain(file = "jaxws-handlers.xml") @SOAPBinding(style = SOAPBinding.Style.RPC) public class StatefulEndpointImpl implements StatefulEndpoint { Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws-handlers.xml (from rev 2604, trunk/jbossws-tests/src/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name>Application Server Handler</handler-name> + <handler-class>org.jboss.test.ws.jaxws.samples.wsaddressing.ServerHandler</handler-class> + </handler> + </handler-chain> +</handler-chains> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/handlerscope/WEB-INF/jaxws-server-handlers.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/handlerscope/WEB-INF/jaxws-server-handlers.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/resources/jaxws/handlerscope/WEB-INF/jaxws-server-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP11ServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <protocol-bindings>##SOAP12_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP12ServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP ##SOAP12_HTTP</protocol-bindings> - <handler> - <handler-name> SOAPServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <service-name-pattern>ns1:SOAPEndpointService</service-name-pattern> - <handler> - <handler-name> ServiceServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <service-name-pattern>ns1:SOAPEndpointSer*</service-name-pattern> - <handler> - <handler-name> ServiceWildcardServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <service-name-pattern>ns1:InvalidService</service-name-pattern> - <handler> - <handler-name> InvalidServiceServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> - <handler> - <handler-name> PortServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPo*</port-name-pattern> - <handler> - <handler-name> PortWildcardServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:InvalidPort</port-name-pattern> - <handler> - <handler-name> InvalidPortServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <handler> - <handler-name> GeneralServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-jaxb-handlers.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-jaxb-handlers.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-jaxb-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP11ClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <handler> - <handler-name> LogicalClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalJAXBHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> - <handler> - <handler-name> PortClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-source-handlers.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-source-handlers.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-source-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP11ClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <handler> - <handler-name> LogicalClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalSourceHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> - <handler> - <handler-name> PortClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-jaxb-handlers.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-jaxb-handlers.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-jaxb-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP11ServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <handler> - <handler-name> LogicalServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalJAXBHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> - <handler> - <handler-name> PortServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-source-handlers.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-source-handlers.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-source-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP11ServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <handler> - <handler-name> LogicalServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalSourceHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> - <handler> - <handler-name> PortServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/samples/retail/META-INF/jaxws-handler.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/samples/retail/META-INF/jaxws-handler.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/resources/jaxws/samples/retail/META-INF/jaxws-handler.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name>SOAPMessageTrace</handler-name> - <handler-class>org.jboss.test.ws.jaxws.samples.retail.handler.SOAPMessageTrace</handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name>Application Server Handler</handler-name> - <handler-class>org.jboss.test.ws.jaxws.samples.wsaddressing.ServerHandler</handler-class> - </handler> - </handler-chain> -</handler-chains> \ No newline at end of file