forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r355564 - /forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java
Date Fri, 09 Dec 2005 18:30:50 GMT
Author: rgardler
Date: Fri Dec  9 10:30:38 2005
New Revision: 355564

URL: http://svn.apache.org/viewcvs?rev=355564&view=rev
Log:
allow forrest to provide default properties in default.forrest.properties.xml (FOR-588)

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/viewcvs/forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java?rev=355564&r1=355563&r2=355564&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java Fri Dec  9 10:30:38
2005
@@ -130,7 +130,7 @@
         
         String forrestPropertiesStringURI;
         
-        // get the values from properties.xml
+        // get the values from forrest.properties.xml
         try {
           forrestPropertiesStringURI = projectHome
                         + SystemUtils.FILE_SEPARATOR + "forrest.properties.xml";
@@ -142,6 +142,20 @@
                 debug("Unable to find forrest.properties.xml, ignoring.");
         }
 
+        // FIXME (FOR-759): get the values from forrest.properties.xml
+
+        // get the values from default.forrest.properties.xml
+        try {
+          forrestPropertiesStringURI = contextHome
+                        + SystemUtils.FILE_SEPARATOR + "default.forrest.properties.xml";
+
+          filteringProperties = loadXMLPropertiesFromURI(filteringProperties,
+            forrestPropertiesStringURI);
+        } catch (FileNotFoundException e) {
+            if (debugging())
+                debug("Unable to find default.forrest.properties.xml, ignoring.");
+        }
+        
         // get forrest.properties and load the values
         forrestPropertiesStringURI = projectHome
                         + SystemUtils.FILE_SEPARATOR + "forrest.properties";



Mime
View raw message