From svn-return-6013-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org Fri Aug 04 09:44:46 2006 Return-Path: Delivered-To: apmail-forrest-svn-archive@www.apache.org Received: (qmail 91189 invoked from network); 4 Aug 2006 09:44:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Aug 2006 09:44:46 -0000 Received: (qmail 28771 invoked by uid 500); 4 Aug 2006 09:44:45 -0000 Delivered-To: apmail-forrest-svn-archive@forrest.apache.org Received: (qmail 28703 invoked by uid 500); 4 Aug 2006 09:44:45 -0000 Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Forrest Developers List" List-Id: Delivered-To: mailing list svn@forrest.apache.org Received: (qmail 28692 invoked by uid 99); 4 Aug 2006 09:44:45 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Aug 2006 02:44:45 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Aug 2006 02:44:44 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id BC1BB1A981A; Fri, 4 Aug 2006 02:44:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r428677 - /forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java Date: Fri, 04 Aug 2006 09:44:24 -0000 To: svn@forrest.apache.org From: rgardler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060804094424.BC1BB1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rgardler Date: Fri Aug 4 02:44:24 2006 New Revision: 428677 URL: http://svn.apache.org/viewvc?rev=428677&view=rev Log: add a guard around the loading of forrest.properties file. That file is no longer required Modified: forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java Modified: forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java URL: http://svn.apache.org/viewvc/forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java?rev=428677&r1=428676&r2=428677&view=diff ============================================================================== --- forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java (original) +++ forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java Fri Aug 4 02:44:24 2006 @@ -166,16 +166,19 @@ } // get forrest.properties and load the values - forrestPropertiesStringURI = projectHome + SystemUtils.FILE_SEPARATOR - + "forrest.properties"; - - filteringProperties = loadAntPropertiesFromURI(filteringProperties, + try { + forrestPropertiesStringURI = projectHome + SystemUtils.FILE_SEPARATOR + + "forrest.properties"; + filteringProperties = loadAntPropertiesFromURI(filteringProperties, forrestPropertiesStringURI); + } catch (FileNotFoundException e) { + if (debugging()) + debug("Unable to find forrest.properties, using defaults."); + } // get default-forrest.properties and load the values String defaultForrestPropertiesStringURI = contextHome + SystemUtils.FILE_SEPARATOR + "default-forrest.properties"; - filteringProperties = loadAntPropertiesFromURI(filteringProperties, defaultForrestPropertiesStringURI); @@ -201,7 +204,7 @@ loadSystemProperties(filteringProperties); ForrestConfUtils.aliasSkinProperties(filteringProperties); if (debugging()) - debug("Loaded project forrest.properties:" + filteringProperties); + debug("Loaded project properties:" + filteringProperties); } /**