You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2006/10/10 20:06:02 UTC
svn commit: r454856 - in /struts/struts2/trunk/core/src:
main/java/org/apache/struts2/dispatcher/Dispatcher.java
test/java/org/apache/struts2/config/SettingsTest.java
Author: mrdon
Date: Tue Oct 10 11:06:01 2006
New Revision: 454856
URL: http://svn.apache.org/viewvc?view=rev&rev=454856
Log:
Fixed loading of config files
WW-1453
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?view=diff&rev=454856&r1=454855&r2=454856
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java Tue Oct 10 11:06:01 2006
@@ -253,16 +253,19 @@
}
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) {
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java?view=diff&rev=454856&r1=454855&r2=454856
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java Tue Oct 10 11:06:01 2006
@@ -45,7 +45,7 @@
assertEquals("de", locale.getLanguage());
int count = getKeyCount();
- assertEquals(30, count);
+ assertEquals(31, count);
}
public void testDefaultResourceBundlesLoaded() {
Re: svn commit: r454856 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/dispatcher/Dispatcher.java
test/java/org/apache/struts2/config/SettingsTest.java
Posted by "David H. DeWolf" <dd...@apache.org>.
Now that's quick service :)
Thanks Don!
mrdon@apache.org wrote:
> Author: mrdon
> Date: Tue Oct 10 11:06:01 2006
> New Revision: 454856
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=454856
> Log:
> Fixed loading of config files
> WW-1453
>
> Modified:
> struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
> struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java
>
> Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?view=diff&rev=454856&r1=454855&r2=454856
> ==============================================================================
> --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java (original)
> +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java Tue Oct 10 11:06:01 2006
> @@ -253,16 +253,19 @@
> }
>
> 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) {
>
> Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java
> URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java?view=diff&rev=454856&r1=454855&r2=454856
> ==============================================================================
> --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java (original)
> +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/SettingsTest.java Tue Oct 10 11:06:01 2006
> @@ -45,7 +45,7 @@
> assertEquals("de", locale.getLanguage());
>
> int count = getKeyCount();
> - assertEquals(30, count);
> + assertEquals(31, count);
> }
>
> public void testDefaultResourceBundlesLoaded() {
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org