forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r355632 - /forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java
Date Fri, 09 Dec 2005 23:06:47 GMT
Author: rgardler
Date: Fri Dec  9 15:06:42 2005
New Revision: 355632

URL: http://svn.apache.org/viewcvs?rev=355632&view=rev
Log:
no need to rely on the existence of forrest.properties.xml to define plugins (fixes FOR-760,
partial fix for FOR-739)

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=355632&r1=355631&r2=355632&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 15:06:42
2005
@@ -145,29 +145,6 @@
 				debug("Unable to find forrest.properties.xml, ignoring.");
 		}
 
-		// if project.required.plugins is curently set, we can load plugin
-		// defaults as we are using the new forrest.properties.xml config system
-		String strPluginList = filteringProperties
-				.getProperty("project.required.plugins");
-		if (strPluginList != null) {
-			StringTokenizer st = new StringTokenizer(strPluginList, ",");
-			while (st.hasMoreTokens()) {
-				forrestPropertiesStringURI = ForrestConfUtils.getPluginDir(st
-						.nextToken().trim());
-				try {
-					forrestPropertiesStringURI = forrestPropertiesStringURI
-							+ SystemUtils.FILE_SEPARATOR
-							+ "default.plugin.properties.xml";
-					filteringProperties = loadXMLPropertiesFromURI(
-							filteringProperties, forrestPropertiesStringURI);
-				} catch (FileNotFoundException e) {
-					if (debugging())
-						debug("Unable to load " + forrestPropertiesStringURI
-								+ ", ignoring. " + e.getMessage());
-				}
-			}
-		}
-
 		// get the values from default.forrest.properties.xml
 		try {
 			forrestPropertiesStringURI = contextHome
@@ -194,6 +171,28 @@
 
 		filteringProperties = loadAntPropertiesFromURI(filteringProperties,
 				defaultForrestPropertiesStringURI);
+
+		// Load plugin default properties
+		String strPluginList = filteringProperties
+				.getProperty("project.required.plugins");
+		if (strPluginList != null) {
+			StringTokenizer st = new StringTokenizer(strPluginList, ",");
+			while (st.hasMoreTokens()) {
+				forrestPropertiesStringURI = ForrestConfUtils.getPluginDir(st
+						.nextToken().trim());
+				try {
+					forrestPropertiesStringURI = forrestPropertiesStringURI
+							+ SystemUtils.FILE_SEPARATOR
+							+ "default.plugin.properties.xml";
+					filteringProperties = loadXMLPropertiesFromURI(
+							filteringProperties, forrestPropertiesStringURI);
+				} catch (FileNotFoundException e) {
+					if (debugging())
+						debug("Unable to load " + forrestPropertiesStringURI
+								+ ", ignoring. " + e.getMessage());
+				}
+			}
+		}
 
 		loadSystemProperties(filteringProperties);
 		ForrestConfUtils.aliasSkinProperties(filteringProperties);



Mime
View raw message