svn commit: r428677 - /forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java

[rgardler]

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);
     }
 
     /**