Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 019C79E1C for ; Mon, 5 Mar 2012 20:20:24 +0000 (UTC) Received: (qmail 27008 invoked by uid 500); 5 Mar 2012 20:20:24 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 26928 invoked by uid 500); 5 Mar 2012 20:20:24 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 26918 invoked by uid 99); 5 Mar 2012 20:20:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Mar 2012 20:20:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Mar 2012 20:20:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0DF372388860 for ; Mon, 5 Mar 2012 20:20:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1297213 - /tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java Date: Mon, 05 Mar 2012 20:20:00 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120305202001.0DF372388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Mon Mar 5 20:20:00 2012 New Revision: 1297213 URL: http://svn.apache.org/viewvc?rev=1297213&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52725 Use constant rather than hard-coded package name since package name is meant to be configurable. Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java?rev=1297213&r1=1297212&r2=1297213&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java Mon Mar 5 20:20:00 2012 @@ -26,6 +26,7 @@ import java.util.Vector; import java.util.jar.JarFile; import java.util.zip.ZipEntry; +import org.apache.jasper.Constants; import org.apache.jasper.JasperException; import org.apache.jasper.JspCompilationContext; import org.xml.sax.Attributes; @@ -738,7 +739,7 @@ public class JspUtil { index = path.indexOf(WEB_INF_TAGS); if (index != -1) { - className = "org.apache.jsp.tag.web."; + className = Constants.TAG_FILE_PACKAGE_NAME + ".web"; begin = index + WEB_INF_TAGS.length(); } else { index = path.indexOf(META_INF_TAGS); @@ -756,7 +757,8 @@ public class JspUtil { } private static String getClassNameBase(String urn) { - StringBuilder base = new StringBuilder("org.apache.jsp.tag.meta."); + StringBuilder base = + new StringBuilder(Constants.TAG_FILE_PACKAGE_NAME + ".meta."); if (urn != null) { base.append(makeJavaPackage(urn)); base.append('.'); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org