Author: jim.ma Date: 2010-03-10 04:55:48 -0500 (Wed, 10 Mar 2010) New Revision: 11740 Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/ClientSOAPHandler.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpointImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpointService.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/client-handlers.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2956/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2956/WEB-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2956/WEB-INF/jboss-web.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2956/WEB-INF/web.xml Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml Log: [JBWS-2956]:swallow the outbound SOAPException threw by client side handlers Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2010-03-09 11:18:44 UTC (rev 11739) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2010-03-10 09:55:48 UTC (rev 11740) @@ -37,8 +37,10 @@ import javax.xml.soap.AttachmentPart; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPException; +import javax.xml.ws.ProtocolException; import javax.xml.ws.addressing.AddressingProperties; import javax.xml.ws.addressing.JAXWSAConstants; +import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; import org.jboss.ws.Constants; @@ -406,18 +408,25 @@ } catch (Exception ex) { - log.error("Exception caught while (preparing for) performing the invocation: ", ex); - - // Reverse the message direction - processPivotInternal(msgContext, direction); - - if (faultType[2] != null) - callFaultHandlerChain(portName, faultType[2], ex); - if (faultType[1] != null) - callFaultHandlerChain(portName, faultType[1], ex); - if (faultType[0] != null) - callFaultHandlerChain(portName, faultType[0], ex); - throw ex; + Boolean isOutbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); + if (oneway && isOutbound && ex instanceof ProtocolException) + { + //swallow the outbound SOAPException threw in hanlders + return null; + } + else + { + log.error("Exception caught while (preparing for) performing the invocation: ", ex); + // Reverse the message direction + processPivotInternal(msgContext, direction); + if (faultType[2] != null) + callFaultHandlerChain(portName, faultType[2], ex); + if (faultType[1] != null) + callFaultHandlerChain(portName, faultType[1], ex); + if (faultType[0] != null) + callFaultHandlerChain(portName, faultType[0], ex); + throw ex; + } } finally { Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-03-09 11:18:44 UTC (rev 11739) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-03-10 09:55:48 UTC (rev 11740) @@ -630,6 +630,17 @@ <include name="jboss-web.xml"/> </webinf> </war> + + <!-- jaxws-jbws2956 --> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2956.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2956/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2956/OnewayEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws2956/OnewayEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2956/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> <!-- jaxws-webserviceref --> <war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml"> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/ClientSOAPHandler.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/ClientSOAPHandler.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/ClientSOAPHandler.java 2010-03-10 09:55:48 UTC (rev 11740) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2956; + +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPFault; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.handler.LogicalMessageContext; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; +import javax.xml.ws.soap.SOAPFaultException; + +import org.jboss.ws.WSException; +import org.jboss.ws.core.soap.MessageFactoryImpl; +import org.jboss.ws.core.soap.SOAPMessageImpl; +import org.jboss.wsf.common.handler.GenericSOAPHandler; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +public class ClientSOAPHandler extends GenericSOAPHandler<LogicalMessageContext> +{ + @Override + protected boolean handleInbound(final MessageContext msgContext) + { + //do nothing + return true; + } + + protected boolean handleOutbound(final MessageContext msgContext) + { + try + { + SOAPFault fault = null; + MessageFactoryImpl factory = new MessageFactoryImpl(); + SOAPMessageImpl resMessage = (SOAPMessageImpl) factory.createMessage(); + fault = resMessage.getSOAPBody().addFault(); + fault.setFaultString("this is exception threwn by client outbound"); + throw new SOAPFaultException(fault); + } + catch (SOAPException e) + { + //ignore + } + return true; + } +} Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java 2010-03-10 09:55:48 UTC (rev 11740) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2956; + +import java.net.URL; +import java.util.Iterator; + +import javax.xml.namespace.QName; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.ws.core.soap.NodeImpl; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +public class JBWS2956TestCase extends JBossWSTest +{ + + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2956"; + + private static OnewayEndpoint port; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS2956TestCase.class, "jaxws-jbws2956.war"); + } + + public void setUp() throws Exception + { + super.setUp(); + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://ws.jboss.org/jbws2956";, "EndpointService"); + OnewayEndpointService service = new OnewayEndpointService(wsdlURL); + port = service.getOnewayEndpointPort(); + } + + public void testCall() throws Exception + { + //there should be no exception threw + port.echo("testJBWS2956"); + } +} \ No newline at end of file Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpoint.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpoint.java 2010-03-10 09:55:48 UTC (rev 11740) @@ -0,0 +1,31 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2956; +import javax.jws.Oneway; +import javax.jws.WebService; +@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2956") +public interface OnewayEndpoint +{ + @Oneway + public void echo(final String message); + +} Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpointImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpointImpl.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpointImpl.java 2010-03-10 09:55:48 UTC (rev 11740) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2956; + +import javax.jws.HandlerChain; +import javax.jws.WebService; + + +@WebService(name = "Endpoint", portName = "EndpointPort", serviceName="EndpointService", targetNamespace = "http://ws.jboss.org/jbws2956", endpointInterface = "org.jboss.test.ws.jaxws.jbws2956.OnewayEndpoint") +public class OnewayEndpointImpl implements OnewayEndpoint +{ + public void echo(final String message) + { + System.out.println("incoming message : " + message); + } + +} Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpointService.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpointService.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/OnewayEndpointService.java 2010-03-10 09:55:48 UTC (rev 11740) @@ -0,0 +1,99 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2956; + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.jws.HandlerChain; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.WebServiceFeature; + +@WebServiceClient(name = "EndpointService", targetNamespace = "http://ws.jboss.org/jbws2956") +@HandlerChain(file = "client-handlers.xml") +public class OnewayEndpointService + extends Service +{ + + private final static URL ENDPOINTSERVICE_WSDL_LOCATION; + private final static WebServiceException ENDPOINTSERVICE_EXCEPTION; + private final static QName ENDPOINTSERVICE_QNAME = new QName("http://ws.jboss.org/jbws2956";, "EndpointService"); + + static { + URL url = null; + WebServiceException e = null; + try { + url = new URL("http://localhost:8080/jaxws-jbws2955?wsdl"); + } catch (MalformedURLException ex) { + e = new WebServiceException(ex); + } + ENDPOINTSERVICE_WSDL_LOCATION = url; + ENDPOINTSERVICE_EXCEPTION = e; + } + + public OnewayEndpointService() { + super(__getWsdlLocation(), ENDPOINTSERVICE_QNAME); + } + + + public OnewayEndpointService(URL wsdlLocation) { + super(wsdlLocation, ENDPOINTSERVICE_QNAME); + } + + public OnewayEndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + /** + * + * @return + * returns Endpoint + */ + @WebEndpoint(name = "EndpointPort") + public OnewayEndpoint getOnewayEndpointPort() { + return super.getPort(new QName("http://ws.jboss.org/jbws2956";, "EndpointPort"), OnewayEndpoint.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 Endpoint + */ + @WebEndpoint(name = "EndpointPort") + public OnewayEndpoint getOnewayEndpointPort(WebServiceFeature... features) { + return super.getPort(new QName("http://ws.jboss.org/jbws2956";, "EndpointPort"), OnewayEndpoint.class, features); + } + + private static URL __getWsdlLocation() { + if (ENDPOINTSERVICE_EXCEPTION!= null) { + throw ENDPOINTSERVICE_EXCEPTION; + } + return ENDPOINTSERVICE_WSDL_LOCATION; + } + +} Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/client-handlers.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/client-handlers.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/client-handlers.xml 2010-03-10 09:55:48 UTC (rev 11740) @@ -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" 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> + <port-name-pattern xmlns:ns1="http://ws.jboss.org/jbws2956">ns1:EndpointPort<... + <handler> + <handler-name>ClientSOAPHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxws.jbws2956.ClientSOAPHandler</handler-class> + </handler> + </handler-chain> +</handler-chains> \ No newline at end of file Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2956/WEB-INF/jboss-web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2956/WEB-INF/jboss-web.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2956/WEB-INF/jboss-web.xml 2010-03-10 09:55:48 UTC (rev 11740) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <context-root>/jaxws-jbws2956</context-root> +</jboss-web> \ No newline at end of file Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2956/WEB-INF/web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2956/WEB-INF/web.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2956/WEB-INF/web.xml 2010-03-10 09:55:48 UTC (rev 11740) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <servlet> + <servlet-name>Endpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws2956.OnewayEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Endpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file