Author: lukaszlenart
Date: Thu Jul 5 07:31:14 2012
New Revision: 1357481
URL: http://svn.apache.org/viewvc?rev=1357481&view=rev
Log:
WW-3819 moves inject of reload property directly into FileManager
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
struts/struts2/trunk/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/FileManager.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/ConfigurationManager.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Thu Jul 5 07:31:14 2012
@@ -278,6 +278,7 @@ public class BeanSelectionProvider imple
convertIfExist(props, StrutsConstants.STRUTS_LOG_MISSING_PROPERTIES,
"logMissingProperties");
convertIfExist(props,
StrutsConstants.STRUTS_ENABLE_OGNL_EXPRESSION_CACHE,
"enableOGNLExpressionCache");
convertIfExist(props,
StrutsConstants.STRUTS_ALLOW_STATIC_METHOD_ACCESS, "allowStaticMethodAccess");
+ convertIfExist(props, StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD,
"reloadXmlConfiguration");
LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts2/struts-messages");
loadCustomResourceBundles(props);
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?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
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
Thu Jul 5 07:31:14 2012
@@ -421,12 +421,6 @@ public class Dispatcher {
return container;
}
- private void init_CheckConfigurationReloading(Container container) {
- FileManager fileManager =
container.getInstance(FileManagerFactory.class).getFileManager();
-
fileManager.setReloadingConfigs("true".equals(container.getInstance(String.class,
- StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD)));
- }
-
private void init_CheckWebLogicWorkaround(Container container) {
// test whether param-access workaround needs to be enabled
if (servletContext != null && servletContext.getServerInfo() != null
@@ -462,7 +456,6 @@ public class Dispatcher {
Container container = init_PreloadConfiguration();
container.inject(this);
- init_CheckConfigurationReloading(container);
init_CheckWebLogicWorkaround(container);
if (!dispatcherListeners.isEmpty()) {
Modified:
struts/struts2/trunk/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java
(original)
+++
struts/struts2/trunk/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java
Thu Jul 5 07:31:14 2012
@@ -270,7 +270,7 @@ public class EmbeddedJSPResultTest exten
XWorkConverter converter = new DummyConverter();
DefaultFileManager fileManager = new DefaultFileManager();
- fileManager.setReloadingConfigs(false);
+ fileManager.setReloadingConfigs("false");
//mock container
Container container = EasyMock.createNiceMock(Container.class);
Modified:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
(original)
+++
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
Thu Jul 5 07:31:14 2012
@@ -24,7 +24,6 @@ package org.apache.struts2.portlet.dispa
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ActionProxyFactory;
-import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
@@ -235,12 +234,6 @@ public class Jsr168Dispatcher extends Ge
LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts2/struts-messages");
container = dispatcherUtils.getContainer();
- //check for configuration reloading
- if ("true".equalsIgnoreCase(container.getInstance(String.class,
StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD))) {
- FileManager fileManager = container.getInstance(FileManager.class);
- fileManager.setReloadingConfigs(true);
- }
-
actionMapper = container.getInstance(ActionMapper.class);
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/FileManager.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/FileManager.java?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/FileManager.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/FileManager.java
Thu Jul 5 07:31:14 2012
@@ -10,7 +10,7 @@ import java.util.Collection;
*/
public interface FileManager {
- void setReloadingConfigs(boolean reloadingConfigs);
+ void setReloadingConfigs(String reloadingConfigs);
boolean isReloadingConfigs();
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/ConfigurationManager.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/ConfigurationManager.java?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/ConfigurationManager.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/ConfigurationManager.java
Thu Jul 5 07:31:14 2012
@@ -46,6 +46,7 @@ public class ConfigurationManager {
private List<ContainerProvider> containerProviders = new
CopyOnWriteArrayList<ContainerProvider>();
private List<PackageProvider> packageProviders = new
CopyOnWriteArrayList<PackageProvider>();
protected String defaultFrameworkBeanName;
+ private boolean providersChanged = false;
public ConfigurationManager() {
this("xwork");
@@ -118,6 +119,7 @@ public class ConfigurationManager {
providerLock.lock();
try {
this.containerProviders = new
CopyOnWriteArrayList<ContainerProvider>(containerProviders);
+ providersChanged = true;
} finally {
providerLock.unlock();
}
@@ -132,6 +134,7 @@ public class ConfigurationManager {
public void addContainerProvider(ContainerProvider provider) {
if (!containerProviders.contains(provider)) {
containerProviders.add(provider);
+ providersChanged = true;
}
}
@@ -140,6 +143,7 @@ public class ConfigurationManager {
clearContainerProvider(containerProvider);
}
containerProviders.clear();
+ providersChanged = true;
}
private void clearContainerProvider(ContainerProvider containerProvider) {
@@ -170,7 +174,7 @@ public class ConfigurationManager {
*/
public synchronized void conditionalReload(Container container) {
FileManager fileManager =
container.getInstance(FileManagerFactory.class).getFileManager();
- if (fileManager.isReloadingConfigs()) {
+ if (fileManager.isReloadingConfigs() || providersChanged) {
if (LOG.isDebugEnabled()) {
LOG.debug("Checking ConfigurationProviders for reload.");
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
Thu Jul 5 07:31:14 2012
@@ -300,6 +300,7 @@ public class DefaultConfiguration implem
builder.factory(OgnlUtil.class, Scope.SINGLETON);
builder.constant("devMode", "false");
builder.constant("logMissingProperties", "false");
+ builder.constant("reloadXmlConfiguration", "false");
return builder.create(true);
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java
Thu Jul 5 07:31:14 2012
@@ -57,6 +57,7 @@ public class MockConfiguration implement
LocatableProperties props = new LocatableProperties();
new XWorkConfigurationProvider().register(builder, props);
builder.constant("devMode", "false");
+ builder.constant("reloadXmlConfiguration", "true");
container = builder.create(true);
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
Thu Jul 5 07:31:14 2012
@@ -132,6 +132,7 @@ public class XWorkConfigurationProvider
props.setProperty("devMode", Boolean.FALSE.toString());
props.setProperty("logMissingProperties", Boolean.FALSE.toString());
props.setProperty("enableOGNLExpressionCache",
Boolean.TRUE.toString());
+ props.setProperty("reloadXmlConfiguration", Boolean.FALSE.toString());
}
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java
Thu Jul 5 07:31:14 2012
@@ -16,6 +16,7 @@
package com.opensymphony.xwork2.util.fs;
import com.opensymphony.xwork2.FileManager;
+import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
@@ -43,13 +44,14 @@ public class DefaultFileManager implemen
protected static Map<String, Revision> files =
Collections.synchronizedMap(new HashMap<String, Revision>());
- protected boolean reloadingConfigs = true;
+ protected boolean reloadingConfigs = false;
public DefaultFileManager() {
}
- public void setReloadingConfigs(boolean reloadingConfigs) {
- this.reloadingConfigs = reloadingConfigs;
+ @Inject(value = "reloadXmlConfiguration", required = false)
+ public void setReloadingConfigs(String reloadingConfigs) {
+ this.reloadingConfigs = Boolean.parseBoolean(reloadingConfigs);
}
public boolean isReloadingConfigs() {
Modified:
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java
(original)
+++
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java
Thu Jul 5 07:31:14 2012
@@ -19,7 +19,6 @@ package com.opensymphony.xwork2.config;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.FileManagerFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.config.providers.XWorkConfigurationProvider;
@@ -38,7 +37,6 @@ import java.util.Properties;
public class ConfigurationManagerTest extends XWorkTestCase {
Mock configProviderMock;
- private FileManager fileManager;
private Configuration configuration;
public void testConfigurationReload() {
@@ -49,7 +47,7 @@ public class ConfigurationManagerTest ex
configProviderMock.expect("loadPackages", C.ANY_ARGS);
configProviderMock.expect("destroy", C.ANY_ARGS);
configProviderMock.matchAndReturn("toString", "mock");
-
configuration.getContainer().getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs(true);
+
configuration.getContainer().getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs("true");
configuration = configurationManager.getConfiguration();
configProviderMock.verify();
@@ -58,8 +56,8 @@ public class ConfigurationManagerTest ex
}
public void testNoConfigurationReload() {
+ configProviderMock.expectAndReturn("needsReload", Boolean.FALSE);
// now check that it doesn't try to reload
-
configuration.getContainer().getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs(false);
configuration = configurationManager.getConfiguration();
configProviderMock.verify();
Modified:
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java
(original)
+++
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java
Thu Jul 5 07:31:14 2012
@@ -22,7 +22,6 @@ import com.opensymphony.xwork2.ActionPro
import com.opensymphony.xwork2.SimpleAction;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
import com.opensymphony.xwork2.inject.ContainerBuilder;
@@ -132,7 +131,7 @@ public class ConfigurationTest extends X
ActionProxy proxy =
actionProxyFactory.createActionProxy("/foo/bar",
"TestInterceptorParamInehritanceOverride", null);
assertEquals(1, proxy.getConfig().getInterceptors().size());
- MockInterceptor testInterceptor = (MockInterceptor)
((InterceptorMapping)
proxy.getConfig().getInterceptors().get(0)).getInterceptor();
+ MockInterceptor testInterceptor = (MockInterceptor)
proxy.getConfig().getInterceptors().get(0).getInterceptor();
assertEquals("foo123", testInterceptor.getExpectedFoo());
proxy.execute();
assertTrue(testInterceptor.isExecuted());
@@ -147,7 +146,7 @@ public class ConfigurationTest extends X
ActionProxy proxy =
actionProxyFactory.createActionProxy("/foo/bar",
"TestInterceptorParamInheritance", null);
assertEquals(1, proxy.getConfig().getInterceptors().size());
- MockInterceptor testInterceptor = (MockInterceptor)
((InterceptorMapping)
proxy.getConfig().getInterceptors().get(0)).getInterceptor();
+ MockInterceptor testInterceptor = (MockInterceptor)
proxy.getConfig().getInterceptors().get(0).getInterceptor();
assertEquals("expectedFoo", testInterceptor.getExpectedFoo());
proxy.execute();
assertTrue(testInterceptor.isExecuted());
@@ -162,7 +161,7 @@ public class ConfigurationTest extends X
ActionProxy proxy = actionProxyFactory.createActionProxy("",
"TestInterceptorParamOverride", null);
assertEquals(1, proxy.getConfig().getInterceptors().size());
- MockInterceptor testInterceptor = (MockInterceptor)
((InterceptorMapping)
proxy.getConfig().getInterceptors().get(0)).getInterceptor();
+ MockInterceptor testInterceptor = (MockInterceptor)
proxy.getConfig().getInterceptors().get(0).getInterceptor();
assertEquals("foo123", testInterceptor.getExpectedFoo());
proxy.execute();
assertTrue(testInterceptor.isExecuted());
@@ -177,7 +176,7 @@ public class ConfigurationTest extends X
ActionProxy proxy = actionProxyFactory.createActionProxy("",
"TestInterceptorParam", null);
assertEquals(1, proxy.getConfig().getInterceptors().size());
- MockInterceptor testInterceptor = (MockInterceptor)
((InterceptorMapping)
proxy.getConfig().getInterceptors().get(0)).getInterceptor();
+ MockInterceptor testInterceptor = (MockInterceptor)
proxy.getConfig().getInterceptors().get(0).getInterceptor();
assertEquals("expectedFoo", testInterceptor.getExpectedFoo());
proxy.execute();
assertTrue(testInterceptor.isExecuted());
Modified:
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
(original)
+++
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
Thu Jul 5 07:31:14 2012
@@ -74,11 +74,12 @@ public class XmlConfigurationProviderTes
}
public void testNeedsReload() throws Exception {
-
container.getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs(true);
+
container.getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs("true");
final String filename =
"com/opensymphony/xwork2/config/providers/xwork-test-actions.xml";
ConfigurationProvider provider = buildConfigurationProvider(filename);
+
container.getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs("true");
- assertTrue(!provider.needsReload());
+ assertTrue(!provider.needsReload()); // Revision exists and timestamp
didn't change
File file = new File(getClass().getResource("/" + filename).toURI());
assertTrue("not exists: " + file.toString(), file.exists());
@@ -150,7 +151,7 @@ public class XmlConfigurationProviderTes
public void testEmptySpaces() throws Exception {
final String filename =
"com/opensymphony/xwork2/config/providers/xwork- test.xml";
-
container.getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs(true);
+
container.getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs("true");
ConfigurationProvider provider = buildConfigurationProvider(filename);
assertTrue(!provider.needsReload());
@@ -166,7 +167,7 @@ public class XmlConfigurationProviderTes
}
public void testConfigsInJarFiles() throws Exception {
-
container.getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs(true);
+
container.getInstance(FileManagerFactory.class).getFileManager().setReloadingConfigs("true");
testProvider("xwork-jar.xml");
testProvider("xwork-zip.xml");
testProvider("xwork - jar.xml");
Modified:
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java
(original)
+++
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java
Thu Jul 5 07:31:14 2012
@@ -36,7 +36,7 @@ public class DefaultFileManagerTest exte
}
private void testLoadFile(String fileName) {
- fileManager.setReloadingConfigs(true);
+ fileManager.setReloadingConfigs("true");
URL url = ClassLoaderUtil.getResource(fileName,
DefaultFileManagerTest.class);
InputStream file = fileManager.loadFile(url);
assertNotNull(file);
Modified:
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java
(original)
+++
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java
Thu Jul 5 07:31:14 2012
@@ -97,7 +97,7 @@ class DummyContainer implements Containe
class DummyFileManager implements FileManager {
- public void setReloadingConfigs(boolean reloadingConfigs) {
+ public void setReloadingConfigs(String reloadingConfigs) {
}
public boolean isReloadingConfigs() {
Modified:
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java?rev=1357481&r1=1357480&r2=1357481&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
(original)
+++
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
Thu Jul 5 07:31:14 2012
@@ -103,7 +103,7 @@ public class AnnotationActionValidatorMa
List validatorList =
annotationActionValidatorManager.getValidators(SimpleAnnotationAction.class,
alias, "execute");
//disable configuration reload/devmode
- fileManager.setReloadingConfigs(false);
+ fileManager.setReloadingConfigs("false");
//17 in the class level + 0 in the alias
assertEquals(12, validatorList.size());
