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/12/08 09:02:56 UTC
svn commit: r483873 - in
/struts/struts2/trunk/core/src/main/java/org/apache/struts2:
config/LegacyPropertiesConfigurationProvider.java dispatcher/Dispatcher.java
Author: mrdon
Date: Fri Dec 8 00:02:55 2006
New Revision: 483873
URL: http://svn.apache.org/viewvc?view=rev&rev=483873
Log:
Updating for new initialization of continuations (still broken though)
WW-1548
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java?view=diff&rev=483873&r1=483872&r2=483873
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java Fri Dec 8 00:02:55 2006
@@ -68,9 +68,14 @@
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));
}
}
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=483873&r1=483872&r2=483873
==============================================================================
--- 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 Fri Dec 8 00:02:55 2006
@@ -370,12 +370,6 @@
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) {