Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 23:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Making the list of struts config files configurable

Browse Source 
WW-1456


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@450297 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald J. Brown
2006-09-27 03:19:54 +00:00
parent dbbc1cd9cf
commit 32207e8b65
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/StrutsConstants.java
+3
View File
@@ -127,4 +127,7 @@ public final class StrutsConstants {
/** Allows one to disable dynamic method invocation from the URL */
public static final String STRUTS_ENABLE_DYNAMIC_METHOD_INVOCATION = "struts.enable.DynamicMethodInvocation";
/** A list of configuration files automatically loaded by Struts */
public static final String STRUTS_CONFIGURATION_FILES = "struts.configuration.files";
}
core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+12 -6
View File
@@ -251,12 +251,18 @@ public class Dispatcher {
}
configurationManager = new ConfigurationManager();
// Load old xwork files
configurationManager.addConfigurationProvider(new XmlConfigurationProvider("xwork.xml", false));
// Load Struts config files
configurationManager.addConfigurationProvider(new StrutsXmlConfigurationProvider(false));
String configFiles = Settings.get(StrutsConstants.STRUTS_CONFIGURATION_FILES);
if (configFiles == null) {
configFiles = "struts-default.xml,struts-plugins.xml,struts.xml";
}
String[] files = configFiles.split("\\s*[,]\\s*");
for (String file : files) {
if ("xwork.xml".equals(file)) {
configurationManager.addConfigurationProvider(new XmlConfigurationProvider(file, false));
} else {
configurationManager.addConfigurationProvider(new StrutsXmlConfigurationProvider(file, false));
}
}
synchronized(Dispatcher.class) {
if (dispatcherListeners.size() > 0) {