craigmcc 01/04/30 14:57:17
Modified: tester/src/bin tester.xml
tester/web/WEB-INF web.xml
Added: tester/src/tester/org/apache/tester ErrorPage07.java
Log:
Add a unit test to validate the "load-on-startup servlet throws exception
from init()" fix that was just committed.
Revision Changes Path
1.36 +13 -0 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- tester.xml 2001/04/26 18:23:44 1.35
+++ tester.xml 2001/04/30 21:57:14 1.36
@@ -264,6 +264,19 @@
status="200"
outContent="ErrorPage06 PASSED - HTML"/>
+ <!-- ========== Load On Startup Exception Handling ==================== -->
+
+ <!-- NOTE: HttpURLConnection throws FileNotFoundException on 503s -->
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0"
+ request="${context.path}/ErrorPage07"
+ debug="${debug}"
+ status="503"/>
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0"
+ request="${context.path}/WrappedErrorPage07"
+ debug="${debug}"
+ status="503"/>
+
</target>
1.1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage07.java
Index: ErrorPage07.java
===================================================================
/* ========================================================================= *
* *
* The Apache Software License, Version 1.1 *
* *
* Copyright (c) 1999, 2000, 2001 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
* *
* Redistribution and use in source and binary forms, with or without modi- *
* fication, are permitted provided that the following conditions are met: *
* *
* 1. Redistributions of source code must retain the above copyright notice *
* notice, this list of conditions and the following disclaimer. *
* *
* 2. Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in the *
* documentation and/or other materials provided with the distribution. *
* *
* 3. The end-user documentation included with the redistribution, if any, *
* must include the following acknowlegement: *
* *
* "This product includes software developed by the Apache Software *
* Foundation <http://www.apache.org/>." *
* *
* Alternately, this acknowlegement may appear in the software itself, if *
* and wherever such third-party acknowlegements normally appear. *
* *
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software *
* Foundation" must not be used to endorse or promote products derived *
* from this software without prior written permission. For written *
* permission, please contact <[EMAIL PROTECTED]>. *
* *
* 5. Products derived from this software may not be called "Apache" nor may *
* "Apache" appear in their names without prior written permission of the *
* Apache Software Foundation. *
* *
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY *
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY *
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL *
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS *
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) *
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, *
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
* ========================================================================= *
* *
* This software consists of voluntary contributions made by many indivi- *
* duals on behalf of the Apache Software Foundation. For more information *
* on the Apache Software Foundation, please see <http://www.apache.org/>. *
* *
* ========================================================================= */
package org.apache.tester;
import java.io.*;
import javax.servlet.*;
import javax.servlet.http.*;
/**
* Part 7 of the error page tests. This servlet is configured as
* <code>load-on-startup</code> in the web.xml file, and should return
* status 503 (service unavailable) when it is called later.
*
* @author Craig R. McClanahan
* @version $Revision: 1.1 $ $Date: 2001/04/30 21:57:16 $
*/
public class ErrorPage07 extends HttpServlet {
public void init() throws ServletException {
throw new UnavailableException
("ErrorPage07 Threw UnavailableException in init()");
}
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
response.setContentType("text/plain");
PrintWriter writer = response.getWriter();
writer.println("ErrorPage07 FAILED - Called unavailable servlet");
while (true) {
String message = StaticLogger.read();
if (message == null)
break;
writer.println(message);
}
StaticLogger.reset();
}
}
1.26 +21 -0 jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- web.xml 2001/04/26 18:23:45 1.25
+++ web.xml 2001/04/30 21:57:16 1.26
@@ -99,6 +99,11 @@
<filter-mapping>
<filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedErrorPage07</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
<url-pattern>/WrappedForward01</url-pattern>
</filter-mapping>
@@ -322,6 +327,12 @@
</servlet>
<servlet>
+ <servlet-name>ErrorPage07</servlet-name>
+ <servlet-class>org.apache.tester.ErrorPage07</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
<servlet-name>Forward01</servlet-name>
<servlet-class>org.apache.tester.Forward01</servlet-class>
</servlet>
@@ -578,6 +589,16 @@
<servlet-mapping>
<servlet-name>ErrorPage06</servlet-name>
<url-pattern>/WrappedErrorPage06</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ErrorPage07</servlet-name>
+ <url-pattern>/ErrorPage07</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ErrorPage07</servlet-name>
+ <url-pattern>/WrappedErrorPage07</url-pattern>
</servlet-mapping>
<servlet-mapping>
