craigmcc 2003/03/10 09:29:53
Modified: web/test/test/org/apache/struts/taglib/html TestBaseTag.jsp
TestButtonTag1.jsp TestButtonTag2.jsp
TestCancelTag1.jsp TestCancelTag2.jsp
TestCheckboxTag1.jsp TestCheckboxTag2.jsp
TestCheckboxTag3.jsp TestCheckboxTag4.jsp
TestErrorsTag1.jsp TestErrorsTag2.jsp
TestFileTag1.jsp TestFileTag2.jsp
TestHiddenTag1.jsp TestHiddenTag2.jsp
TestHtmlTag.jsp TestImageTag1.jsp TestImageTag2.jsp
TestImageTag3.jsp TestImageTag4.jsp
Log:
Make the Cactus tests run successfully under Tomcat 4.0.6, when running the
"test.tomcat.40" target.
The problem is a bug in Tomcat 4.0.6, where the JSP page compiler incorrectly
does an implicit "import org.apache.jasper.runtime.*" in the generated code
for each page. Unfortunately, that makes the class name "JspException"
ambiguous. I corrected this by fully qualifying the exception class we
really want (javax.servlet.jsp.JspException), which runs on 4.0 and 4.1.
I have't tried these on 3.3 yet -- that will be later.
Revision Changes Path
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestBaseTag.jsp
Index: TestBaseTag.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestBaseTag.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestBaseTag.jsp 7 Mar 2003 05:27:19 -0000 1.2
+++ TestBaseTag.jsp 10 Mar 2003 17:29:52 -0000 1.3
@@ -52,7 +52,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -61,4 +61,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestButtonTag1.jsp
Index: TestButtonTag1.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestButtonTag1.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestButtonTag1.jsp 7 Mar 2003 05:27:19 -0000 1.2
+++ TestButtonTag1.jsp 10 Mar 2003 17:29:52 -0000 1.3
@@ -235,7 +235,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -244,4 +244,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.4 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestButtonTag2.jsp
Index: TestButtonTag2.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestButtonTag2.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestButtonTag2.jsp 7 Mar 2003 05:27:19 -0000 1.3
+++ TestButtonTag2.jsp 10 Mar 2003 17:29:52 -0000 1.4
@@ -201,7 +201,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -210,4 +210,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCancelTag1.jsp
Index: TestCancelTag1.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCancelTag1.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestCancelTag1.jsp 7 Mar 2003 05:27:19 -0000 1.2
+++ TestCancelTag1.jsp 10 Mar 2003 17:29:52 -0000 1.3
@@ -235,7 +235,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -244,4 +244,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCancelTag2.jsp
Index: TestCancelTag2.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCancelTag2.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestCancelTag2.jsp 7 Mar 2003 05:27:19 -0000 1.2
+++ TestCancelTag2.jsp 10 Mar 2003 17:29:52 -0000 1.3
@@ -116,7 +116,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -125,4 +125,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCheckboxTag1.jsp
Index: TestCheckboxTag1.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCheckboxTag1.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestCheckboxTag1.jsp 7 Mar 2003 05:27:19 -0000 1.2
+++ TestCheckboxTag1.jsp 10 Mar 2003 17:29:52 -0000 1.3
@@ -235,7 +235,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -244,4 +244,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCheckboxTag2.jsp
Index: TestCheckboxTag2.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCheckboxTag2.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestCheckboxTag2.jsp 7 Mar 2003 05:27:19 -0000 1.2
+++ TestCheckboxTag2.jsp 10 Mar 2003 17:29:52 -0000 1.3
@@ -201,7 +201,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -210,4 +210,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCheckboxTag3.jsp
Index: TestCheckboxTag3.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCheckboxTag3.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestCheckboxTag3.jsp 7 Mar 2003 05:27:19 -0000 1.2
+++ TestCheckboxTag3.jsp 10 Mar 2003 17:29:52 -0000 1.3
@@ -235,7 +235,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -244,4 +244,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCheckboxTag4.jsp
Index: TestCheckboxTag4.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCheckboxTag4.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestCheckboxTag4.jsp 7 Mar 2003 05:27:19 -0000 1.2
+++ TestCheckboxTag4.jsp 10 Mar 2003 17:29:52 -0000 1.3
@@ -201,7 +201,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -210,4 +210,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag1.jsp
Index: TestErrorsTag1.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag1.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestErrorsTag1.jsp 7 Mar 2003 05:27:19 -0000 1.2
+++ TestErrorsTag1.jsp 10 Mar 2003 17:29:52 -0000 1.3
@@ -532,7 +532,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -541,4 +541,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag2.jsp
Index: TestErrorsTag2.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestErrorsTag2.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestErrorsTag2.jsp 7 Mar 2003 05:27:19 -0000 1.2
+++ TestErrorsTag2.jsp 10 Mar 2003 17:29:52 -0000 1.3
@@ -533,7 +533,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -542,4 +542,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFileTag1.jsp
Index: TestFileTag1.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFileTag1.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestFileTag1.jsp 7 Mar 2003 05:28:51 -0000 1.2
+++ TestFileTag1.jsp 10 Mar 2003 17:29:52 -0000 1.3
@@ -244,7 +244,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -253,4 +253,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.3 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFileTag2.jsp
Index: TestFileTag2.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFileTag2.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestFileTag2.jsp 7 Mar 2003 05:28:51 -0000 1.2
+++ TestFileTag2.jsp 10 Mar 2003 17:29:52 -0000 1.3
@@ -200,7 +200,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -209,4 +209,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.2 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestHiddenTag1.jsp
Index: TestHiddenTag1.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestHiddenTag1.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestHiddenTag1.jsp 7 Mar 2003 05:40:38 -0000 1.1
+++ TestHiddenTag1.jsp 10 Mar 2003 17:29:52 -0000 1.2
@@ -203,7 +203,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -212,4 +212,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.2 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestHiddenTag2.jsp
Index: TestHiddenTag2.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestHiddenTag2.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestHiddenTag2.jsp 7 Mar 2003 05:40:38 -0000 1.1
+++ TestHiddenTag2.jsp 10 Mar 2003 17:29:52 -0000 1.2
@@ -157,7 +157,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -166,4 +166,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.2 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestHtmlTag.jsp
Index: TestHtmlTag.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestHtmlTag.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestHtmlTag.jsp 7 Mar 2003 05:40:59 -0000 1.1
+++ TestHtmlTag.jsp 10 Mar 2003 17:29:52 -0000 1.2
@@ -339,7 +339,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -348,4 +348,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.2 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImageTag1.jsp
Index: TestImageTag1.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImageTag1.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestImageTag1.jsp 7 Mar 2003 05:41:28 -0000 1.1
+++ TestImageTag1.jsp 10 Mar 2003 17:29:52 -0000 1.2
@@ -242,7 +242,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -251,4 +251,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.2 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImageTag2.jsp
Index: TestImageTag2.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImageTag2.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestImageTag2.jsp 7 Mar 2003 05:41:28 -0000 1.1
+++ TestImageTag2.jsp 10 Mar 2003 17:29:52 -0000 1.2
@@ -263,7 +263,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -272,4 +272,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.2 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImageTag3.jsp
Index: TestImageTag3.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImageTag3.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestImageTag3.jsp 7 Mar 2003 05:41:28 -0000 1.1
+++ TestImageTag3.jsp 10 Mar 2003 17:29:52 -0000 1.2
@@ -268,7 +268,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -277,4 +277,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
1.2 +2 -2
jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImageTag4.jsp
Index: TestImageTag4.jsp
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImageTag4.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestImageTag4.jsp 7 Mar 2003 05:41:28 -0000 1.1
+++ TestImageTag4.jsp 10 Mar 2003 17:29:52 -0000 1.2
@@ -259,7 +259,7 @@
String compareTo = "";
if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new JspException("No tests on this page were called. Please verify that
you've setup the tests correctly.");
+ throw new javax.servlet.jsp.JspException("No tests on this page were called.
Please verify that you've setup the tests correctly.");
}else{
expected=pageContext.getAttribute("TEST_RESULTS").toString();
}
@@ -268,4 +268,4 @@
}
Assert.assertEquals(compareTo, expected);
-%>
\ No newline at end of file
+%>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
