Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 31124 invoked by uid 500); 11 Aug 2001 02:55:13 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: tomcat-dev@jakarta.apache.org Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 31115 invoked by uid 500); 11 Aug 2001 02:55:13 -0000 Delivered-To: apmail-jakarta-tomcat-cvs@apache.org Date: 11 Aug 2001 02:52:45 -0000 Message-ID: <20010811025245.69110.qmail@icarus.apache.org> From: larryi@apache.org To: jakarta-tomcat-cvs@apache.org Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/io FileUtil.java X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N larryi 01/08/10 19:52:45 Modified: src/share/org/apache/tomcat/util/io FileUtil.java Log: Move getConfigFile() to FileUtil to support reuse Revision Changes Path 1.5 +23 -3 jakarta-tomcat/src/share/org/apache/tomcat/util/io/FileUtil.java Index: FileUtil.java =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/io/FileUtil.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- FileUtil.java 2001/04/22 05:38:17 1.4 +++ FileUtil.java 2001/08/11 02:52:45 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/io/FileUtil.java,v 1.4 2001/04/22 05:38:17 costin Exp $ - * $Revision: 1.4 $ - * $Date: 2001/04/22 05:38:17 $ + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/io/FileUtil.java,v 1.5 2001/08/11 02:52:45 larryi Exp $ + * $Revision: 1.5 $ + * $Date: 2001/08/11 02:52:45 $ * * ==================================================================== * @@ -432,5 +432,25 @@ } + public static File getConfigFile( File base, File configDir, String defaultF ) + { + if( base==null ) + base=new File( defaultF ); + if( ! base.isAbsolute() ) { + if( configDir != null ) + base=new File( configDir, base.getPath()); + else + base=new File( base.getAbsolutePath()); //?? + } + File parent=new File(base.getParent()); + if(!parent.exists()){ + if(!parent.mkdirs()){ + throw new RuntimeException( + "Unable to create path to config file :"+ + base.getAbsolutePath()); + } + } + return base; + } }