tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@hyperreal.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/jasper/runtime BodyContentImpl.java JspServlet.java
Date Mon, 08 Nov 1999 03:14:45 GMT
akv         99/11/07 19:14:44

  Modified:    src/examples/WEB-INF/classes/jsp/tags/examples
                        ExampleTagBase.java FooTag.java LogTag.java
               src/examples/WEB-INF/jsp example-taglib.tld
               src/examples/jsp index.html
               src/examples/servlets index.html
               src/share/javax/servlet/jsp/tagext BodyTag.java
                        BodyTagSupport.java TagAttributeInfo.java
                        TagSupport.java
               src/share/org/apache/jasper Constants.java
               src/share/org/apache/jasper/compiler BeanGenerator.java
                        JspCompiler.java JspReader.java Parser.java
                        SetPropertyGenerator.java TagBeginGenerator.java
                        TagEndGenerator.java TagLibraries.java
                        TagLibraryInfoImpl.java
               src/share/org/apache/jasper/runtime BodyContentImpl.java
                        JspServlet.java
  Added:       src/examples/jsp/simpletag foo.html foo.txt
               src/share/javax/servlet/jsp JspTagException.java
  Removed:     src/share/javax/servlet/jsp JspError.java
  Log:
  Did a clean merge of all the JSP stuff using:
  
  	cvs update -j TOMCAT_J2EE_10F_102199
  
  The broken example should now run fine.
  
  Revision  Changes    Path
  1.2       +2 -2      jakarta-tomcat/src/examples/WEB-INF/classes/jsp/tags/examples/ExampleTagBase.java
  
  Index: ExampleTagBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/jsp/tags/examples/ExampleTagBase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ExampleTagBase.java	1999/10/20 11:13:41	1.1
  +++ ExampleTagBase.java	1999/11/08 03:12:45	1.2
  @@ -32,10 +32,10 @@
   
       // Default implementations for BodyTag methods as well
       // just in case a tag decides to implement BodyTag.
  -    public void doInitBody() throws JspError {
  +    public void doInitBody() throws JspException {
       }
   
  -    public int doAfterBody() throws JspError {
  +    public int doAfterBody() throws JspException {
           return SKIP_BODY;
       }
   
  
  
  
  1.3       +4 -4      jakarta-tomcat/src/examples/WEB-INF/classes/jsp/tags/examples/FooTag.java
  
  Index: FooTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/jsp/tags/examples/FooTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FooTag.java	1999/10/20 11:13:41	1.2
  +++ FooTag.java	1999/11/08 03:12:47	1.3
  @@ -41,16 +41,16 @@
        *
        * @return EVAL_BODY_INCLUDE
        */
  -    public int doStartTag() {
  +    public int doStartTag() throws JspException {
   	return EVAL_BODY_TAG;
       }
   
  -    public void doInitBody() throws JspError {
  +    public void doInitBody() throws JspException {
           pageContext.setAttribute("member", atts[i]);
           i++;
       }
       
  -    public int doAfterBody() throws JspError {
  +    public int doAfterBody() throws JspException {
           try {
               if (i == 3) {
                   bodyOut.writeOut(bodyOut.getEnclosingWriter());
  @@ -60,7 +60,7 @@
               i++;
               return EVAL_BODY_TAG;
           } catch (IOException ex) {
  -            throw new JspError(ex.toString());
  +            throw new JspTagException(ex.toString());
           }
       }
   }
  
  
  
  1.3       +3 -3      jakarta-tomcat/src/examples/WEB-INF/classes/jsp/tags/examples/LogTag.java
  
  Index: LogTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/jsp/tags/examples/LogTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LogTag.java	1999/10/20 11:13:41	1.2
  +++ LogTag.java	1999/11/08 03:12:48	1.3
  @@ -24,11 +24,11 @@
               toBrowser = false;
       }
   
  -    public int doStartTag() {
  +    public int doStartTag() throws JspException {
           return EVAL_BODY_TAG;
       }
       
  -    public int doAfterBody() throws JspError {
  +    public int doAfterBody() throws JspException {
           try {
               String s = bodyOut.getString();
               System.err.println(s);
  @@ -36,7 +36,7 @@
                   bodyOut.writeOut(bodyOut.getEnclosingWriter());
               return SKIP_BODY;
           } catch (IOException ex) {
  -            throw new JspError(ex.toString());
  +            throw new JspTagException(ex.toString());
           }
       }
   }
  
  
  
  1.3       +1 -1      jakarta-tomcat/src/examples/WEB-INF/jsp/example-taglib.tld
  
  Index: example-taglib.tld
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/jsp/example-taglib.tld,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- example-taglib.tld	1999/10/21 02:47:49	1.2
  +++ example-taglib.tld	1999/11/08 03:12:58	1.3
  @@ -12,7 +12,7 @@
   
     <tlibversion>1.0</tlibversion>
     <jspversion>1.1</jspversion>
  -  <prefix>simple</prefix>
  +  <shortname>simple</shortname>
     <urn></urn>
     <info>
   	A simple tab library for the examples
  
  
  
  1.3       +141 -111  jakarta-tomcat/src/examples/jsp/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/index.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.html	1999/10/21 05:54:49	1.2
  +++ index.html	1999/11/08 03:13:08	1.3
  @@ -1,124 +1,154 @@
  +<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
   <html>
  +<head>
  +   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  +   <meta name="GENERATOR" content="Mozilla/4.61 [en] (WinNT; I) [Netscape]">
  +   <meta name="Author" content="Anil K. Vijendran">
  +   <title>JSP Examples</title>
   <!--
     Copyright (c) 1999 The Apache Software Foundation.  All rights 
     reserved.
   -->
  -
  -<head>
  -<title>Untitled Document</title>
  -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   </head>
  -
   <body bgcolor="#FFFFFF">
  -<p><font face="Arial, Helvetica, sans-serif"><b><font size="+2">JSP Samples 
  -  </font></b></font><br>
  -</p>
  +<b><font face="Arial, Helvetica, sans-serif"><font size=+2>JSP
  +Samples</font></font></b>
   <p>This is a collection of samples demonstrates the usage of different
  -  parts of the Java Server Pages (JSP) specification. </p>
  -<p>These examples will only work when these pages are being served by the ServletRunner. 
  -  They will not work if you are viewing these pages via a &quot;file://...&quot; 
  -  URL.</p>
  -<p>To navigate your way through the examples, the following icons will help:</p>
  -<table border="0" width="85%" align="center" cellspacing="5">
  -  <tr valign="top"> 
  -    <td width="30"><img src="../images/execute.gif"></td>
  -    <td>Execute the example</td>
  -  </tr>
  -  <tr valign="top"> 
  -    <td width="30"><img src="../images/code.gif" width="24" height="24"></td>
  -    <td>Look at the source code for the example</td>
  -  </tr>
  -  <tr valign="top"> 
  -    <td width="30"><img src="../images/return.gif" width="24" height="24"></td>
  -    <td>Return to this screen</td>
  -  </tr>
  +parts of the Java Server Pages (JSP) specification.
  +<p>These examples will only work when these pages are being served by the
  +ServletRunner. They will not work if you are viewing these pages via a
  +"file://..." URL.
  +<p>To navigate your way through the examples, the following icons will
  +help:
  +<br>&nbsp;
  +<table BORDER=0 CELLSPACING=5 WIDTH="85%" >
  +<tr VALIGN=TOP>
  +<td WIDTH="30"><img SRC="../images/execute.gif" ></td>
  +
  +<td>Execute the example</td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td WIDTH="30"><img SRC="../images/code.gif" height=24 width=24></td>
  +
  +<td>Look at the source code for the example</td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td WIDTH="30"><img SRC="../images/return.gif" height=24 width=24></td>
  +
  +<td>Return to this screen</td>
  +</tr>
   </table>
  -<p>Tip: For session scoped beans to work, the cookies must be enabled. This can be 
  -done using browser options.
  -</p>
  -
  -
  -<table border="0" width="85%" align="center" cellspacing="5">
  -
  -  <tr valign="top"> 
  -    <td>Numberguess </td>
  -    <td width="30%" valign="top"><a href="num/numguess.jsp"><img src="../images/execute.gif" hspace="4" border="0" align="top"></a><a href="num/numguess.jsp">Execute</a></td>
  -    <td width="30%"><a href="num/numguess.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top"></a><a href="num/numguess.html">Source</a></td>
  -  </tr>
  -
  -  <tr valign="top"> 
  -    <td>Date </td>
  -    <td width="30%" valign="top"><a href="dates/date.jsp"><img src="../images/execute.gif" hspace="4" border="0" align="top"></a><a href="dates/date.jsp">Execute</a></td>
  -    <td width="30%"><a href="dates/date.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top"></a><a href="dates/date.html">Source</a></td>
  -  </tr>
  -
  -  <tr valign="top"> 
  -    <td>Snoop</td>
  -    <td width="30%"><a href="snp/snoop.jsp"><img src="../images/execute.gif" hspace="4" border="0" align="top"></a><a href="snp/snoop.jsp">Execute</a></td>
  -    <td width="30%"><a href="snp/snoop.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top"></a><a href="snp/snoop.html">Source</a></td>
  -  </tr>
  -
  -  <tr valign="top"> 
  -    <td>ErrorPage </td>
  -    <td width="30%"><a href="error/error.html"><img src="../images/execute.gif" hspace="4" border="0" align="top"></a><a href="../jsp/error/error.html">Execute</a></td>
  -    <td width="30%"><a href="error/er.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top"></a><a href="error/er.html">Source</a></td>
  -  </tr>
  -
  -  <tr valign="top"> 
  -    <td>Carts </td>
  -    <td width="30%" valign="top"><a href="sessions/carts.html"><img src="../images/execute.gif" hspace="4" border="0" align="top"></a><a href="sessions/carts.html">Execute</a></td>
  -    <td width="30%"><a href="sessions/crt.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top"></a><a href="sessions/crt.html">Source</a></td>
  -  </tr>
  -
  -  <tr valign="top"> 
  -    <td>Checkbox </td>
  -    <td width="30%" valign="top"><a href="/checkbox/check.html"><img src="../images/execute.gif" hspace="4" border="0" align="top"></a><a href="checkbox/check.html">Execute</a></td>
  -    <td width="30%"><a href="colors/cresult.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top"></a><a href="checkbox/cresult.html">Source</a></td>
  -  </tr>
  -
  -  <tr valign="top"> 
  -    <td>Color </td>
  -    <td width="30%" valign="top"><a href="/colors/colors.html"><img src="../images/execute.gif" hspace="4" border="0" align="top"></a><a href="colors/colors.html">Execute</a></td>
  -    <td width="30%"><a href="colors/clr.html.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top"></a><a href="colors/clr.html">Source</a></td>
  -  </tr>
  -
  -  <tr valign="top"> 
  -    <td>Calendar </td>
  -    <td width="30%"><a href="cal/login.html"><img src="../images/execute.gif" hspace="4" border="0" align="top">Execute</a></td>
  -    <td width="30%"><a href="cal/calendar.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top"></a><a href="cal/calendar.html">Source</a></td>
  -  </tr>
  -
  -  <tr valign="top"> 
  -    <td>Include </td>
  -    <td width="30%" valign="top"><a href="/include/include.jsp"><img src="../images/execute.gif" hspace="4" border="0" align="top"></a><a href="include/include.jsp">Execute</a></td>
  -    <td width="30%"><a href="include/inc.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top"></a><a href="include/inc.html">Source</a></td>
  -  </tr>
  -
  -  <tr valign="top"> 
  -    <td>Forward </td>
  -    <td width="30%" valign="top"><a href="forward/forward.jsp"><img src="../images/execute.gif" hspace="4" border="0" align="top"></a><a href="forward/forward.jsp">Execute</a></td>
  -    <td width="30%"><a href="forward/fwd.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top"></a><a href="forward/fwd.html">Source</a></td>
  -  </tr>
  -
  -  <tr valign="top"> 
  -    <td>Plugin </td>
  -    <td width="30%" valign="top"><a href="plugin/plugin.jsp"><img src="../images/execute.gif" hspace="4" border="0" align="top"></a><a href="plugin/plugin.jsp">Execute</a></td>
  -    <td width="30%"><a href="plugin/plugin.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top"></a><a href="plugin/plugin.html">Source</a></td>
  -  </tr>
  -
  -  <tr valign="top"> 
  -    <td>JSP-Servlet-JSP </td>
  -    <td width="30%" valign="top"><a href="jsptoserv/jsptoservlet.jsp"><img src="../images/execute.gif" hspace="4" border="0" align="top"></a><a href="jsptoserv/jsptoservlet.jsp">Execute</a></td>
  -    <td width="30%"><a href="jsptoserv/jts.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top"></a><a href="jsptoserv/jts.html">Source</a></td>
  -  </tr>
  -
  -  <tr valign="top"> 
  -    <td>Simple custom tag example</td>
  -    <td width="30%" valign="top"><a href="simpletag/foo.jsp"><img src="../images/execute.gif" hspace="4" border="0" align="top"></a><a href="simpletag/foo.jsp">Execute</a></td>
  -    <td width="30%"><a href="simpletag/foo.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top"></a><a href="simpletag/foo.html">Source</a></td>
  -  </tr>
  +
  +<p>Tip: For session scoped beans to work, the cookies must be enabled.
  +This can be done using browser options.
  +<br>&nbsp;
  +<table BORDER=0 CELLSPACING=5 WIDTH="85%" >
  +<tr VALIGN=TOP>
  +<td>Numberguess&nbsp;</td>
  +
  +<td VALIGN=TOP WIDTH="30%"><a href="num/numguess.jsp"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="num/numguess.jsp">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="num/numguess.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="num/numguess.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>Date&nbsp;</td>
  +
  +<td VALIGN=TOP WIDTH="30%"><a href="dates/date.jsp"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="dates/date.jsp">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="dates/date.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="dates/date.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>Snoop</td>
  +
  +<td WIDTH="30%"><a href="snp/snoop.jsp"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="snp/snoop.jsp">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="snp/snoop.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="snp/snoop.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>ErrorPage&nbsp;</td>
  +
  +<td WIDTH="30%"><a href="error/error.html"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="error/error.html">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="error/er.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="error/er.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>Carts&nbsp;</td>
  +
  +<td VALIGN=TOP WIDTH="30%"><a href="sessions/carts.html"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="sessions/carts.html">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="sessions/crt.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="sessions/crt.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>Checkbox&nbsp;</td>
   
  -  <tr valign="top"> 
  +<td VALIGN=TOP WIDTH="30%"><a href="/checkbox/check.html"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="checkbox/check.html">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="colors/cresult.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="checkbox/cresult.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>Color&nbsp;</td>
  +
  +<td VALIGN=TOP WIDTH="30%"><a href="/colors/colors.html"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="colors/colors.html">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="colors/clr.html.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="colors/clr.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>Calendar&nbsp;</td>
  +
  +<td WIDTH="30%"><a href="cal/login.html"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="cal/login.html">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="cal/calendar.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="cal/calendar.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>Include&nbsp;</td>
  +
  +<td VALIGN=TOP WIDTH="30%"><a href="/include/include.jsp"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="include/include.jsp">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="include/inc.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="include/inc.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>Forward&nbsp;</td>
  +
  +<td VALIGN=TOP WIDTH="30%"><a href="forward/forward.jsp"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="forward/forward.jsp">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="forward/fwd.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="forward/fwd.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>Plugin&nbsp;</td>
  +
  +<td VALIGN=TOP WIDTH="30%"><a href="plugin/plugin.jsp"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="plugin/plugin.jsp">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="plugin/plugin.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="plugin/plugin.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>JSP-Servlet-JSP&nbsp;</td>
  +
  +<td VALIGN=TOP WIDTH="30%"><a href="jsptoserv/jsptoservlet.jsp"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="jsptoserv/jsptoservlet.jsp">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="jsptoserv/jts.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="jsptoserv/jts.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>Simple custom tag example</td>
  +
  +<td VALIGN=TOP WIDTH="30%"><a href="simpletag/foo.jsp"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="simpletag/foo.jsp">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="simpletag/foo.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="simpletag/foo.html">Source</a></td>
  +</tr>
   </table>
  +
   </body>
   </html>
  
  
  
  1.2       +18 -0     jakarta-tomcat/src/examples/jsp/simpletag/foo.html
  
  
  
  
  1.2       +26 -0     jakarta-tomcat/src/examples/jsp/simpletag/foo.txt
  
  
  
  
  1.2       +97 -70    jakarta-tomcat/src/examples/servlets/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/examples/servlets/index.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.html	1999/10/09 00:20:25	1.1
  +++ index.html	1999/11/08 03:13:36	1.2
  @@ -1,78 +1,105 @@
  +<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
   <html>
   <head>
  -<title>Untitled Document</title>
  -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  +   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  +   <meta name="GENERATOR" content="Mozilla/4.61 [en] (WinNT; I) [Netscape]">
  +   <meta name="Author" content="Anil K. Vijendran">
  +   <title>Servlet Examples</title>
   </head>
  -
   <body bgcolor="#FFFFFF">
  -<p><font face="Arial, Helvetica, sans-serif"><b><font size="+2">Servlet Examples 
  -  with Code</font></b></font><br>
  -</p>
  -<p>This is a collection of examples which demonstrate some of the more frequently 
  -  used parts of the Servlet API. Familiarity with the Java(tm) Programming Language 
  -  is assumed. </p>
  -
  +<b><font face="Arial, Helvetica, sans-serif"><font size=+2>Servlet
  +Examples with Code</font></font></b>
  +<p>This is a collection of examples which demonstrate some of the more
  +frequently used parts of the Servlet API. Familiarity with the Java(tm)
  +Programming Language is assumed.
   <p>These examples will only work when viewed via an http URL. They will
  -not work if you are viewing these pages via a &quot;file://...&quot; URL.
  -Please refer to the <em>README</em> file provide with this JSWDK release
  -regarding how to configure and start the provided web server.</p>
  -
  -<p>Wherever you see a form, enter some data and see how the servlet reacts. When 
  -  playing with the Cookie and Session Examples, jump back to the Headers Example 
  -  to see exactly what your browser is sending the server.</p>
  -<p>To navigate your way through the examples, the following icons will help:</p>
  -<table border="0" width="85%" align="center" cellspacing="5">
  -  <tr valign="top"> 
  -    <td width="30"><img src="../images/execute.gif"></td>
  -    <td>Execute the example</td>
  -  </tr>
  -  <tr valign="top"> 
  -    <td width="30"><img src="../images/code.gif" width="24" height="24"></td>
  -    <td>Look at the source code for the example</td>
  -  </tr>
  -  <tr valign="top"> 
  -    <td width="30"><img src="../images/return.gif" width="24" height="24"></td>
  -    <td>Return to this screen</td>
  -  </tr>
  +not work if you are viewing these pages via a "file://..." URL. Please
  +refer to the <i>README</i> file provide with this Tomcat release regarding
  +how to configure and start the provided web server.
  +<p>Wherever you see a form, enter some data and see how the servlet reacts.
  +When playing with the Cookie and Session Examples, jump back to the Headers
  +Example to see exactly what your browser is sending the server.
  +<p>To navigate your way through the examples, the following icons will
  +help:
  +<br>&nbsp;
  +<table BORDER=0 CELLSPACING=5 WIDTH="85%" >
  +<tr VALIGN=TOP>
  +<td WIDTH="30"><img SRC="../images/execute.gif" ></td>
  +
  +<td>Execute the example</td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td WIDTH="30"><img SRC="../images/code.gif" height=24 width=24></td>
  +
  +<td>Look at the source code for the example</td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td WIDTH="30"><img SRC="../images/return.gif" height=24 width=24></td>
  +
  +<td>Return to this screen</td>
  +</tr>
   </table>
  -<p>Tip: To see the cookie interactions with your browser, try turning on the &quot;notify 
  -  when setting a cookie&quot; option in your browser preferences. This will let 
  -  you see when a session is created and give some feedback when looking at the 
  -  cookie demo.</p>
  -<table border="0" width="85%" align="center" cellspacing="5">
  -  <tr valign="top"> 
  -    <td>Hello World</td>
  -    <td width="30%" valign="top"><a href="../servlet/HelloWorldExample"><img src="../images/execute.gif" hspace="4" border="0" align="top">Execute</a></td>
  -    <td width="30%"><a href="helloworld.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top">Source</a></td>
  -  </tr>
  -  <tr valign="top"> 
  -    <td>Request Info</td>
  -    <td width="30%"><a href="../servlet/RequestInfoExample"><img src="../images/execute.gif" hspace="4" border="0" align="top">Execute</a></td>
  -    <td width="30%"><a href="reqinfo.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top">Source</a></td>
  -  </tr>
  -  <tr valign="top"> 
  -    <td>Request Headers</td>
  -    <td width="30%"><a href="../servlet/RequestHeaderExample"><img src="../images/execute.gif" hspace="4" border="0" align="top">Execute</a></td>
  -    <td width="30%"><a href="reqheaders.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top">Source</a></td>
  -  </tr>
  -  <tr valign="top"> 
  -    <td>Request Parameters</td>
  -    <td width="30%"><a href="../servlet/RequestParamExample"><img src="../images/execute.gif" hspace="4" border="0" align="top">Execute</a></td>
  -    <td width="30%"><a href="reqparams.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top">Source</a></td>
  -  </tr>
  -  <tr valign="top"> 
  -    <td>Cookies</td>
  -    <td width="30%"><a href="../servlet/CookieExample"><img src="../images/execute.gif" hspace="4" border="0" align="top">Execute</a></td>
  -    <td width="30%"><a href="cookies.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top">Source</a></td>
  -  </tr>
  -  <tr valign="top"> 
  -    <td>Sessions</td>
  -    <td width="30%"><a href="../servlet/SessionExample"><img src="../images/execute.gif" hspace="4" border="0" align="top">Execute</a></td>
  -    <td width="30%"><a href="sessions.html"><img src="../images/code.gif" width="24" height="24" hspace="4" border="0" align="top">Source</a></td>
  -  </tr>
  +
  +<p>Tip: To see the cookie interactions with your browser, try turning on
  +the "notify when setting a cookie" option in your browser preferences.
  +This will let you see when a session is created and give some feedback
  +when looking at the cookie demo.
  +<br>&nbsp;
  +<table BORDER=0 CELLSPACING=5 WIDTH="85%" >
  +<tr VALIGN=TOP>
  +<td>Hello World</td>
  +
  +<td VALIGN=TOP WIDTH="30%"><a href="../servlet/HelloWorldExample"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="../servlet/HelloWorldExample">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="helloworld.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="helloworld.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>Request Info</td>
  +
  +<td WIDTH="30%"><a href="../servlet/RequestInfoExample"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="../servlet/RequestInfoExample">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="reqinfo.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="reqinfo.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>Request Headers</td>
  +
  +<td WIDTH="30%"><a href="../servlet/RequestHeaderExample"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="../servlet/RequestHeaderExample">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="reqheaders.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="reqheaders.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>Request Parameters</td>
  +
  +<td WIDTH="30%"><a href="../servlet/RequestParamExample"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="../servlet/RequestParamExample">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="reqparams.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="reqparams.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>Cookies</td>
  +
  +<td WIDTH="30%"><a href="../servlet/CookieExample"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="../servlet/CookieExample">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="cookies.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="cookies.html">Source</a></td>
  +</tr>
  +
  +<tr VALIGN=TOP>
  +<td>Sessions</td>
  +
  +<td WIDTH="30%"><a href="../servlet/SessionExample"><img SRC="../images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="../servlet/SessionExample">Execute</a></td>
  +
  +<td WIDTH="30%"><a href="sessions.html"><img SRC="../images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="sessions.html">Source</a></td>
  +</tr>
   </table>
  -<p>Note: The source code for these examples does not contain all of the source 
  -  code that is actually in the example, only the important sections of code. Code 
  -  not important to understand the example has been removed for clarity.</p>
  -      </body>
  +
  +<p>Note: The source code for these examples does not contain all of the
  +source code that is actually in the example, only the important sections
  +of code. Code not important to understand the example has been removed
  +for clarity.
  +</body>
   </html>
  
  
  
  1.2       +80 -0     jakarta-tomcat/src/share/javax/servlet/jsp/JspTagException.java
  
  
  
  
  1.4       +0 -2      jakarta-tomcat/src/share/javax/servlet/jsp/tagext/BodyTag.java
  
  Index: BodyTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/javax/servlet/jsp/tagext/BodyTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BodyTag.java	1999/11/03 23:42:33	1.3
  +++ BodyTag.java	1999/11/08 03:13:56	1.4
  @@ -1,6 +1,4 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/javax/servlet/jsp/tagext/BodyTag.java,v 1.3 1999/11/03 23:42:33 costin Exp $ $Date: 1999/11/03 23:42:33 $ $Revision: 1.3 $
  - * 
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  
  
  
  1.4       +0 -1      jakarta-tomcat/src/share/javax/servlet/jsp/tagext/BodyTagSupport.java
  
  Index: BodyTagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/javax/servlet/jsp/tagext/BodyTagSupport.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BodyTagSupport.java	1999/11/03 23:42:36	1.3
  +++ BodyTagSupport.java	1999/11/08 03:13:59	1.4
  @@ -1,5 +1,4 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/javax/servlet/jsp/tagext/BodyTagSupport.java,v 1.3 1999/11/03 23:42:36 costin Exp $ $Date: 1999/11/03 23:42:36 $ $Revision: 1.3 $
    * 
    * The Apache Software License, Version 1.1
    *
  
  
  
  1.6       +0 -5      jakarta-tomcat/src/share/javax/servlet/jsp/tagext/TagAttributeInfo.java
  
  Index: TagAttributeInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/javax/servlet/jsp/tagext/TagAttributeInfo.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TagAttributeInfo.java	1999/11/03 23:42:37	1.5
  +++ TagAttributeInfo.java	1999/11/08 03:14:01	1.6
  @@ -1,9 +1,4 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/javax/servlet/jsp/tagext/TagAttributeInfo.java,v 1.5 1999/11/03 23:42:37 costin Exp $
  - * $Revision: 1.5 $
  - * $Date: 1999/11/03 23:42:37 $
  - *
  - * ====================================================================
    * 
    * The Apache Software License, Version 1.1
    *
  
  
  
  1.4       +0 -1      jakarta-tomcat/src/share/javax/servlet/jsp/tagext/TagSupport.java
  
  Index: TagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/javax/servlet/jsp/tagext/TagSupport.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TagSupport.java	1999/11/03 23:42:40	1.3
  +++ TagSupport.java	1999/11/08 03:14:04	1.4
  @@ -1,5 +1,4 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/javax/servlet/jsp/tagext/TagSupport.java,v 1.3 1999/11/03 23:42:40 costin Exp $ $Date: 1999/11/03 23:42:40 $ $Revision: 1.3 $
    * 
    * The Apache Software License, Version 1.1
    *
  
  
  
  1.8       +0 -5      jakarta-tomcat/src/share/org/apache/jasper/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Constants.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Constants.java	1999/11/03 23:42:55	1.7
  +++ Constants.java	1999/11/08 03:14:18	1.8
  @@ -1,9 +1,4 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Constants.java,v 1.7 1999/11/03 23:42:55 costin Exp $
  - * $Revision: 1.7 $
  - * $Date: 1999/11/03 23:42:55 $
  - *
  - * ====================================================================
    * 
    * The Apache Software License, Version 1.1
    *
  
  
  
  1.2       +35 -41    jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanGenerator.java
  
  Index: BeanGenerator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BeanGenerator.java	1999/10/09 00:20:34	1.1
  +++ BeanGenerator.java	1999/11/08 03:14:25	1.2
  @@ -1,10 +1,4 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanGenerator.java,v 1.1 1999/10/09 00:20:34 duncan Exp $
  - * $Revision: 1.1 $
  - * $Date: 1999/10/09 00:20:34 $
  - *
  - * ====================================================================
  - * 
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  @@ -134,49 +128,49 @@
   	    }
   
   	    if (clsname != null && beanName != null) {
  -                String m = Constants.getString("jsp.error.usebean.not.both",
  +		String m = Constants.getString("jsp.error.usebean.not.both",
   					       new Object[] {name});
   		throw new JasperException (m);
  -            }
  -
  +	    }	     
  +	    
   	    // Check if the class exists.
  -	    String className = (clsname == null) ? type : clsname;
  -	    try {
  -		boolean tmp = beanInfo.ClassFound (className);
  -	    } catch (ClassNotFoundException ex) {
  -                String m = Constants.getString(
  -			"jsp.error.usebean.class.notfound", 
  -			 new Object[] { className });
  -		throw new JasperException (m, ex);
  -	    }
  +	    //String className = (clsname == null) ? type : clsname;
  +	    //try {
  +	    //boolean tmp = beanInfo.ClassFound (className);
  +	    //} catch (ClassNotFoundException ex) {
  +	    //  String m = Constants.getString(
  +	    //	"jsp.error.usebean.class.notfound", 
  +	    //	 new Object[] { className });
  +	    //throw new JasperException (m, ex);
  +	    //}
   	    
   	    // Check if beanName exists.
  -	    if (beanName != null) {
  -		try {
  -		  boolean  tmp = beanInfo.beanFound (beanName);
  -		} catch (ClassNotFoundException ex) {
  -                    String m = Constants.getString(
  -		    		"jsp.error.usebean.class.notfound", 
  -				new Object[] { beanName });
  -		    throw new JasperException (m, ex);
  -		} 
  -	    }
  +	    //if (beanName != null) {
  +	    //try {
  +	    //  boolean  tmp = beanInfo.beanFound (beanName);
  +	    //} catch (ClassNotFoundException ex) {
  +	    //      String m = Constants.getString(
  +	    //    		"jsp.error.usebean.class.notfound", 
  +	    //		new Object[] { beanName });
  +	    //    throw new JasperException (m, ex);
  +	    //} 
  +	    //}
   	    
   	    // class must be assignable to type.
  -	    if (clsname != null && type != null) {
  -		try {
  -		    Class tp = beanInfo.getClass (type);
  -		    Class cl = beanInfo.getClass (clsname);
  -		    if (!tp.isAssignableFrom(cl)) {
  -                        String m = Constants.getString("jsp.error.usebean.bad.type.cast",
  -						       new Object[] {name, type, clsname});
  -			throw new JasperException (m);
  -                    }
  +	    //if (clsname != null && type != null) {
  +	    //try {
  +	    //    Class tp = beanInfo.getClass (type);
  +	    //    Class cl = beanInfo.getClass (clsname);
  +	    //    if (!tp.isAssignableFrom(cl)) {
  +	    //          String m = Constants.getString("jsp.error.usebean.bad.type.cast",
  +	    //				       new Object[] {name, type, clsname});
  +	    //	throw new JasperException (m);
  +	    //      }
                       
  -		} catch (ClassNotFoundException ex) {
  -		    throw new JasperException (ex);
  -		}
  -	    }
  +	    //} catch (ClassNotFoundException ex) {
  +	    //    throw new JasperException (ex);
  +	    //}
  +	    //}
   
   	    if (clsname == null) clsname = type;
   	    if (scope == null || scope.equals("page")) {
  
  
  
  1.2       +7 -7      jakarta-tomcat/src/share/org/apache/jasper/compiler/JspCompiler.java
  
  Index: JspCompiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspCompiler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JspCompiler.java	1999/10/09 00:20:36	1.1
  +++ JspCompiler.java	1999/11/08 03:14:26	1.2
  @@ -1,9 +1,4 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspCompiler.java,v 1.1 1999/10/09 00:20:36 duncan Exp $
  - * $Revision: 1.1 $
  - * $Date: 1999/10/09 00:20:36 $
  - *
  - * ====================================================================
    * 
    * The Apache Software License, Version 1.1
    *
  @@ -209,8 +204,13 @@
       }
       
       private final String getBaseClassName() {
  -	String className
  -	    = jsp.getName().substring(0, jsp.getName().length() - 4);
  +	String className;
  +        
  +        if (jsp.getName().endsWith(".jsp"))
  +            className = jsp.getName().substring(0, jsp.getName().length() - 4);
  +        else
  +            className = jsp.getName();
  +            
   	
   	// Fix for invalid characters. If you think of more add to the list.
   	StringBuffer modifiedClassName = new StringBuffer();
  
  
  
  1.3       +0 -6      jakarta-tomcat/src/share/org/apache/jasper/compiler/JspReader.java
  
  Index: JspReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspReader.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JspReader.java	1999/11/03 23:43:06	1.2
  +++ JspReader.java	1999/11/08 03:14:27	1.3
  @@ -1,10 +1,4 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspReader.java,v 1.2 1999/11/03 23:43:06 costin Exp $
  - * $Revision: 1.2 $
  - * $Date: 1999/11/03 23:43:06 $
  - *
  - * ====================================================================
  - * 
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  
  
  
  1.6       +0 -6      jakarta-tomcat/src/share/org/apache/jasper/compiler/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Parser.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Parser.java	1999/11/03 23:43:10	1.5
  +++ Parser.java	1999/11/08 03:14:27	1.6
  @@ -1,10 +1,4 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Parser.java,v 1.5 1999/11/03 23:43:10 costin Exp $
  - * $Revision: 1.5 $
  - * $Date: 1999/11/03 23:43:10 $
  - *
  - * ====================================================================
  - * 
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  
  
  
  1.3       +0 -6      jakarta-tomcat/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java
  
  Index: SetPropertyGenerator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SetPropertyGenerator.java	1999/11/03 23:43:12	1.2
  +++ SetPropertyGenerator.java	1999/11/08 03:14:28	1.3
  @@ -1,10 +1,4 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java,v 1.2 1999/11/03 23:43:12 costin Exp $
  - * $Revision: 1.2 $
  - * $Date: 1999/11/03 23:43:12 $
  - *
  - * ====================================================================
  - * 
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  
  
  
  1.7       +0 -5      jakarta-tomcat/src/share/org/apache/jasper/compiler/TagBeginGenerator.java
  
  Index: TagBeginGenerator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagBeginGenerator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TagBeginGenerator.java	1999/11/03 23:43:16	1.6
  +++ TagBeginGenerator.java	1999/11/08 03:14:29	1.7
  @@ -1,9 +1,4 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagBeginGenerator.java,v 1.6 1999/11/03 23:43:16 costin Exp $
  - * $Revision: 1.6 $
  - * $Date: 1999/11/03 23:43:16 $
  - *
  - * ====================================================================
    * 
    * The Apache Software License, Version 1.1
    *
  
  
  
  1.5       +0 -6      jakarta-tomcat/src/share/org/apache/jasper/compiler/TagEndGenerator.java
  
  Index: TagEndGenerator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagEndGenerator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TagEndGenerator.java	1999/11/03 23:43:18	1.4
  +++ TagEndGenerator.java	1999/11/08 03:14:31	1.5
  @@ -1,10 +1,4 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagEndGenerator.java,v 1.4 1999/11/03 23:43:18 costin Exp $
  - * $Revision: 1.4 $
  - * $Date: 1999/11/03 23:43:18 $
  - *
  - * ====================================================================
  - * 
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  
  
  
  1.4       +0 -6      jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraries.java
  
  Index: TagLibraries.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraries.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TagLibraries.java	1999/11/03 23:43:21	1.3
  +++ TagLibraries.java	1999/11/08 03:14:31	1.4
  @@ -1,10 +1,4 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraries.java,v 1.3 1999/11/03 23:43:21 costin Exp $
  - * $Revision: 1.3 $
  - * $Date: 1999/11/03 23:43:21 $
  - *
  - * ====================================================================
  - * 
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  
  
  
  1.7       +0 -6      jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
  
  Index: TagLibraryInfoImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TagLibraryInfoImpl.java	1999/11/03 23:43:24	1.6
  +++ TagLibraryInfoImpl.java	1999/11/08 03:14:33	1.7
  @@ -1,10 +1,4 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v 1.6 1999/11/03 23:43:24 costin Exp $
  - * $Revision: 1.6 $
  - * $Date: 1999/11/03 23:43:24 $
  - *
  - * ====================================================================
  - * 
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  
  
  
  1.4       +0 -5      jakarta-tomcat/src/share/org/apache/jasper/runtime/BodyContentImpl.java
  
  Index: BodyContentImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/BodyContentImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BodyContentImpl.java	1999/11/03 23:43:49	1.3
  +++ BodyContentImpl.java	1999/11/08 03:14:42	1.4
  @@ -1,9 +1,4 @@
   /*
  - * $Id: BodyContentImpl.java,v 1.3 1999/11/03 23:43:49 costin Exp $
  - * $Revision: 1.3 $
  - * $Date: 1999/11/03 23:43:49 $
  - *
  - * ====================================================================
    * 
    * The Apache Software License, Version 1.1
    *
  
  
  
  1.9       +1 -6      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JspServlet.java	1999/11/04 01:39:39	1.8
  +++ JspServlet.java	1999/11/08 03:14:42	1.9
  @@ -1,9 +1,4 @@
   /*
  - * $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 $
  - *
  - * ====================================================================
    * 
    * The Apache Software License, Version 1.1
    *
  @@ -335,7 +330,7 @@
                   System.err.println("\t     ServletPath: "+request.getServletPath());
                   System.err.println("\t        PathInfo: "+request.getPathInfo());
   		System.err.println("\t        RealPath: "
  -                                   +getServletConfig().getServletContext().getRealPath(request.getRequestURI()));
  +                                   +getServletConfig().getServletContext().getRealPath(jspUri));
                   System.err.println("\t      RequestURI: "+request.getRequestURI());
                   System.err.println("\t     QueryString: "+request.getQueryString());
                   System.err.println("\t  Request Params: ");
  
  
  

Mime
View raw message