Author: alessio.soldano(a)jboss.com Date: 2011-02-26 21:33:10 -0500 (Sat, 26 Feb 2011) New Revision: 13804 Added: shared-testsuite/trunk/src/test/resources/jaxws/endpoint/MANIFEST.MF Modified: shared-testsuite/trunk/src/test/ant-import/build-jars-jaxws.xml shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java Log: [JBWS-3223] Minor fix to testcases Modified: shared-testsuite/trunk/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/src/test/ant-import/build-jars-jaxws.xml 2011-02-25 14:42:00 UTC (rev 13803) +++ shared-testsuite/trunk/src/test/ant-import/build-jars-jaxws.xml 2011-02-27 02:33:10 UTC (rev 13804) @@ -1034,7 +1034,8 @@ </war> <!-- jaxws-endpoint-servlet --> - <war warfile="${tests.output.dir}/test-libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/test-libs/jaxws-endpoint-servlet.war" manifest="${tests.output.dir}/test-resources/jaxws/endpoint/MANIFEST.MF" + webxml="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class" /> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class" /> Modified: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java =================================================================== --- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2011-02-25 14:42:00 UTC (rev 13803) +++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2011-02-27 02:33:10 UTC (rev 13804) @@ -80,7 +80,9 @@ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { // Create the port - URL wsdlURL = getServletContext().getResource("/WEB-INF/wsdl/TestService.wsdl"); + String hostName = System.getProperty("jboss.bind.address", "localhost"); +// URL wsdlURL = getServletContext().getResource("/WEB-INF/wsdl/TestService.wsdl"); + URL wsdlURL = new URL("http://" + hostName + ":8081/jaxws-endpoint?wsdl"); QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointService"); Service service = Service.create(wsdlURL, qname); EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); Modified: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java =================================================================== --- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java 2011-02-25 14:42:00 UTC (rev 13803) +++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java 2011-02-27 02:33:10 UTC (rev 13804) @@ -25,8 +25,6 @@ import java.io.PrintWriter; import java.net.URL; -import java.security.AccessController; -import java.security.PrivilegedAction; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -42,8 +40,9 @@ String param = req.getParameter("param"); boolean clCheck = Boolean.parseBoolean(req.getParameter("clCheck")); Client client = new Client(clCheck); + String hostName = System.getProperty("jboss.bind.address", "localhost"); //URL wsdlURL = getServletContext().getResource("/WEB-INF/wsdl/TestService.wsdl"); - URL wsdlURL = new URL("http://localhost:8080/jaxws-jbws3223?wsdl"); + URL wsdlURL = new URL("http://" + hostName + ":8080/jaxws-jbws3223?wsdl"); String retStr = client.run(param, wsdlURL); // Return the result Added: shared-testsuite/trunk/src/test/resources/jaxws/endpoint/MANIFEST.MF =================================================================== --- shared-testsuite/trunk/src/test/resources/jaxws/endpoint/MANIFEST.MF (rev 0) +++ shared-testsuite/trunk/src/test/resources/jaxws/endpoint/MANIFEST.MF 2011-02-27 02:33:10 UTC (rev 13804) @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 +Dependencies: org.jboss.ws.common \ No newline at end of file