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

Fixed loading of config files

Browse Source 
WW-1453


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@454856 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald J. Brown
2006-10-10 18:06:01 +00:00
parent 174191c5c0
commit 4a7c9de9d5
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+10 -7
View File
@@ -253,16 +253,19 @@ public class Dispatcher {
}
configurationManager = new ConfigurationManager();
String configFiles = null;
if (Settings.isSet(StrutsConstants.STRUTS_CONFIGURATION_FILES)) {
configFiles = Settings.get(StrutsConstants.STRUTS_CONFIGURATION_FILES);
}
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));
}
if (configFiles != null) {
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) {
core/src/test/java/org/apache/struts2/config/SettingsTest.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class SettingsTest extends StrutsTestCase {
assertEquals("de", locale.getLanguage());
int count = getKeyCount();
assertEquals(30, count);
assertEquals(31, count);
}
public void testDefaultResourceBundlesLoaded() {