[jbossws-commits] JBossWS SVN: r6256 - in framework/trunk: ant-import and 12 other directories.

Author: richard.opalka(a)jboss.com Date: 2008-04-07 11:09:25 -0400 (Mon, 07 Apr 2008) New Revision: 6256 Modified: framework/trunk/.classpath framework/trunk/ant-import/build-thirdparty.xml framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java framework/trunk/version.properties Log: [JBWS-2105] removing dependencies on native wsdl model from cross stack jaxws test suite (WIP) Modified: framework/trunk/.classpath =================================================================== --- framework/trunk/.classpath 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/.classpath 2008-04-07 15:09:25 UTC (rev 6256) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/> <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> @@ -16,5 +17,6 @@ <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/> <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/> + <classpathentry kind="lib" path="thirdparty/wsdl4j.jar" sourcepath="thirdparty/wsdl4j-src.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: framework/trunk/ant-import/build-thirdparty.xml =================================================================== --- framework/trunk/ant-import/build-thirdparty.xml 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/ant-import/build-thirdparty.xml 2008-04-07 15:09:25 UTC (rev 6256) @@ -40,8 +40,9 @@ <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common-src.zip" dest="${thirdparty.dir}/jbossws-common-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -30,16 +30,16 @@ import javax.wsdl.extensions.ExtensibilityElement; import javax.wsdl.extensions.soap.SOAPBinding; import javax.wsdl.extensions.soap12.SOAP12Binding; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; +import javax.xml.soap.SOAPConstants; import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import javax.xml.ws.handler.Handler; import junit.framework.Test; -import org.jboss.ws.Constants; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -63,8 +63,8 @@ { URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitions defs = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); - Definition wsdl = defs.getWsdlOneOneDefinition(); + WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); + Definition wsdl = wsdlReader.readWSDL(wsdlURL.toString()); QName qname = new QName("http://org.jboss.ws/jaxws/binding", "SOAPEndpointBinding"); Binding wsdlBinding = wsdl.getBinding(qname); @@ -84,7 +84,7 @@ transport = soapBinding.getTransportURI(); } } - assertEquals("Invalid transport uri", Constants.URI_SOAP_HTTP, transport); + assertEquals("Invalid transport uri", "http://schemas.xmlsoap.org/soap/http", transport); } public void testClientAccess() throws Exception @@ -102,7 +102,7 @@ provider.getBinding().setHandlerChain(handlerChain); String nsURI = port.namespace(); - assertEquals(Constants.NS_SOAP12_ENV + ":" + Constants.NS_SOAP12_ENV, nsURI); + assertEquals(SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE + ":" + SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE, nsURI); } } Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -26,20 +26,20 @@ import java.io.BufferedReader; import java.io.File; import java.io.InputStreamReader; -import java.net.MalformedURLException; import java.net.URL; import javax.management.Attribute; import javax.management.MBeanServerConnection; import javax.management.ObjectName; +import javax.wsdl.Definition; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; import javax.xml.ws.Service; import junit.extensions.TestSetup; import junit.framework.Test; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; @@ -75,12 +75,12 @@ }; } - public void testWSDLAccess() throws MalformedURLException + public void testWSDLAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); + WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); + Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString()); + assertNotNull(wsdlDefinition); } public void testClientAccess() throws Exception Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -23,14 +23,18 @@ import java.io.File; import java.io.FilenameFilter; -import java.net.MalformedURLException; +import java.util.List; +import java.util.Map; import javax.jws.WebService; +import javax.wsdl.Definition; +import javax.wsdl.Port; +import javax.wsdl.Service; +import javax.wsdl.WSDLException; +import javax.wsdl.extensions.soap.SOAPAddress; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLEndpoint; -import org.jboss.ws.metadata.wsdl.WSDLService; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.SPIProvider; @@ -78,24 +82,36 @@ } assertTrue("No WSDL files found", wsdlFile != null); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdl; + Definition wsdl; try { - wsdl = factory.parse(wsdlFile.toURL()); + WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); + wsdl = wsdlReader.readWSDL(wsdlFile.getAbsolutePath()); } - catch (MalformedURLException e) + catch (WSDLException e) { throw new JBWS1190Exception("Error readin WSDL", e); } - WSDLService[] services = wsdl.getServices(); - assertEquals("No of services", 1, services.length); + Map services = wsdl.getServices(); + assertEquals("No of services", 1, services.size()); - WSDLEndpoint[] endpoints = services[0].getEndpoints(); - assertEquals("No of endpoints", 1, endpoints.length); + Service _service = (Service)services.values().iterator().next(); + Map ports = _service.getPorts(); + assertEquals("No of endpoints", 1, ports.size()); + Port _port = (Port)ports.values().iterator().next(); - String address = endpoints[0].getAddress(); + List extElements = _port.getExtensibilityElements(); + String address = null; + for (int i = 0; i < extElements.size(); i++) + { + if (extElements.get(i) instanceof SOAPAddress) + { + SOAPAddress soapAddrExtElement = (SOAPAddress)extElements.get(i); + address = soapAddrExtElement.getLocationURI(); + } + } + assertTrue("Address is null", address != null); assertTrue("Expected Scheme '" + scheme + "' from address '" + address + "'", address.startsWith(scheme + "://")); assertTrue("Expected Port '" + port + "' from address '" + address + "'", address.indexOf(":" + port + "/") > -1); } Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -22,18 +22,18 @@ package org.jboss.test.ws.jaxws.jbws1505; import junit.framework.Test; -import org.jboss.ws.WSException; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; +import javax.wsdl.Definition; +import javax.wsdl.factory.WSDLFactory; import javax.xml.namespace.QName; import javax.xml.ws.Service; import java.net.URL; +import java.util.Map; /** - * Verify wsdl gerneration on SEI inheritance. + * Verify wsdl generation on SEI inheritance. * * http://jira.jboss.org/jira/browse/JBWS-1505 * @@ -69,16 +69,12 @@ */ public void testWSDLGeneration() throws Exception { - try - { - WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); - assertTrue(wsdl.getInterfaces().length == 1); // a single port - assertTrue(wsdl.getInterfaces()[0].getOperations().length == 5); // with five op's - } - catch (Exception ex) - { - WSException.rethrow(ex); - } + Definition wsdl = WSDLFactory.newInstance().newWSDLReader().readWSDL(wsdlURL.toString()); + Map services = wsdl.getAllServices(); + assertTrue(services.size() == 1); // a simple port + javax.wsdl.Service service = (javax.wsdl.Service)services.values().iterator().next(); + javax.wsdl.Port port = (javax.wsdl.Port)service.getPorts().values().iterator().next(); + assertTrue(port.getBinding().getBindingOperations().size() == 5); // with five op's } /** @@ -89,16 +85,9 @@ */ public void testTypeInheritance() throws Exception { - try - { - CustomType ct = port.getCustomType(); - assertTrue(ct.getMember1() == 1); - assertTrue(ct.getMember2() == 2); - } - catch (Exception ex) - { - WSException.rethrow(ex); - } + CustomType ct = port.getCustomType(); + assertTrue(ct.getMember1() == 1); + assertTrue(ct.getMember2() == 2); } } Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -24,13 +24,14 @@ import java.io.File; import java.net.URL; +import javax.wsdl.Definition; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; import javax.xml.ws.Service; import junit.framework.Test; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -68,8 +69,8 @@ File wsdlFile = new File("resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl"); assertTrue(wsdlFile.exists()); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdl = factory.parse(wsdlFile.toURL()); + WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); + Definition wsdl = wsdlReader.readWSDL(wsdlFile.getAbsolutePath()); assertNotNull(wsdl); } Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -23,10 +23,11 @@ import java.net.URL; +import javax.wsdl.Definition; +import javax.wsdl.factory.WSDLFactory; + import junit.framework.Test; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -48,7 +49,7 @@ public void testWSDLAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581?wsdl"); - WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); + Definition wsdl = WSDLFactory.newInstance().newWSDLReader().readWSDL(wsdlURL.toString()); assertNotNull("wsdl expected", wsdl); } Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -23,10 +23,11 @@ import java.net.URL; +import javax.wsdl.Definition; +import javax.wsdl.factory.WSDLFactory; + import junit.framework.Test; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -48,7 +49,7 @@ public void testWSDLAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581?wsdl"); - WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); + Definition wsdl = WSDLFactory.newInstance().newWSDLReader().readWSDL(wsdlURL.toString()); assertNotNull("wsdl expected", wsdl); } Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -21,17 +21,13 @@ */ package org.jboss.test.ws.jaxws.jbws1665; -// $Id: $ - -import java.net.MalformedURLException; import java.net.URL; -import junit.framework.Test; +import javax.wsdl.Definition; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; /** * [JBWS-1665] incorrect wsdl generation @@ -65,11 +61,11 @@ */ } - private void assertWSDLAccess() throws MalformedURLException + private void assertWSDLAccess() throws Exception { URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); + WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); + Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString()); + assertNotNull(wsdlDefinition); } } Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -24,8 +24,8 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) @WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1904") -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) public interface TestEndpoint { String echo(String input) throws TestException; Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -28,10 +28,15 @@ import org.jboss.wsf.spi.annotation.WebContext; -@WebService(serviceName = "TestEndpointService", name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1904") +@Stateless @SOAPBinding(style = SOAPBinding.Style.DOCUMENT) -@Stateless @WebContext(contextRoot="jaxws-jbws1904", urlPattern="/*") +@WebService +( + name = "TestEndpoint", + serviceName = "TestEndpointService", + targetNamespace = "http://org.jboss.ws/jbws1904" +) public class TestEndpointImpl implements TestEndpoint { @WebMethod Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -3,10 +3,21 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.ws.WebFault; -@WebFault(name="TestExceptionFault", targetNamespace="http://org.jboss.ws/jbws1904/faults") -@XmlType(name = "TestException", namespace = "http://org.jboss.ws/jbws1904/exceptions", propOrder = {"message"}) +@WebFault +( + name="TestExceptionFault", + targetNamespace="http://org.jboss.ws/jbws1904/faults" +) +@XmlType +( + name = "TestException", + namespace = "http://org.jboss.ws/jbws1904/exceptions", + propOrder = {"message"} +) public class TestException extends Exception { + private static final long serialVersionUID = 3203477602591432846L; + private String message; public String getMessage() Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -38,8 +38,6 @@ import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.spi.SPIProvider; Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -23,24 +23,19 @@ import java.net.URL; +import javax.wsdl.Definition; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; + import junit.framework.Test; -import org.apache.xerces.xs.XSTypeDefinition; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLUtils; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; /** - * Testcase for load/import of resources under nested directory + * [JBWS-1969] test case for load/import of resources under nested directory * other than toplevel "META-INF/wsdl" directory - * - * http://jira.jboss.org/jira/browse/JBWS-1969 - * * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> - * @since 21-Feb-2008 */ public class JBWS1969TestCase extends JBossWSTest { @@ -51,10 +46,10 @@ public void testSubDirectory() throws Exception { - //wsdl and schema loaded from META-INF/wsdl/echo + // WSDL and Schema files are loaded in META-INF/wsdl/echo directory URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1969?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); + WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); + Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString()); + assertNotNull(wsdlDefinition); } } Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -25,9 +25,7 @@ /** * The SEI - * * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> - * @since 21-Feb-2008 */ @WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1969") public interface TestEndpoint Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -24,21 +24,21 @@ import javax.ejb.Stateless; import javax.jws.WebMethod; import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; import org.jboss.wsf.spi.annotation.WebContext; /** - * The SEI implementation used by the JBWS1969TestCase - * + * The SEI implementation * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> - * @since 21-Feb-2008 */ -@WebService(serviceName = "TestEndpointService", - name = "TestEndpoint", - targetNamespace = "http://org.jboss.ws/jbws1969", - wsdlLocation = "/META-INF/wsdl/echo/TestService.wsdl") @Stateless +@WebService +( + name = "TestEndpoint", + serviceName = "TestEndpointService", + wsdlLocation = "/META-INF/wsdl/echo/TestService.wsdl", + targetNamespace = "http://org.jboss.ws/jbws1969" +) @WebContext(contextRoot="jaxws-jbws1969", urlPattern="/*") public class TestEndpointImpl implements TestEndpoint { Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -28,10 +28,12 @@ import java.net.HttpURLConnection; import java.net.URL; +import javax.wsdl.Definition; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; + import junit.framework.Test; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -52,9 +54,10 @@ public void testAccessInventoryServiceWsdl() throws Exception { - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDef = factory.parse(new URL("http://" + getServerHost() + ":8080/test/InventoryWebService?wsdl")); - assertNotNull(wsdlDef); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/test/InventoryWebService?wsdl"); + WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); + Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString()); + assertNotNull(wsdlDefinition); } public void testServletAccess() throws Exception Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2008-04-07 15:09:25 UTC (rev 6256) @@ -21,18 +21,18 @@ */ package org.jboss.test.ws.jaxws.jbws944; -import java.net.MalformedURLException; import java.net.URL; import javax.naming.InitialContext; import javax.rmi.PortableRemoteObject; +import javax.wsdl.Definition; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; import javax.xml.ws.Service; import junit.framework.Test; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -97,11 +97,11 @@ assertEquals(helloWorld, retObj); } - private void assertWSDLAccess() throws MalformedURLException + private void assertWSDLAccess() throws Exception { URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); + WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); + Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString()); + assertNotNull(wsdlDefinition); } } Modified: framework/trunk/version.properties =================================================================== --- framework/trunk/version.properties 2008-04-07 14:13:51 UTC (rev 6255) +++ framework/trunk/version.properties 2008-04-07 15:09:25 UTC (rev 6256) @@ -19,6 +19,7 @@ junit=3.8.1 dom4j=1.6.1 +ibm-wsdl4j=1.6.2 jboss-common-core=2.0.2.GA jboss-common-logging-spi=2.0.2.GA jboss-javaee=5.0.0.Beta3Update1