Author: thomas.diesler(a)jboss.com Date: 2006-11-22 08:12:53 -0500 (Wed, 22 Nov 2006) New Revision: 1500 Modified: trunk/src/test/build.xml trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java Log: Removed Java 5.0 specific code. Modified: trunk/src/test/build.xml =================================================================== --- trunk/src/test/build.xml 2006-11-22 13:09:51 UTC (rev 1499) +++ trunk/src/test/build.xml 2006-11-22 13:12:53 UTC (rev 1500) @@ -234,6 +234,7 @@ <javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <src path="${test.java.dir}"/> <exclude name="org/jboss/test/ws/interop/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/> <exclude name="org/jboss/test/ws/jaxws/**"/> <exclude name="org/jboss/test/ws/tools/jsr181/**"/> <classpath refid="javac.classpath"/> @@ -255,7 +256,6 @@ <mkdir dir="${build.test.dir}/classes"/> <javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <src path="${build.test.dir}/wstools/java"/> - <src path="${test.java.dir}"/> <exclude name="org/jboss/test/ws/interop/**"/> <classpath refid="javac.classpath"/> </javac> Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java 2006-11-22 13:09:51 UTC (rev 1499) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java 2006-11-22 13:12:53 UTC (rev 1500) @@ -43,7 +43,6 @@ public static final String MESSAGE = "Success!!"; - @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ServletOutputStream sos = response.getOutputStream(); Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-11-22 13:09:51 UTC (rev 1499) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-11-22 13:12:53 UTC (rev 1500) @@ -81,7 +81,7 @@ String address = endpoints[0].getAddress(); assertTrue("Expected Scheme '" + scheme + "'", address.startsWith(scheme + "://")); - assertTrue("Expected Port '" + port + "'", address.contains(":" + port + "/")); + assertTrue("Expected Port '" + port + "'", address.indexOf(":" + port + "/") > -1); } private void assertEquals(final String message, final int expected, final int actual) Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java 2006-11-22 13:09:51 UTC (rev 1499) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java 2006-11-22 13:12:53 UTC (rev 1500) @@ -34,7 +34,7 @@ { // Provide logging private static Logger log = Logger.getLogger(ApplicationClient.class); - + public static InitialContext encCtx; public static String retStr; @@ -42,8 +42,8 @@ { String inStr = args[0]; log.info("echo: " + inStr); - - ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>(); + + ArrayList ports = new ArrayList(); try { ports.add((TestEndpoint)((Service)encCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); @@ -54,14 +54,15 @@ log.error("Cannot add port", ex); throw new JAXRPCException(ex); } - - for (TestEndpoint port : ports) + + for (int i = 0; i < ports.size(); i++) { + TestEndpoint port = (TestEndpoint)ports.get(i); String outStr = port.echo(inStr); if (inStr.equals(outStr) == false) throw new JAXRPCException("Invalid echo return: " + inStr); } - + retStr = inStr; } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java 2006-11-22 13:09:51 UTC (rev 1499) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java 2006-11-22 13:12:53 UTC (rev 1500) @@ -44,7 +44,7 @@ { log.info("echo: " + inStr); - ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>(); + ArrayList ports = new ArrayList(); try { InitialContext iniCtx = new InitialContext(); @@ -57,8 +57,9 @@ throw new JAXRPCException(ex); } - for (TestEndpoint port : ports) + for (int i = 0; i < ports.size(); i++) { + TestEndpoint port = (TestEndpoint)ports.get(i); String outStr = port.echo(inStr); if (inStr.equals(outStr) == false) throw new JAXRPCException("Invalid echo return: " + inStr); Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java 2006-11-22 13:09:51 UTC (rev 1499) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java 2006-11-22 13:12:53 UTC (rev 1500) @@ -38,14 +38,13 @@ { // Provide logging private static Logger log = Logger.getLogger(ServletClient.class); - - @Override + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { String inStr = req.getParameter("echo"); log.info("doGet: " + inStr); - - ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>(); + + ArrayList ports = new ArrayList(); try { InitialContext iniCtx = new InitialContext(); @@ -57,14 +56,15 @@ log.error("Cannot add port", ex); throw new JAXRPCException(ex); } - - for (TestEndpoint port : ports) + + for (int i = 0; i < ports.size(); i++) { + TestEndpoint port = (TestEndpoint)ports.get(i); String outStr = port.echo(inStr); if (inStr.equals(outStr) == false) throw new JAXRPCException("Invalid echo return: " + inStr); } - + res.getWriter().print(inStr); } } Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2006-11-22 13:09:51 UTC (rev 1499) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2006-11-22 13:12:53 UTC (rev 1500) @@ -47,7 +47,7 @@ } catch (IOException e) { - assertTrue("Expected error", e.getMessage().contains("'{\"http://www.jboss.org/jbossws-t... is expected.")); + assertTrue("Expected error", e.getMessage().indexOf("'{\"http://www.jboss.org/jbossws-to... is expected.") > -1); } }