Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 94169 invoked from network); 17 Aug 2004 22:25:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 17 Aug 2004 22:25:43 -0000 Received: (qmail 70395 invoked by uid 500); 17 Aug 2004 22:25:21 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 70260 invoked by uid 500); 17 Aug 2004 22:25:17 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 70209 invoked by uid 500); 17 Aug 2004 22:25:15 -0000 Received: (qmail 70195 invoked by uid 99); 17 Aug 2004 22:25:14 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Tue, 17 Aug 2004 15:25:09 -0700 Received: (qmail 93896 invoked by uid 1135); 17 Aug 2004 22:25:01 -0000 Date: 17 Aug 2004 22:25:01 -0000 Message-ID: <20040817222501.93895.qmail@minotaur.apache.org> From: remm@apache.org To: jakarta-tomcat-jasper-cvs@apache.org Subject: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper JspCompilationContext.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N remm 2004/08/17 15:25:01 Modified: jasper2/src/share/org/apache/jasper JspCompilationContext.java Log: - Fix bad package name when compiling a tag file. Revision Changes Path 1.51 +17 -7 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java Index: JspCompilationContext.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- JspCompilationContext.java 17 Aug 2004 09:05:50 -0000 1.50 +++ JspCompilationContext.java 17 Aug 2004 22:25:01 -0000 1.51 @@ -367,19 +367,29 @@ * derived package name directly mirrors the file heirachy of the JSP page. */ public String getServletPackageName() { - String dPackageName = getDerivedPackageName(); - if (dPackageName.length() == 0) { - return basePackageName; + if (isTagFile()) { + String className = tagInfo.getTagClassName(); + int lastIndex = className.lastIndexOf('.'); + String pkgName = ""; + if (lastIndex != -1) { + pkgName = className.substring(0, lastIndex); + } + return pkgName; + } else { + String dPackageName = getDerivedPackageName(); + if (dPackageName.length() == 0) { + return basePackageName; + } + return basePackageName + '.' + getDerivedPackageName(); } - return basePackageName + '.' + getDerivedPackageName(); } private String getDerivedPackageName() { - if (derivedPackageName == null) { + if (derivedPackageName == null) { int iSep = jspUri.lastIndexOf('/'); derivedPackageName = (iSep > 0) ? - JspUtil.makeJavaPackage(jspUri.substring(1,iSep)) : ""; - } + JspUtil.makeJavaPackage(jspUri.substring(1,iSep)) : ""; + } return derivedPackageName; } --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org