craigmcc 01/07/23 14:51:47
Modified: src/server/jsp-tests/jsp/engine/PageContext
positivePopBody.jsp positivePushBody.jsp
src/server/jsp-tests/jsp/tagext/BodyContent
positiveGetEnclosingWriter.jsp
positiveGetReader.jsp positiveGetString.jsp
src/server/jsp-tests/jsp/tagext/TagData
positiveTagGetAttribute.jsp
positiveTagGetAttributeString.jsp
positiveTagSetAttribute.jsp
src/server/jsp-tests/jsp/tagext/TagSupport
positiveGetValue.jsp positiveGetValues.jsp
positiveRemoveValue.jsp positiveSetValue.jsp
Log:
Fix JSP tests that were depending on the (incorrect) implicit import of
"javax.servlet.jsp.tagext.*". Tomcat 4.0 was corrected by a change that
was just checked in; these changes make the tests operate correctly with
the standard set of default imports.
Revision Changes Path
1.2 +2 -2
jakarta-watchdog-4.0/src/server/jsp-tests/jsp/engine/PageContext/positivePopBody.jsp
Index: positivePopBody.jsp
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/engine/PageContext/positivePopBody.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- positivePopBody.jsp 2000/10/04 00:21:30 1.1
+++ positivePopBody.jsp 2001/07/23 21:51:47 1.2
@@ -19,9 +19,9 @@
%>
<%
- BodyContent bc = pageContext.pushBody();
+ javax.servlet.jsp.tagext.BodyContent bc = pageContext.pushBody();
JspWriter jw = pageContext.popBody();
jw.println("sun");
%>
</body>
-</html>
\ No newline at end of file
+</html>
1.3 +2 -2
jakarta-watchdog-4.0/src/server/jsp-tests/jsp/engine/PageContext/positivePushBody.jsp
Index: positivePushBody.jsp
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/engine/PageContext/positivePushBody.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- positivePushBody.jsp 2000/10/18 00:07:01 1.2
+++ positivePushBody.jsp 2001/07/23 21:51:47 1.3
@@ -18,10 +18,10 @@
<%
- BodyContent bc = pageContext.pushBody();
+ javax.servlet.jsp.tagext.BodyContent bc = pageContext.pushBody();
bc.println(".com");
out.println(bc.getString());
pageContext.popBody();
%>
</body>
-</html>
\ No newline at end of file
+</html>
1.3 +2 -2
jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/BodyContent/positiveGetEnclosingWriter.jsp
Index: positiveGetEnclosingWriter.jsp
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/BodyContent/positiveGetEnclosingWriter.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- positiveGetEnclosingWriter.jsp 2000/10/18 00:07:02 1.2
+++ positiveGetEnclosingWriter.jsp 2001/07/23 21:51:47 1.3
@@ -13,7 +13,7 @@
<!-- Using pageContext.pushBody() to create a BodyContent object -->
<%
- BodyContent bc = pageContext.pushBody();
+ javax.servlet.jsp.tagext.BodyContent bc = pageContext.pushBody();
%>
<!-- checking for JspWriter object -->
<%= (bc.getEnclosingWriter()) instanceof javax.servlet.jsp.JspWriter %>
@@ -22,4 +22,4 @@
%>
</body>
-</html>
\ No newline at end of file
+</html>
1.3 +2 -2
jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/BodyContent/positiveGetReader.jsp
Index: positiveGetReader.jsp
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/BodyContent/positiveGetReader.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- positiveGetReader.jsp 2000/10/18 00:07:02 1.2
+++ positiveGetReader.jsp 2001/07/23 21:51:47 1.3
@@ -11,7 +11,7 @@
**/
%>
<%
- BodyContent bc = pageContext.pushBody();
+ javax.servlet.jsp.tagext.BodyContent bc = pageContext.pushBody();
bc.println("Moon");
%>
<!-- checking for Reader object -->
@@ -21,4 +21,4 @@
%>
</body>
-</html>
\ No newline at end of file
+</html>
1.3 +1 -1
jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/BodyContent/positiveGetString.jsp
Index: positiveGetString.jsp
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/BodyContent/positiveGetString.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- positiveGetString.jsp 2000/10/18 00:07:02 1.2
+++ positiveGetString.jsp 2001/07/23 21:51:47 1.3
@@ -12,7 +12,7 @@
<%
// using pageContext.pushBody() to create a BodyContent object
- BodyContent bc = pageContext.pushBody();
+ javax.servlet.jsp.tagext.BodyContent bc = pageContext.pushBody();
bc.println("Checking For getString() method");
out.println(bc.getString());
pageContext.popBody();
1.2 +3 -2
jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/TagData/positiveTagGetAttribute.jsp
Index: positiveTagGetAttribute.jsp
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/TagData/positiveTagGetAttribute.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- positiveTagGetAttribute.jsp 2000/10/04 00:27:39 1.1
+++ positiveTagGetAttribute.jsp 2001/07/23 21:51:47 1.2
@@ -18,7 +18,8 @@
ht.put("Color3","yellow");
ht.put("Color4","orange");
- TagData td = new TagData(ht);
+ javax.servlet.jsp.tagext.TagData td =
+ new javax.servlet.jsp.tagext.TagData(ht);
for(int i=1;i<=4;i++) {
out.println("Colors are " + td.getAttribute("Color"+i));
@@ -28,4 +29,4 @@
%>
</body>
-</html>
\ No newline at end of file
+</html>
1.2 +3 -2
jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/TagData/positiveTagGetAttributeString.jsp
Index: positiveTagGetAttributeString.jsp
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/TagData/positiveTagGetAttributeString.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- positiveTagGetAttributeString.jsp 2000/10/04 00:27:39 1.1
+++ positiveTagGetAttributeString.jsp 2001/07/23 21:51:47 1.2
@@ -13,7 +13,8 @@
<%
java.util.Hashtable ht = new java.util.Hashtable();
- TagData td = new TagData(ht);
+ javax.servlet.jsp.tagext.TagData td =
+ new javax.servlet.jsp.tagext.TagData(ht);
td.setAttribute("Color1","red");
td.setAttribute("Color2","green");
@@ -29,4 +30,4 @@
</body>
-</html>
\ No newline at end of file
+</html>
1.2 +3 -2
jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/TagData/positiveTagSetAttribute.jsp
Index: positiveTagSetAttribute.jsp
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/TagData/positiveTagSetAttribute.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- positiveTagSetAttribute.jsp 2000/10/04 00:27:39 1.1
+++ positiveTagSetAttribute.jsp 2001/07/23 21:51:47 1.2
@@ -14,7 +14,8 @@
<%
java.util.Hashtable ht = new java.util.Hashtable();
- TagData td = new TagData(ht);
+ javax.servlet.jsp.tagext.TagData td =
+ new javax.servlet.jsp.tagext.TagData(ht);
td.setAttribute("Color1","red");
td.setAttribute("Color2","green");
@@ -28,4 +29,4 @@
<br> <% }
%>
</body>
-</html>
\ No newline at end of file
+</html>
1.2 +3 -2
jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/TagSupport/positiveGetValue.jsp
Index: positiveGetValue.jsp
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/TagSupport/positiveGetValue.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- positiveGetValue.jsp 2000/10/04 00:26:19 1.1
+++ positiveGetValue.jsp 2001/07/23 21:51:47 1.2
@@ -18,7 +18,8 @@
<%
- TagSupport ts = new TagSupport();
+ javax.servlet.jsp.tagext.TagSupport ts =
+ new javax.servlet.jsp.tagext.TagSupport();
ts.setValue("Color1","red");
ts.setValue("Color2","green");
@@ -32,4 +33,4 @@
</body>
-</html>
\ No newline at end of file
+</html>
1.2 +2 -1
jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/TagSupport/positiveGetValues.jsp
Index: positiveGetValues.jsp
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/TagSupport/positiveGetValues.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- positiveGetValues.jsp 2000/10/04 00:26:19 1.1
+++ positiveGetValues.jsp 2001/07/23 21:51:47 1.2
@@ -16,7 +16,8 @@
<%
- TagSupport ts = new TagSupport();
+ javax.servlet.jsp.tagext.TagSupport ts =
+ new javax.servlet.jsp.tagext.TagSupport();
ts.setValue("Color1","red");
ts.setValue("Color2","green");
1.2 +3 -2
jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/TagSupport/positiveRemoveValue.jsp
Index: positiveRemoveValue.jsp
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/TagSupport/positiveRemoveValue.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- positiveRemoveValue.jsp 2000/10/04 00:26:19 1.1
+++ positiveRemoveValue.jsp 2001/07/23 21:51:47 1.2
@@ -15,7 +15,8 @@
<%
- TagSupport ts = new TagSupport();
+ javax.servlet.jsp.tagext.TagSupport ts =
+ new javax.servlet.jsp.tagext.TagSupport();
ts.setValue("Color1","red");
ts.setValue("Color2","green");
@@ -36,4 +37,4 @@
</body>
-</html>
\ No newline at end of file
+</html>
1.2 +3 -2
jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/TagSupport/positiveSetValue.jsp
Index: positiveSetValue.jsp
===================================================================
RCS file:
/home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/tagext/TagSupport/positiveSetValue.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- positiveSetValue.jsp 2000/10/04 00:26:19 1.1
+++ positiveSetValue.jsp 2001/07/23 21:51:47 1.2
@@ -17,7 +17,8 @@
<%
- TagSupport ts = new TagSupport();
+ javax.servlet.jsp.tagext.TagSupport ts =
+ new javax.servlet.jsp.tagext.TagSupport();
ts.setValue("Color1","red");
ts.setValue("Color2","green");
@@ -30,4 +31,4 @@
%>
</body>
-</html>
\ No newline at end of file
+</html>
