From 0d27bf064bc531092f4eefed6f263bb675f225d5 Mon Sep 17 00:00:00 2001 From: "Donald J. Brown" Date: Fri, 8 Dec 2006 08:02:55 +0000 Subject: [PATCH] Updating for new initialization of continuations (still broken though) WW-1548 git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@483873 13f79535-47bb-0310-9956-ffa450edef68 --- .../config/LegacyPropertiesConfigurationProvider.java | 7 ++++++- .../java/org/apache/struts2/dispatcher/Dispatcher.java | 6 ------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java index 457046375..f2612c42f 100644 --- a/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java @@ -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 diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java index e80dd8cf5..8cc08ebd8 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java @@ -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) {