Author: mrdon
Date: Mon Jul 3 16:52:57 2006
New Revision: 418878
URL: http://svn.apache.org/viewvc?rev=418878&view=rev
Log:
Changing dispatcher to load both struts.xml and xwork.xml configuration
files
WW-1370
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java?rev=418878&r1=418877&r2=418878&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java
Mon Jul 3 16:52:57 2006
@@ -32,6 +32,7 @@
import com.opensymphony.xwork.*;
import com.opensymphony.xwork.config.ConfigurationException;
import com.opensymphony.xwork.config.ConfigurationManager;
+import com.opensymphony.xwork.config.providers.XmlConfigurationProvider;
import com.opensymphony.xwork.util.*;
import com.opensymphony.xwork.util.location.Location;
import com.opensymphony.xwork.util.location.LocationUtils;
@@ -213,6 +214,8 @@
}
configurationManager = new ConfigurationManager();
+ configurationManager.addConfigurationProvider(new
XmlConfigurationProvider("xwork.xml", false));
+ configurationManager.addConfigurationProvider(new
XmlConfigurationProvider("struts.xml", false));
synchronized(DispatcherUtils.class) {
if (dispatcherListeners.size() > 0) {
