Author: richard.opalka(a)jboss.com Date: 2010-09-03 05:14:11 -0400 (Fri, 03 Sep 2010) New Revision: 12891 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws771/binding.xml Log: [JBWS-2838] fixing tests to be alligned with new URL pattern scheme Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java 2010-09-03 09:07:12 UTC (rev 12890) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java 2010-09-03 09:14:11 UTC (rev 12891) @@ -55,7 +55,7 @@ public void testSimple() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-epr/TestEndpoint?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-epr/TestEndpointService/TestEndpoint?wsdl"); QName serviceName = new QName("http://org.jboss.ws/epr", "TestEndpointService"); Service service = Service.create(wsdlURL, serviceName); TestEndpoint port = service.getPort(TestEndpoint.class); @@ -66,7 +66,7 @@ public void testEndpointReference() throws Exception { - String address = "http://" + getServerHost() + ":8080/jaxws-epr/TestEndpoint"; + String address = "http://" + getServerHost() + ":8080/jaxws-epr/TestEndpointService/TestEndpoint"; URL wsdlURL = new URL(address + "?wsdl"); QName serviceName = new QName("http://org.jboss.ws/epr", "TestEndpointService"); @@ -86,7 +86,7 @@ public void testEndpointReferenceFromSource() throws Exception { - String address = "http://" + getServerHost() + ":8080/jaxws-epr/TestEndpoint"; + String address = "http://" + getServerHost() + ":8080/jaxws-epr/TestEndpointService/TestEndpoint"; URL wsdlURL = new URL(address + "?wsdl"); QName serviceName = new QName("http://org.jboss.ws/epr", "TestEndpointService"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java 2010-09-03 09:07:12 UTC (rev 12890) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java 2010-09-03 09:14:11 UTC (rev 12891) @@ -48,7 +48,7 @@ public void testWSDLSchema() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1909/TestEndpoint?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1909/TestEndpointService/TestEndpoint?wsdl"); QName serviceName = new QName("http://org.jboss.ws/jbws1909", "TestEndpointService"); Service service = Service.create(wsdlURL, serviceName); TestEndpoint port = service.getPort(TestEndpoint.class); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java 2010-09-03 09:07:12 UTC (rev 12890) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java 2010-09-03 09:14:11 UTC (rev 12891) @@ -49,7 +49,7 @@ final ServiceFactory factory = ServiceFactory.newInstance(); final Service service = factory.createService(new QName("http://my.services.web", "MyWebServiceName")); final Call call = service.createCall(new QName("http://my.services.web", "MyWebServicePort")); - call.setTargetEndpointAddress("http://" + getServerHost() + ":8080/jaxws-jbws2565/MyWebService?wsdl"); + call.setTargetEndpointAddress("http://" + getServerHost() + ":8080/jaxws-jbws2565/MyWebServiceName/MyWebService?wsdl"); call.setOperationName(new QName("http://my.services.web", "doStuff")); final QName QNAME_TYPE_STRING = new QName("http://www.w3.org/2001/XMLSchema";, "string"); call.setReturnType(QNAME_TYPE_STRING); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2010-09-03 09:07:12 UTC (rev 12890) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2010-09-03 09:14:11 UTC (rev 12891) @@ -72,7 +72,7 @@ if (port == null) { QName serviceName = new QName(TARGET_NAMESPACE, "JBWS771Service"); - wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws771/IWebsvcImpl?wsdl"); + wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws771/JBWS771Service/IWebsvcImpl?wsdl"); Service service = Service.create(wsdlURL, serviceName); port = service.getPort(IWebsvc.class); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws771/binding.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws771/binding.xml 2010-09-03 09:07:12 UTC (rev 12890) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws771/binding.xml 2010-09-03 09:14:11 UTC (rev 12891) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <jaxws:bindings - wsdlLocation="http://localhost:8080/jaxws-jbws771/IWebsvcImpl?wsdl" + wsdlLocation="http://localhost:8080/jaxws-jbws771/JBWS771Service/IWebsvcImpl?wsdl" xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"