Return-Path: Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 3234 invoked by uid 2016); 4 Nov 1999 01:40:39 -0000 Delivered-To: apcore-jakarta-tomcat-cvs@apache.org Received: (qmail 3227 invoked by uid 259); 4 Nov 1999 01:40:37 -0000 Date: 4 Nov 1999 01:40:37 -0000 Message-ID: <19991104014037.3226.qmail@hyperreal.org> From: costin@hyperreal.org To: jakarta-tomcat-cvs@apache.org Subject: cvs commit: jakarta-tomcat/src/tests/webpages/jsp/jsptoserv hello.jsp jsptoservlet.jsp costin 99/11/03 17:40:36 Modified: src/share/org/apache/jasper/runtime JspServlet.java src/tests testlist.txt src/tests/share/tests/request Get.java Post.java RequestMap.java src/tests/webpages/WEB-INF/classes/request EchoServlet.java Added: src/tests/share/tests/jsp Jsp.java jsp.properties src/tests/share/tests/jsp/Golden Err.txt HelloWorld.txt Include.txt MustFail.txt buffer.txt classTest.txt import.txt index.txt jsptoservlet.txt pageImport.txt parse.txt src/tests/webpages/WEB-INF/classes/jsp ServletToJsp.java src/tests/webpages/jsp HelloWorld.jsp buffer.jsp buffer1.jsp buffer2.jsp buffer3.jsp buffer4.jsp classTest.jsp comments.jsp import.jsp index.html initDestroy.jsp pageAutoFlush.jsp pageContentType.jsp pageError.jsp pageExtends.jsp pageImport.jsp pageImport2.jsp pageInfo.jsp pageIsErrorPage.jsp pageIsThreadSafe.jsp pageLanguage.jsp pageSession.jsp parse.jsp src/tests/webpages/jsp/error err.jsp errorpge.jsp src/tests/webpages/jsp/forward forward.jsp one.jsp two.html src/tests/webpages/jsp/include foo.html foo.jsp include.jsp src/tests/webpages/jsp/jsptoserv hello.jsp jsptoservlet.jsp Log: Added tests from J2EE branch to main branch. Revision Changes Path 1.8 +3 -4 jakarta-tomcat/src/share/org/apache/jasper/runtime/JspServlet.java Index: JspServlet.java =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspServlet.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- JspServlet.java 1999/11/03 23:43:51 1.7 +++ JspServlet.java 1999/11/04 01:39:39 1.8 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspServlet.java,v 1.7 1999/11/03 23:43:51 costin Exp $ - * $Revision: 1.7 $ - * $Date: 1999/11/03 23:43:51 $ + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspServlet.java,v 1.8 1999/11/04 01:39:39 costin Exp $ + * $Revision: 1.8 $ + * $Date: 1999/11/04 01:39:39 $ * * ==================================================================== * @@ -158,7 +158,6 @@ theServlet.service(request, response); } catch (FileNotFoundException ex) { - ex.printStackTrace(); response.sendError(HttpServletResponse.SC_NOT_FOUND, Constants.getString("jsp.error.file.not.found", new Object[] { 1.2 +2 -1 jakarta-tomcat/src/tests/testlist.txt Index: testlist.txt =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/tests/testlist.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- testlist.txt 1999/10/09 00:20:56 1.1 +++ testlist.txt 1999/11/04 01:39:41 1.2 @@ -1,4 +1,4 @@ -# $Id: testlist.txt,v 1.1 1999/10/09 00:20:56 duncan Exp $ +# $Id: testlist.txt,v 1.2 1999/11/04 01:39:41 costin Exp $ tests.file.FileLengthTest tests.file.ContentTypeTest @@ -18,4 +18,5 @@ tests.request.Get tests.request.Post tests.request.RequestMap +tests.jsp.Jsp #tests.perf.CounterClient 1.2 +334 -0 jakarta-tomcat/src/tests/share/tests/jsp/Jsp.java 1.2 +189 -0 jakarta-tomcat/src/tests/share/tests/jsp/jsp.properties 1.2 +9 -0 jakarta-tomcat/src/tests/share/tests/jsp/Golden/Err.txt 1.2 +3 -0 jakarta-tomcat/src/tests/share/tests/jsp/Golden/HelloWorld.txt 1.2 +22 -0 jakarta-tomcat/src/tests/share/tests/jsp/Golden/Include.txt 1.2 +1 -0 jakarta-tomcat/src/tests/share/tests/jsp/Golden/MustFail.txt 1.2 +7 -0 jakarta-tomcat/src/tests/share/tests/jsp/Golden/buffer.txt 1.2 +11 -0 jakarta-tomcat/src/tests/share/tests/jsp/Golden/classTest.txt 1.2 +7 -0 jakarta-tomcat/src/tests/share/tests/jsp/Golden/import.txt 1.2 +15 -0 jakarta-tomcat/src/tests/share/tests/jsp/Golden/index.txt 1.2 +6 -0 jakarta-tomcat/src/tests/share/tests/jsp/Golden/jsptoservlet.txt 1.2 +6 -0 jakarta-tomcat/src/tests/share/tests/jsp/Golden/pageImport.txt 1.2 +8 -0 jakarta-tomcat/src/tests/share/tests/jsp/Golden/parse.txt 1.5 +3 -3 jakarta-tomcat/src/tests/share/tests/request/Get.java Index: Get.java =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/tests/share/tests/request/Get.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Get.java 1999/10/25 22:49:07 1.4 +++ Get.java 1999/11/04 01:39:54 1.5 @@ -1,6 +1,6 @@ /* - * $Id: Get.java,v 1.4 1999/10/25 22:49:07 costin Exp $ + * $Id: Get.java,v 1.5 1999/11/04 01:39:54 costin Exp $ */ /** @@ -105,8 +105,8 @@ if (! localStatus || ! test(request, response, Boolean.valueOf(magnitude).booleanValue())) { - msg.append("\tcan't run test " + testId + " : " + - description + "\n"); + msg.append("\tTest " + testId + " : " + + description); status = false; } } 1.5 +3 -3 jakarta-tomcat/src/tests/share/tests/request/Post.java Index: Post.java =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/tests/share/tests/request/Post.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Post.java 1999/10/25 22:49:08 1.4 +++ Post.java 1999/11/04 01:39:54 1.5 @@ -1,6 +1,6 @@ /* - * $Id: Post.java,v 1.4 1999/10/25 22:49:08 costin Exp $ + * $Id: Post.java,v 1.5 1999/11/04 01:39:54 costin Exp $ */ /** @@ -56,8 +56,8 @@ status = false; String description = props.getProperty("test." + testId + ".description"); - msg.append("\tcan't run test " + testId + " : " + - description + "\n"); + msg.append("\tTest " + testId + " : " + + description); } } } 1.3 +2 -2 jakarta-tomcat/src/tests/share/tests/request/RequestMap.java Index: RequestMap.java =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/tests/share/tests/request/RequestMap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- RequestMap.java 1999/10/14 23:49:02 1.2 +++ RequestMap.java 1999/11/04 01:39:54 1.3 @@ -1,6 +1,6 @@ /* - * $Id: RequestMap.java,v 1.2 1999/10/14 23:49:02 akv Exp $ + * $Id: RequestMap.java,v 1.3 1999/11/04 01:39:54 costin Exp $ */ /** @@ -111,7 +111,7 @@ if (! localStatus || ! test(request, response, Boolean.valueOf(magnitude).booleanValue())) { status = false; - msg.append("can't run test " + testId + " : " + + msg.append("Test " + testId + " : " + description); } } 1.2 +30 -0 jakarta-tomcat/src/tests/webpages/WEB-INF/classes/jsp/ServletToJsp.java 1.2 +1 -2 jakarta-tomcat/src/tests/webpages/WEB-INF/classes/request/EchoServlet.java Index: EchoServlet.java =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/classes/request/EchoServlet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- EchoServlet.java 1999/10/09 00:20:58 1.1 +++ EchoServlet.java 1999/11/04 01:39:57 1.2 @@ -1,4 +1,4 @@ -/* $Id: EchoServlet.java,v 1.1 1999/10/09 00:20:58 duncan Exp $ +/* $Id: EchoServlet.java,v 1.2 1999/11/04 01:39:57 costin Exp $ * */ @@ -32,7 +32,6 @@ HttpServletResponse response) throws IOException, ServletException { -System.out.println("EchoServletr: inside doPost()"); doGet(request, response); } 1.2 +3 -0 jakarta-tomcat/src/tests/webpages/jsp/HelloWorld.jsp 1.2 +7 -0 jakarta-tomcat/src/tests/webpages/jsp/buffer.jsp 1.2 +7 -0 jakarta-tomcat/src/tests/webpages/jsp/buffer1.jsp 1.2 +7 -0 jakarta-tomcat/src/tests/webpages/jsp/buffer2.jsp 1.2 +7 -0 jakarta-tomcat/src/tests/webpages/jsp/buffer3.jsp 1.2 +7 -0 jakarta-tomcat/src/tests/webpages/jsp/buffer4.jsp 1.2 +20 -0 jakarta-tomcat/src/tests/webpages/jsp/classTest.jsp 1.2 +23 -0 jakarta-tomcat/src/tests/webpages/jsp/comments.jsp 1.2 +12 -0 jakarta-tomcat/src/tests/webpages/jsp/import.jsp 1.2 +15 -0 jakarta-tomcat/src/tests/webpages/jsp/index.html 1.2 +30 -0 jakarta-tomcat/src/tests/webpages/jsp/initDestroy.jsp 1.2 +6 -0 jakarta-tomcat/src/tests/webpages/jsp/pageAutoFlush.jsp 1.2 +6 -0 jakarta-tomcat/src/tests/webpages/jsp/pageContentType.jsp 1.2 +6 -0 jakarta-tomcat/src/tests/webpages/jsp/pageError.jsp 1.2 +6 -0 jakarta-tomcat/src/tests/webpages/jsp/pageExtends.jsp 1.2 +7 -0 jakarta-tomcat/src/tests/webpages/jsp/pageImport.jsp 1.2 +6 -0 jakarta-tomcat/src/tests/webpages/jsp/pageImport2.jsp 1.2 +6 -0 jakarta-tomcat/src/tests/webpages/jsp/pageInfo.jsp 1.2 +6 -0 jakarta-tomcat/src/tests/webpages/jsp/pageIsErrorPage.jsp 1.2 +6 -0 jakarta-tomcat/src/tests/webpages/jsp/pageIsThreadSafe.jsp 1.2 +6 -0 jakarta-tomcat/src/tests/webpages/jsp/pageLanguage.jsp 1.2 +6 -0 jakarta-tomcat/src/tests/webpages/jsp/pageSession.jsp 1.2 +12 -0 jakarta-tomcat/src/tests/webpages/jsp/parse.jsp 1.2 +11 -0 jakarta-tomcat/src/tests/webpages/jsp/error/err.jsp 1.2 +9 -0 jakarta-tomcat/src/tests/webpages/jsp/error/errorpge.jsp 1.2 +34 -0 jakarta-tomcat/src/tests/webpages/jsp/forward/forward.jsp 1.2 +23 -0 jakarta-tomcat/src/tests/webpages/jsp/forward/one.jsp 1.2 +23 -0 jakarta-tomcat/src/tests/webpages/jsp/forward/two.html 1.2 +1 -0 jakarta-tomcat/src/tests/webpages/jsp/include/foo.html 1.2 +4 -0 jakarta-tomcat/src/tests/webpages/jsp/include/foo.jsp 1.2 +13 -0 jakarta-tomcat/src/tests/webpages/jsp/include/include.jsp 1.2 +6 -0 jakarta-tomcat/src/tests/webpages/jsp/jsptoserv/hello.jsp 1.2 +6 -0 jakarta-tomcat/src/tests/webpages/jsp/jsptoserv/jsptoservlet.jsp