Author: jason.greene(a)jboss.com Date: 2007-02-21 13:03:24 -0500 (Wed, 21 Feb 2007) New Revision: 2427 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java Log: Merge correct fix for JBWS-1529 with no side effects Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-02-21 18:01:31 UTC (rev 2426) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-02-21 18:03:24 UTC (rev 2427) @@ -130,12 +130,13 @@ interfaceFault.setName(new NCName(fault.getXmlName().getLocalPart())); wsdlInterface.addFault(interfaceFault); + QName interfaceFaultRef = new QName(operation.getQName().getNamespaceURI(), fault.getXmlName().getLocalPart()); WSDLInterfaceOperationOutfault outfault = new WSDLInterfaceOperationOutfault(interfaceOperation); - outfault.setRef(fault.getXmlName()); + outfault.setRef(interfaceFaultRef); interfaceOperation.addOutfault(outfault); WSDLBindingFault bindingFault = new WSDLBindingFault(wsdlBinding); - bindingFault.setRef(fault.getXmlName()); + bindingFault.setRef(interfaceFaultRef); wsdlBinding.addFault(bindingFault); } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-02-21 18:01:31 UTC (rev 2426) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-02-21 18:03:24 UTC (rev 2427) @@ -46,7 +46,6 @@ private String targetNS = "http://jbws1529.jaxws.ws.test.jboss.org/"; private JBWS1529 proxy; -/* public static Test suite() { return JBossWSTestSetup.newTestSetup(JBWS1529TestCase.class, "jaxws-jbws1529.war"); @@ -63,7 +62,7 @@ Service service = Service.create(wsdlURL, serviceName); proxy = (JBWS1529)service.getPort(JBWS1529.class); } -*/ + public void testWSDLReader() throws Exception { File wsdlFile = new File("resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl"); @@ -76,8 +75,7 @@ public void testEcho() throws Exception { - System.out.println("FIXME: [JBWS-1529] wsdlReader fails with faults defined on jaxws SEI"); - //String retStr = proxy.echo("hi there"); - //assertEquals("hi there", retStr); + String retStr = proxy.echo("hi there"); + assertEquals("hi there", retStr); } -} \ No newline at end of file +}