forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r528891 - /forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java
Date Sat, 14 Apr 2007 23:21:50 GMT
Author: thorsten
Date: Sat Apr 14 16:21:49 2007
New Revision: 528891

URL: http://svn.apache.org/viewvc?view=rev&rev=528891
Log:
Moving the load of the forrest.properties from the project to the top. Otherwise the plugin
default properties are not being loaded since the required plugins token is empty. FOR-932

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?view=diff&rev=528891&r1=528890&r2=528891
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java Sat Apr 14 16:21:49
2007
@@ -143,6 +143,12 @@
         String forrestPropertiesStringURI;
 
         try {
+            // get forrest.properties and load the values
+            forrestPropertiesStringURI = projectHome
+                    + SystemUtils.FILE_SEPARATOR + "forrest.properties";
+            filteringProperties = loadAntPropertiesFromURI(filteringProperties,
+                    forrestPropertiesStringURI);
+            
             // get the values from local.forrest.properties.xml
             forrestPropertiesStringURI = projectHome
                     + SystemUtils.FILE_SEPARATOR
@@ -196,11 +202,6 @@
                             filteringProperties, forrestPropertiesStringURI);
                 }
             }
-            // get forrest.properties and load the values
-            forrestPropertiesStringURI = projectHome
-                    + SystemUtils.FILE_SEPARATOR + "forrest.properties";
-            filteringProperties = loadAntPropertiesFromURI(filteringProperties,
-                    forrestPropertiesStringURI);
 
             // get default-forrest.properties and load the values
             String defaultForrestPropertiesStringURI = contextHome



Mime
View raw message