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

Updating for new initialization of continuations (still broken though)

Browse Source 
WW-1548


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@483873 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald J. Brown
2006-12-08 08:02:55 +00:00
parent de8c649f83
commit 0d27bf064b
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
+6 -1
View File
@@ -68,10 +68,15 @@ public class LegacyPropertiesConfigurationProvider implements ConfigurationProvi
for (Iterator i = settings.list(); i.hasNext(); ) {
String name = (String) i.next();
props.put(name, settings.get(name));
props.setProperty(name, settings.get(name), settings.getLocation(name));
// Convert struts properties into ones that xwork expects
if (StrutsConstants.STRUTS_DEVMODE.equals(name)) {
props.setProperty("devMode", settings.get(name), settings.getLocation(name));
}
if (StrutsConstants.STRUTS_CONTINUATIONS_PACKAGE.equals(name)) {
props.setProperty("continuations.package", settings.get(name), settings.getLocation(name));
}
}
// Set default locale
core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
-6
View File
@@ -370,12 +370,6 @@ public class Dispatcher {
private void init_CheckConfigurationReloading(Container container) {
FileManager.setReloadingConfigs("true".equals(container.getInstance(String.class,
StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD)));
String pkg = container.getInstance(String.class, StrutsConstants.STRUTS_CONTINUATIONS_PACKAGE);
if (pkg != null) {
ObjectFactory.setContinuationPackage(pkg);
}
}
private void init_CheckWebLogicWorkaround(Container container) {