Return-Path: <eric_carmichael@hotmail.com>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 29444 invoked from network); 20 Sep 2003 07:45:12 -0000
Received: from unknown (HELO hotmail.com) (64.4.26.118)
  by daedalus.apache.org with SMTP; 20 Sep 2003 07:45:12 -0000
Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC;
	 Sat, 20 Sep 2003 00:45:25 -0700
Received: from 64.203.49.21 by bay8-dav14.bay8.hotmail.com with DAV;
	Sat, 20 Sep 2003 07:45:25 +0000
X-Originating-IP: [64.203.49.21]
X-Originating-Email: [eric_carmichael@hotmail.com]
From: "Eric Carmichael" <ecarmich@alumni.rice.edu>
To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
References: <20030919233809.32878.qmail@minotaur.apache.org>
Subject: Re: cvs commit:
 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler
 Generator.java
Date: Sat, 20 Sep 2003 00:45:21 -0700
MIME-Version: 1.0
Content-Type: multipart/alternative;
	boundary="----=_NextPart_000_125E_01C37F10.78BBBE40"
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2800.1158
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1165
Message-ID: <BAY8-DAV14gRbwri5Dp00002dd3@hotmail.com>
X-OriginalArrivalTime: 20 Sep 2003 07:45:25.0789 (UTC)
 FILETIME=[2776FCD0:01C37F4B]
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

------=_NextPart_000_125E_01C37F10.78BBBE40
Content-Type: text/plain;
	charset="Windows-1252"
Content-Transfer-Encoding: quoted-printable

This SMAPs all declaration nodes, including the ones tacked on to the =
root node by ELFunctionMapper.java.  So for instance the SMAP for =
jsp2/el/functions.jsp from the jsp-examples webapp ends with

43,6:120
1,3:10
1,5:13

thus SMAPping=20

  <%@ taglib prefix=3D"my" =
uri=3D"http://jakarta.apache.org/tomcat/jsp2-example-taglib"%>

to

  static private org.apache.jasper.runtime.ProtectedFunctionMapper =
_jspx_fnmap_0;
  static private org.apache.jasper.runtime.ProtectedFunctionMapper =
_jspx_fnmap_1;

and

  static {
    _jspx_fnmap_0=3D =
org.apache.jasper.runtime.ProtectedFunctionMapper.getMapForFunction("my:r=
everse", jsp2.examples.el.Functions.class, "reverse", new Class[] =
{java.lang.String.class});
    _jspx_fnmap_1=3D =
org.apache.jasper.runtime.ProtectedFunctionMapper.getMapForFunction("my:c=
ountVowels", jsp2.examples.el.Functions.class, "numVowels", new Class[] =
{java.lang.String.class});
  }

which is clearly wrong.

Eric

----- Original Message -----=20
From: <kinman@apache.org>
To: <jakarta-tomcat-jasper-cvs@apache.org>
Sent: Friday, September 19, 2003 4:38 PM
Subject: cvs commit: =
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler =
Generator.java


> kinman      2003/09/19 16:38:09
>=20
>   Modified:    jasper2/src/share/org/apache/jasper/compiler =
Generator.java
>   Log:
>   - Make sure scriptlet declarations get properly mapped.  This fixes =
22833
>  =20
>   Revision  Changes    Path
>   1.211     +7 -6      =
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Genera=
tor.java
>  =20
>   Index: Generator.java
>   =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>   RCS file: =
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compi=
ler/Generator.java,v
>   retrieving revision 1.210
>   retrieving revision 1.211
>   diff -u -r1.210 -r1.211
>   --- Generator.java 19 Sep 2003 18:30:09 -0000 1.210
>   +++ Generator.java 19 Sep 2003 23:38:08 -0000 1.211
>   @@ -196,9 +196,7 @@
>                 */
>                public void visit(Node.PageDirective n) throws =
JasperException {
>   =20
>   -                if (!getServletInfoGenerated) {
>   -                    getServletInfoGenerated =3D true;
>   -                } else {
>   +                if (getServletInfoGenerated) {
>                        return;
>                    }
>   =20
>   @@ -206,6 +204,7 @@
>                    if (info =3D=3D null)
>                        return;
>   =20
>   +                getServletInfoGenerated =3D true;
>                    out.printil("public String getServletInfo() {");
>                    out.pushIndent();
>                    out.printin("return ");
>   @@ -217,8 +216,10 @@
>                }
>   =20
>                public void visit(Node.Declaration n) throws =
JasperException {
>   +                n.setBeginJavaLine(out.getJavaLine());
>                    out.printMultiLn(new String(n.getText()));
>                    out.println();
>   +                n.setEndJavaLine(out.getJavaLine());
>                }
>   =20
>                // Custom Tags may contain declarations from tag =
plugins.
>  =20
>  =20
>  =20
>=20
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
>=20
> 
------=_NextPart_000_125E_01C37F10.78BBBE40--