Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 89674 invoked from network); 1 Feb 2002 21:54:55 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 1 Feb 2002 21:54:55 -0000 Received: (qmail 6217 invoked by uid 97); 1 Feb 2002 21:54:44 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 6147 invoked by uid 97); 1 Feb 2002 21:54:44 -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 6083 invoked by uid 97); 1 Feb 2002 21:54:43 -0000 Date: 1 Feb 2002 21:54:21 -0000 Message-ID: <20020201215421.28241.qmail@icarus.apache.org> From: kinman@apache.org To: jakarta-tomcat-4.0-cvs@apache.org Subject: cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper CommandLineContext.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N kinman 02/02/01 13:54:21 Modified: jasper/src/share/org/apache/jasper CommandLineContext.java Log: PR: 5471 Submitted by: steve.downey@netfolio.com (Steve Downey) Revision Changes Path 1.8 +28 -4 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java Index: CommandLineContext.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- CommandLineContext.java 10 Dec 2001 17:43:16 -0000 1.7 +++ CommandLineContext.java 1 Feb 2002 21:54:21 -0000 1.8 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java,v 1.7 2001/12/10 17:43:16 kinman Exp $ - * $Revision: 1.7 $ - * $Date: 2001/12/10 17:43:16 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java,v 1.8 2002/02/01 21:54:21 kinman Exp $ + * $Revision: 1.8 $ + * $Date: 2002/02/01 21:54:21 $ * * ==================================================================== * @@ -216,7 +216,31 @@ * The package name for the generated class. */ public String getServletPackageName() { - return servletPackageName; + //get the path to the jsp file + int indexOfSlash = getJspFile().lastIndexOf('/'); + String pathName; + if (indexOfSlash != -1) { + pathName = getJspFile().substring(0, indexOfSlash); + } else { + pathName = "/"; + } + //Assemble the package name from the base package name speced on + //the command line and the package name derived from the path to + //the jsp file + String packageName = ""; + if (servletPackageName != null && !servletPackageName.equals("")) { + packageName = servletPackageName; + } + if (packageName.equals("")) { + packageName = pathName.replace('/', '.'); + } else { + packageName += pathName.replace('/', '.'); + } + //strip off any leading '.' in the package name + if (!packageName.equals("") && packageName.charAt(0) == '.') { + packageName = packageName.substring(1); + } + return packageName; } /** -- To unsubscribe, e-mail: For additional commands, e-mail: