[jbossws-commits] JBossWS SVN: r1651 - in trunk/src: main/java/org/jboss/ws/core/soap test/java/org/jboss/test/ws/jaxws/exception

Author: thomas.diesler(a)jboss.com Date: 2006-12-14 09:58:46 -0500 (Thu, 14 Dec 2006) New Revision: 1651 Modified: trunk/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.java Log: Fix jaxws ExceptionTestCase Modified: trunk/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2006-12-14 14:21:35 UTC (rev 1650) +++ trunk/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2006-12-14 14:58:46 UTC (rev 1651) @@ -212,13 +212,14 @@ { log.warn("Empty namespace URI with fault code '" + faultName + "', assuming: " + Constants.NS_SOAP11_ENV); nsURI = Constants.NS_SOAP11_ENV; + prefix = getPrefix(); } - if ("".equals(prefix) && getNamespaceURI().equals(nsURI)) - prefix = getPrefix(); - + if (nsURI.length() > 0 && prefix.length() == 0) + prefix = "codeNS"; + String prevNS = getNamespaceURI(prefix); - if (nsURI.equals(prevNS) == false) + if (prevNS == null) addNamespaceDeclaration(prefix, nsURI); String faultCode = prefix + ":" + localName; Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.java 2006-12-14 14:21:35 UTC (rev 1650) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.java 2006-12-14 14:58:46 UTC (rev 1651) @@ -24,13 +24,11 @@ import javax.jws.WebService; import javax.xml.namespace.QName; import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPFactory; import javax.xml.soap.SOAPFault; import javax.xml.ws.soap.SOAPFaultException; -import org.jboss.ws.core.soap.NameImpl; -import org.jboss.ws.core.soap.SOAPFaultImpl; - -(a)WebService(endpointInterface="org.jboss.test.ws.jaxws.exception.ExceptionEndpoint") +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.exception.ExceptionEndpoint") public class ExceptionEndpointImpl implements ExceptionEndpoint { public void throwRuntimeException() @@ -41,12 +39,10 @@ public void throwSoapFaultException() { // This should be thrown as-is - try { - SOAPFault fault = new SOAPFaultImpl(); - fault.setFaultCode(new NameImpl(new QName("http://foo", "FooCode"))); - fault.setFaultString("this is a fault string!"); + SOAPFactory factory = SOAPFactory.newInstance(); + SOAPFault fault = factory.createFault("this is a fault string!", new QName("http://foo", "FooCode")); fault.setFaultActor("mr.actor"); fault.addDetail().addChildElement("test"); throw new SOAPFaultException(fault);