Author: thomas.diesler(a)jboss.com Date: 2007-06-01 01:03:42 -0400 (Fri, 01 Jun 2007) New Revision: 3351 Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java Modified: trunk/build/README-COMMITTERS trunk/build/version.properties trunk/integration/sunri/ant-import/macros-deploy-sunri.xml trunk/integration/sunri/src/test/resources/excludes-jboss50.txt trunk/integration/sunri/version.properties trunk/integration/xfire/ant-import/macros-deploy-xfire.xml trunk/integration/xfire/version.properties trunk/jbossws-core/version.properties trunk/testsuite/ant-import/build-jars-jaxws.xml trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDoc.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpc.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml Log: Enable sunri logicalhandler Modified: trunk/build/README-COMMITTERS =================================================================== --- trunk/build/README-COMMITTERS 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/build/README-COMMITTERS 2007-06-01 05:03:42 UTC (rev 3351) @@ -8,11 +8,13 @@ enable-auto-props = yes [auto-props] +*.bat = svn:keywords=Id Revision;svn:eol-style=LF *.java = svn:keywords=Id Revision;svn:eol-style=LF +*.sh = svn:keywords=Id Revision;svn:eol-style=LF +*.txt = svn:keywords=Id Revision;svn:eol-style=LF +*.wsdl = svn:keywords=Id Revision;svn:eol-style=LF *.xml = svn:keywords=Id Revision;svn:eol-style=LF -*.wsdl = svn:keywords=Id Revision;svn:eol-style=LF *.xsd = svn:keywords=Id Revision;svn:eol-style=LF -*.txt = svn:keywords=Id Revision;svn:eol-style=LF 2. If you are using an IDE, make sure that it refers to the same config. So, for example, if you are using Eclipse with Subclipse on windows, you need to Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/build/version.properties 2007-06-01 05:03:42 UTC (rev 3351) @@ -20,6 +20,7 @@ jboss-common-logging-log4j=2.0.2.GA jboss-common-logging-spi=2.0.2.GA jboss-javaee=5.0.0-SNAPSHOT +jboss-jaxr=1.2.0.GA jboss-jbossxb=2.0.0.CR2 jboss-microcontainer=2.0.0.Beta3 junit=3.8.1 Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-06-01 05:03:42 UTC (rev 3351) @@ -59,6 +59,9 @@ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){stacklibs}/jbossws-sunri50.sar&quot;/&gt; <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file=&quot;(a){stacklibs}/jbossws-context.war&quot; overwrite="true"/> + <!-- Deploy juddi-service.sar --> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; </sequential> </macrodef> @@ -81,6 +84,8 @@ </fileset> </delete> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <!-- Undeploy juddi-service.sar --> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> @@ -122,6 +127,9 @@ </copy> <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){stacklibs}/jbossws-sunri42.sar&quot;/&gt; + <!-- Deploy juddi-service.sar --> + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; </sequential> </macrodef> @@ -144,6 +152,8 @@ </fileset> </delete> <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <!-- Undeploy juddi-service.sar --> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt =================================================================== --- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-01 05:03:42 UTC (rev 3351) @@ -2,12 +2,12 @@ # $Id$ # -# [JBWS-1699] - Fix WebServiceContext.getMessageContext() +# [JBWS-1699] Fix WebServiceContext.getMessageContext() org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java -#org/jboss/test/ws/jaxws/samples/httpbinding/** +# [JBWS-1673] Fix JAXR samples for SunRI org/jboss/test/ws/jaxws/samples/jaxr/** -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/** Modified: trunk/integration/sunri/version.properties =================================================================== --- trunk/integration/sunri/version.properties 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/integration/sunri/version.properties 2007-06-01 05:03:42 UTC (rev 3351) @@ -4,8 +4,6 @@ sunri.implementation.title=JBoss Web Services - JBossWS/SunRI # Thirdparty library versions -jboss-jaxr=1.2.0.GA -jboss-jbossws-spi=SNAPSHOT jboss-security-spi=2.0.0.Beta sun-jaxws=2.1.1 sun-servlet=2.5 Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml =================================================================== --- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-06-01 05:03:42 UTC (rev 3351) @@ -57,6 +57,9 @@ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src=&quot;(a){stacklibs}/jbossws-xfire50.sar&quot;/&gt; <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file=&quot;(a){stacklibs}/jbossws-context.war&quot; overwrite="true"/> + <!-- Deploy juddi-service.sar --> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; </sequential> </macrodef> @@ -74,6 +77,8 @@ </fileset> </delete> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> + <!-- Undeploy juddi-service.sar --> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> @@ -113,6 +118,9 @@ </copy> <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src=&quot;(a){stacklibs}/jbossws-xfire42.sar&quot;/&gt; + <!-- Deploy juddi-service.sar --> + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; </sequential> </macrodef> @@ -130,6 +138,8 @@ </fileset> </delete> <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> + <!-- Undeploy juddi-service.sar --> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> Modified: trunk/integration/xfire/version.properties =================================================================== --- trunk/integration/xfire/version.properties 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/integration/xfire/version.properties 2007-06-01 05:03:42 UTC (rev 3351) @@ -6,9 +6,6 @@ # Thirdparty library versions ibm-wsdl4j=1.6.2 jboss-jaxr=1.2.0.GA -jboss-jbossws-spi=SNAPSHOT jboss-security-spi=2.0.0.Beta -sun-jaxb=2.1.3 -sun-servlet=2.5 xfire=1.2.6 Modified: trunk/jbossws-core/version.properties =================================================================== --- trunk/jbossws-core/version.properties 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/jbossws-core/version.properties 2007-06-01 05:03:42 UTC (rev 3351) @@ -21,7 +21,6 @@ hibernate=3.2.1.GA jaxen=1.1-beta-10 jboss-ejb3=1.0.0.CR9-jboss4.0.5 -jboss-jaxr=1.2.0.GA jboss-remoting=2.0.0.GA jboss-security=4.0.5.GA jboss-vfs=2.0.0.Beta2 Modified: trunk/testsuite/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-06-01 05:03:42 UTC (rev 3351) @@ -129,6 +129,7 @@ <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/PortHandler.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"/> @@ -141,6 +142,7 @@ <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/PortHandler.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"/> Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2007-06-01 05:03:42 UTC (rev 3351) @@ -53,26 +53,40 @@ QName serviceName = new QName("http://org.jboss.ws/jaxws/samples/logicalhandler", "SOAPEndpointService"); Service service = Service.create(new URL(endpointAddress + "?wsdl"), serviceName); SOAPEndpointJAXB port = (SOAPEndpointJAXB)service.getPort(SOAPEndpointJAXB.class); - + BindingProvider bindingProvider = (BindingProvider)port; bindingProvider.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointAddress); String retStr = port.echo("hello"); - + StringBuffer expStr = new StringBuffer("hello"); - expStr.append(":LogicalClientHandler"); - expStr.append(":SOAP11ClientHandler"); - expStr.append(":PortClientHandler"); - expStr.append(":PortServerHandler"); - expStr.append(":SOAP11ServerHandler"); - expStr.append(":LogicalServerHandler"); + if (isIntegrationSunRI()) + { + System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + } + else + { + expStr.append(":Outbound:LogicalJAXBHandler"); + expStr.append(":Outbound:ProtocolHandler"); + expStr.append(":Outbound:PortHandler"); + } + expStr.append(":Inbound:PortHandler"); + expStr.append(":Inbound:ProtocolHandler"); + expStr.append(":Inbound:LogicalJAXBHandler"); expStr.append(":endpoint"); - expStr.append(":LogicalServerHandler"); - expStr.append(":SOAP11ServerHandler"); - expStr.append(":PortServerHandler"); - expStr.append(":PortClientHandler"); - expStr.append(":SOAP11ClientHandler"); - expStr.append(":LogicalClientHandler"); + expStr.append(":Outbound:LogicalJAXBHandler"); + expStr.append(":Outbound:ProtocolHandler"); + expStr.append(":Outbound:PortHandler"); + if (isIntegrationSunRI()) + { + System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + } + else + { + expStr.append(":Inbound:PortHandler"); + expStr.append(":Inbound:ProtocolHandler"); + expStr.append(":Inbound:LogicalJAXBHandler"); + } assertEquals(expStr.toString(), retStr); } } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2007-06-01 05:03:42 UTC (rev 3351) @@ -56,19 +56,33 @@ String retStr = port.echo("hello"); StringBuffer expStr = new StringBuffer("hello"); - expStr.append(":LogicalClientHandler"); - expStr.append(":SOAP11ClientHandler"); - expStr.append(":PortClientHandler"); - expStr.append(":PortServerHandler"); - expStr.append(":SOAP11ServerHandler"); - expStr.append(":LogicalServerHandler"); + if (isIntegrationSunRI()) + { + System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + } + else + { + expStr.append(":Outbound:LogicalSourceHandler"); + expStr.append(":Outbound:ProtocolHandler"); + expStr.append(":Outbound:PortHandler"); + } + expStr.append(":Inbound:PortHandler"); + expStr.append(":Inbound:ProtocolHandler"); + expStr.append(":Inbound:LogicalSourceHandler"); expStr.append(":endpoint"); - expStr.append(":LogicalServerHandler"); - expStr.append(":SOAP11ServerHandler"); - expStr.append(":PortServerHandler"); - expStr.append(":PortClientHandler"); - expStr.append(":SOAP11ClientHandler"); - expStr.append(":LogicalClientHandler"); + expStr.append(":Outbound:LogicalSourceHandler"); + expStr.append(":Outbound:ProtocolHandler"); + expStr.append(":Outbound:PortHandler"); + if (isIntegrationSunRI()) + { + System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + } + else + { + expStr.append(":Inbound:PortHandler"); + expStr.append(":Inbound:ProtocolHandler"); + expStr.append(":Inbound:LogicalSourceHandler"); + } assertEquals(expStr.toString(), retStr); } @@ -83,19 +97,33 @@ String retStr = port.echo("hello"); StringBuffer expStr = new StringBuffer("hello"); - expStr.append(":LogicalClientHandler"); - expStr.append(":SOAP11ClientHandler"); - expStr.append(":PortClientHandler"); - expStr.append(":PortServerHandler"); - expStr.append(":SOAP11ServerHandler"); - expStr.append(":LogicalServerHandler"); + if (isIntegrationSunRI()) + { + System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + } + else + { + expStr.append(":Outbound:LogicalSourceHandler"); + expStr.append(":Outbound:ProtocolHandler"); + expStr.append(":Outbound:PortHandler"); + } + expStr.append(":Inbound:PortHandler"); + expStr.append(":Inbound:ProtocolHandler"); + expStr.append(":Inbound:LogicalSourceHandler"); expStr.append(":endpoint"); - expStr.append(":LogicalServerHandler"); - expStr.append(":SOAP11ServerHandler"); - expStr.append(":PortServerHandler"); - expStr.append(":PortClientHandler"); - expStr.append(":SOAP11ClientHandler"); - expStr.append(":LogicalClientHandler"); + expStr.append(":Outbound:LogicalSourceHandler"); + expStr.append(":Outbound:ProtocolHandler"); + expStr.append(":Outbound:PortHandler"); + if (isIntegrationSunRI()) + { + System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI"); + } + else + { + expStr.append(":Inbound:PortHandler"); + expStr.append(":Inbound:ProtocolHandler"); + expStr.append(":Inbound:LogicalSourceHandler"); + } assertEquals(expStr.toString(), retStr); } } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java 2007-06-01 05:03:42 UTC (rev 3351) @@ -24,6 +24,7 @@ // $Id$ import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBElement; import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; @@ -35,16 +36,16 @@ @Override public boolean handleOutbound(MessageContext msgContext) { - return appendHandlerName(msgContext); + return appendHandlerName(msgContext, "Outbound"); } @Override public boolean handleInbound(MessageContext msgContext) { - return appendHandlerName(msgContext); + return appendHandlerName(msgContext, "Inbound"); } - public boolean appendHandlerName(MessageContext msgContext) + private boolean appendHandlerName(MessageContext msgContext, String direction) { try { @@ -52,26 +53,37 @@ LogicalMessageContext logicalContext = (LogicalMessageContext)msgContext; JAXBContext jaxb = JAXBContext.newInstance(Echo.class.getPackage().getName()); Object payload = logicalContext.getMessage().getPayload(jaxb); + + JAXBElement jaxbElement = null; + if (payload instanceof JAXBElement) + { + jaxbElement = (JAXBElement)payload; + payload = jaxbElement.getValue(); + } - String handlerName = getHandlerName(); - if (payload instanceof Echo) { Echo echo = (Echo)payload; String value = echo.getString1(); - echo.setString1(value + ":" + handlerName); + echo.setString1(value + ":" + direction + ":LogicalJAXBHandler"); } else if (payload instanceof EchoResponse) { EchoResponse echo = (EchoResponse)payload; String value = echo.getResult(); - echo.setResult(value + ":" + handlerName); + echo.setResult(value + ":" + direction + ":LogicalJAXBHandler"); } else { throw new WebServiceException("Invalid payload type: " + payload); } + if (jaxbElement != null) + { + jaxbElement.setValue(payload); + payload = jaxbElement; + } + // Set the updated payload logicalContext.getMessage().setPayload(payload, jaxb); Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2007-06-01 05:03:42 UTC (rev 3351) @@ -53,16 +53,16 @@ @Override public boolean handleOutbound(MessageContext msgContext) { - return appendHandlerName(msgContext); + return appendHandlerName(msgContext, "Outbound"); } @Override public boolean handleInbound(MessageContext msgContext) { - return appendHandlerName(msgContext); + return appendHandlerName(msgContext, "Inbound"); } - public boolean appendHandlerName(MessageContext msgContext) + private boolean appendHandlerName(MessageContext msgContext, String direction) { try { @@ -78,7 +78,7 @@ Element element = DOMUtils.getFirstChildElement(root); String oldValue = DOMUtils.getTextContent(element); - String newValue = oldValue + ":" + getHandlerName(); + String newValue = oldValue + ":" + direction + ":LogicalSourceHandler"; element.setTextContent(newValue); log.debug("oldValue: " + oldValue); Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java 2007-06-01 05:03:42 UTC (rev 3351) @@ -0,0 +1,79 @@ +/* + * 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.logicalhandler; + +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.logging.Logger; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; + +/** + * A jaxws protocol handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Nov-2005 + */ +public class PortHandler extends GenericSOAPHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(PortHandler.class); + + @Override + public boolean handleOutbound(MessageContext msgContext) + { + return appendHandlerName(msgContext, "Outbound"); + } + + @Override + public boolean handleInbound(MessageContext msgContext) + { + return appendHandlerName(msgContext, "Inbound"); + } + + private boolean appendHandlerName(MessageContext msgContext, String direction) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next(); + soapElement = (SOAPElement)soapElement.getChildElements().next(); + + String oldValue = soapElement.getValue(); + String newValue = oldValue + ":" + direction + ":PortHandler"; + soapElement.setValue(newValue); + + log.debug("oldValue: " + oldValue); + log.debug("newValue: " + newValue); + + return true; + } + catch (SOAPException ex) + { + throw new WebServiceException(ex); + } + } +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java 2007-06-01 05:03:42 UTC (rev 3351) @@ -45,16 +45,16 @@ @Override public boolean handleOutbound(MessageContext msgContext) { - return appendHandlerName(msgContext); + return appendHandlerName(msgContext, "Outbound"); } - + @Override public boolean handleInbound(MessageContext msgContext) { - return appendHandlerName(msgContext); + return appendHandlerName(msgContext, "Inbound"); } - - private boolean appendHandlerName(MessageContext msgContext) + + private boolean appendHandlerName(MessageContext msgContext, String direction) { try { @@ -63,7 +63,7 @@ soapElement = (SOAPElement)soapElement.getChildElements().next(); String oldValue = soapElement.getValue(); - String newValue = oldValue + ":" + getHandlerName(); + String newValue = oldValue + ":" + direction + ":ProtocolHandler"; soapElement.setValue(newValue); log.debug("oldValue: " + oldValue); Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java 2007-06-01 05:03:42 UTC (rev 3351) @@ -31,7 +31,7 @@ import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; -@WebService() +@WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler") @HandlerChain(file = "jaxws-client-jaxb-handlers.xml") public interface SOAPEndpointJAXB { Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDoc.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDoc.java 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDoc.java 2007-06-01 05:03:42 UTC (rev 3351) @@ -31,7 +31,7 @@ import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; -@WebService() +@WebService(name = "SOAPEndpointDoc", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler") @HandlerChain(file = "jaxws-client-source-handlers.xml") public interface SOAPEndpointSourceDoc { Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpc.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpc.java 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpc.java 2007-06-01 05:03:42 UTC (rev 3351) @@ -29,12 +29,11 @@ import javax.jws.soap.SOAPBinding; import javax.jws.soap.SOAPBinding.Style; -@WebService() +@WebService(name = "SOAPEndpointRpc", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler") @HandlerChain(file = "jaxws-client-source-handlers.xml") @SOAPBinding(style = Style.RPC) public interface SOAPEndpointSourceRpc { - @WebMethod public String echo(String string1); Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml 2007-06-01 05:03:42 UTC (rev 3351) @@ -24,7 +24,7 @@ <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-class> org.jboss.test.ws.jaxws.samples.logicalhandler.PortHandler </handler-class> </handler> </handler-chain> Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml 2007-06-01 05:03:42 UTC (rev 3351) @@ -24,7 +24,7 @@ <port-name-pattern>ns1:SOAPEndpoint*</port-name-pattern> <handler> <handler-name> PortClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.PortHandler </handler-class> </handler> </handler-chain> Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml 2007-06-01 05:03:42 UTC (rev 3351) @@ -24,7 +24,7 @@ <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-class> org.jboss.test.ws.jaxws.samples.logicalhandler.PortHandler </handler-class> </handler> </handler-chain> Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml 2007-06-01 03:38:21 UTC (rev 3350) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml 2007-06-01 05:03:42 UTC (rev 3351) @@ -24,7 +24,7 @@ <port-name-pattern>ns1:SOAPEndpoint*</port-name-pattern> <handler> <handler-name> PortServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.PortHandler </handler-class> </handler> </handler-chain>