remm 2003/07/19 13:21:12
Modified: tester build.xml
tester/src/bin tester.xml
tester/src/tester/org/apache/tester ErrorPage04.java
tester/web/WEB-INF web.xml
Log:
- Fix some tests (bug 21731).
- Partially submitted by Peter Rossbach.
Revision Changes Path
1.3 +1 -0 jakarta-tomcat-catalina/tester/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/tester/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 11 Sep 2002 03:33:58 -0000 1.2
+++ build.xml 19 Jul 2003 20:21:12 -0000 1.3
@@ -88,6 +88,7 @@
<!-- Install Xerces -->
<copy todir="${tester.build}/web/WEB-INF/lib" file="${xercesImpl.jar}"/>
+ <copy todir="${tester.build}/web/WEB-INF/lib" file="${xmlParserAPIs.jar}"/>
<!-- Create and install tester library -->
<mkdir dir="${tester.build}/web/WEB-INF/lib"/>
1.5 +1 -1 jakarta-tomcat-catalina/tester/src/bin/tester.xml
Index: tester.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/tester/src/bin/tester.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tester.xml 18 Jul 2003 09:47:23 -0000 1.4
+++ tester.xml 19 Jul 2003 20:21:12 -0000 1.5
@@ -6,7 +6,7 @@
<property name="host" value="localhost"/>
<property name="port" value="8080"/>
<!-- <property name="protocol" value="HTTP/1.0"/> -->
- <property name="protocol" value=""/> <!-- Use HttpURLConnection -->
+ <property name="protocol" value="HTTP/1.0"/> <!-- Use HttpURLConnection -->
<property name="context.path" value="/tester"/>
<property name="jsp-examples.path" value="/jsp-examples"/>
<property name="servlets-examples.path" value="/servlets-examples"/>
1.2 +7 -17
jakarta-tomcat-catalina/tester/src/tester/org/apache/tester/ErrorPage04.java
Index: ErrorPage04.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/tester/src/tester/org/apache/tester/ErrorPage04.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ErrorPage04.java 18 Jul 2002 16:47:26 -0000 1.1
+++ ErrorPage04.java 19 Jul 2003 20:21:12 -0000 1.2
@@ -89,26 +89,16 @@
value = request.getAttribute("javax.servlet.error.exception");
if (value == null)
sb.append(" exception is missing/");
- else if (!(value instanceof javax.servlet.ServletException)) {
+ else if (!(value instanceof org.apache.tester.TesterException)) {
sb.append(" exception class is ");
sb.append(value.getClass().getName());
sb.append("/");
} else {
- exception = (ServletException) value;
- rootCause = exception.getRootCause();
- if (rootCause == null) {
- sb.append(" rootCause is missing/");
- } else if (!(rootCause instanceof TesterException)) {
- sb.append(" rootCause is ");
- sb.append(rootCause.getClass().getName());
+ TesterException te = (TesterException) rootCause;
+ if (!"ErrorPage03 Threw Exception".equals(te.getMessage())) {
+ sb.append(" exception message is ");
+ sb.append(te.getMessage());
sb.append("/");
- } else {
- TesterException te = (TesterException) rootCause;
- if (!"ErrorPage03 Threw Exception".equals(te.getMessage())) {
- sb.append(" exception message is ");
- sb.append(te.getMessage());
- sb.append("/");
- }
}
}
@@ -121,7 +111,7 @@
sb.append("/");
} else {
Class clazz = (Class) value;
- if (!"javax.servlet.ServletException".equals(clazz.getName())) {
+ if (!"org.apache.tester.TesterException".equals(clazz.getName())) {
sb.append(" exception_type class is ");
sb.append(clazz.getName());
sb.append("/");
1.4 +18 -0 jakarta-tomcat-catalina/tester/web/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/tester/web/WEB-INF/web.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- web.xml 28 Dec 2002 04:23:54 -0000 1.3
+++ web.xml 19 Jul 2003 20:21:12 -0000 1.4
@@ -1025,8 +1025,26 @@
</servlet>
+ <servlet>
+ <servlet-name>invoker</servlet-name>
+ <servlet-class>
+ org.apache.catalina.servlets.InvokerServlet
+ </servlet-class>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+
<!-- ========== Servlet Mappings ====================================== -->
+
+ <servlet-mapping>
+ <servlet-name>invoker</servlet-name>
+ <url-pattern>/servlet/*</url-pattern>
+ </servlet-mapping>
<!-- Map CGI Gateway Service for this Web App -->
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
