Author: jason.greene(a)jboss.com Date: 2007-02-21 13:01:31 -0500 (Wed, 21 Feb 2007) New Revision: 2426 Removed: tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/resources/jaxrpc/samples-override/exception/META-INF/ Modified: tags/jbossws-2.0.0.CR3/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java Log: Fix invalid release Modified: tags/jbossws-2.0.0.CR3/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- tags/jbossws-2.0.0.CR3/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-02-21 15:43:21 UTC (rev 2425) +++ tags/jbossws-2.0.0.CR3/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-02-21 18:01:31 UTC (rev 2426) @@ -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: tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java =================================================================== --- tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-02-21 15:43:21 UTC (rev 2425) +++ tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-02-21 18:01:31 UTC (rev 2426) @@ -61,6 +61,12 @@ public void testEndpoint() throws Exception { + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + return; + } + port.performTest(); } } Modified: tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2007-02-21 15:43:21 UTC (rev 2425) +++ tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2007-02-21 18:01:31 UTC (rev 2426) @@ -76,6 +76,12 @@ public void testServletClient() throws Exception { + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + return; + } + URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); String retStr = br.readLine(); Modified: tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java =================================================================== --- tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-02-21 15:43:21 UTC (rev 2425) +++ tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-02-21 18:01:31 UTC (rev 2426) @@ -48,6 +48,12 @@ */ public void testWebClient() throws Exception { + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + return; + } + URL url = new URL("http://" + getServerHost() + ":8080/jaxrpc-wsse-rpc/RpcTestClientServlet?input=Hello"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); String res = br.readLine(); Modified: tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java =================================================================== --- tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-02-21 15:43:21 UTC (rev 2425) +++ tags/jbossws-2.0.0.CR3/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-02-21 18:01:31 UTC (rev 2426) @@ -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 +}