Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 40608 invoked from network); 2 Sep 2010 15:04:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Sep 2010 15:04:33 -0000 Received: (qmail 55066 invoked by uid 500); 2 Sep 2010 15:04:32 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 54678 invoked by uid 500); 2 Sep 2010 15:04:30 -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 54669 invoked by uid 99); 2 Sep 2010 15:04:29 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Sep 2010 15:04:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 02 Sep 2010 15:04:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ED1E323888FD; Thu, 2 Sep 2010 15:02:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991965 - in /tomcat/trunk/java/org/apache/catalina: core/StandardEngine.java startup/ContextConfig.java Date: Thu, 02 Sep 2010 15:02:52 -0000 To: dev@tomcat.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100902150252.ED1E323888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Thu Sep 2 15:02:52 2010 New Revision: 991965 URL: http://svn.apache.org/viewvc?rev=991965&view=rev Log: Followup to r991959. Forgot the two classes. Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=991965&r1=991964&r2=991965&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Thu Sep 2 15:02:52 2010 @@ -22,6 +22,7 @@ import org.apache.catalina.AccessLog; import org.apache.catalina.Container; import org.apache.catalina.Context; import org.apache.catalina.Engine; +import org.apache.catalina.Globals; import org.apache.catalina.Host; import org.apache.catalina.LifecycleException; import org.apache.catalina.Realm; @@ -198,10 +199,10 @@ public class StandardEngine extends Cont public String getBaseDir() { if( baseDir==null ) { - baseDir=System.getProperty("catalina.base"); + baseDir=System.getProperty(Globals.CATALINA_BASE_PROP); } if( baseDir==null ) { - baseDir=System.getProperty("catalina.home"); + baseDir=System.getProperty(Globals.CATALINA_HOME_PROP); } return baseDir; } Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=991965&r1=991964&r2=991965&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Sep 2 15:02:52 2010 @@ -530,7 +530,7 @@ public class ContextConfig if( engineC instanceof StandardEngine ) { return ((StandardEngine)engineC).getBaseDir(); } - return System.getProperty("catalina.base"); + return System.getProperty(Globals.CATALINA_BASE_PROP); } @@ -671,7 +671,7 @@ public class ContextConfig canonicalAppBase = canonicalAppBase.getCanonicalFile(); } else { canonicalAppBase = - new File(System.getProperty("catalina.base"), appBase) + new File(System.getProperty(Globals.CATALINA_BASE_PROP), appBase) .getCanonicalFile(); } @@ -778,7 +778,7 @@ public class ContextConfig if (!docBaseFile.isAbsolute()) { File file = new File(appBase); if (!file.isAbsolute()) { - file = new File(System.getProperty("catalina.base"), appBase); + file = new File(System.getProperty(Globals.CATALINA_BASE_PROP), appBase); } docBaseFile = new File(file, docBase); } @@ -1145,7 +1145,7 @@ public class ContextConfig */ protected File getConfigBase() { File configBase = - new File(System.getProperty("catalina.base"), "conf"); + new File(System.getProperty(Globals.CATALINA_BASE_PROP), "conf"); if (!configBase.exists()) { return null; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org