Author: mcucchiara
Date: Tue Sep 20 16:51:00 2011
New Revision: 1173248
URL: http://svn.apache.org/viewvc?rev=1173248&view=rev
Log:
WW-3682 - replaced deprecaded api calls with direct replacements
Modified:
struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java
struts/struts2/trunk/apps/jboss-blank/src/test/java/example/ConfigTest.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.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/util/XWorkTestCaseHelper.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/XmlConfigurationProviderGlobalResultInheritenceTest.java
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderPackagesTest.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/config/providers/XmlConfigurationProviderWildCardIncludeTest.java
Modified: struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java?rev=1173248&r1=1173247&r2=1173248&view=diff
==============================================================================
--- struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java
(original)
+++ struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java Tue
Sep 20 16:51:00 2011
@@ -26,11 +26,10 @@ import com.opensymphony.xwork2.config.Ru
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.StrutsTestCase;
-import java.util.Map;
import java.util.List;
-
-import org.apache.struts2.StrutsTestCase;
+import java.util.Map;
public class ConfigTest extends StrutsTestCase {
@@ -62,7 +61,7 @@ public class ConfigTest extends StrutsTe
protected void setUp() throws Exception {
super.setUp();
XmlConfigurationProvider c = new
XmlConfigurationProvider("struts.xml");
- configurationManager.addConfigurationProvider(c);
+ configurationManager.addContainerProvider(c);
configurationManager.reload();
}
Modified:
struts/struts2/trunk/apps/jboss-blank/src/test/java/example/ConfigTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/test/java/example/ConfigTest.java?rev=1173248&r1=1173247&r2=1173248&view=diff
==============================================================================
--- struts/struts2/trunk/apps/jboss-blank/src/test/java/example/ConfigTest.java
(original)
+++ struts/struts2/trunk/apps/jboss-blank/src/test/java/example/ConfigTest.java
Tue Sep 20 16:51:00 2011
@@ -26,11 +26,10 @@ import com.opensymphony.xwork2.config.Ru
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.StrutsTestCase;
-import java.util.Map;
import java.util.List;
-
-import org.apache.struts2.StrutsTestCase;
+import java.util.Map;
public class ConfigTest extends StrutsTestCase {
@@ -62,7 +61,7 @@ public class ConfigTest extends StrutsTe
protected void setUp() throws Exception {
super.setUp();
XmlConfigurationProvider c = new
XmlConfigurationProvider("struts.xml");
- configurationManager.addConfigurationProvider(c);
+ configurationManager.addContainerProvider(c);
configurationManager.reload();
}
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=1173248&r1=1173247&r2=1173248&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
Tue Sep 20 16:51:00 2011
@@ -267,7 +267,7 @@ public class Dispatcher {
((ObjectFactoryDestroyable)objectFactory).destroy();
}
catch(Exception e) {
- // catch any exception that may occured during destroy() and
log it
+ // catch any exception that may occurred during destroy() and
log it
LOG.error("exception occurred while destroying ObjectFactory
["+objectFactory+"]", e);
}
}
@@ -307,11 +307,11 @@ public class Dispatcher {
}
private void init_DefaultProperties() {
- configurationManager.addConfigurationProvider(new
DefaultPropertiesProvider());
+ configurationManager.addContainerProvider(new
DefaultPropertiesProvider());
}
private void init_LegacyStrutsProperties() {
- configurationManager.addConfigurationProvider(new
LegacyPropertiesConfigurationProvider());
+ configurationManager.addContainerProvider(new
LegacyPropertiesConfigurationProvider());
}
private void init_TraditionalXmlConfigurations() {
@@ -323,9 +323,9 @@ public class Dispatcher {
for (String file : files) {
if (file.endsWith(".xml")) {
if ("xwork.xml".equals(file)) {
-
configurationManager.addConfigurationProvider(createXmlConfigurationProvider(file,
false));
+
configurationManager.addContainerProvider(createXmlConfigurationProvider(file,
false));
} else {
-
configurationManager.addConfigurationProvider(createStrutsXmlConfigurationProvider(file,
false, servletContext));
+
configurationManager.addContainerProvider(createStrutsXmlConfigurationProvider(file,
false, servletContext));
}
} else {
throw new IllegalArgumentException("Invalid configuration file
name");
@@ -349,7 +349,7 @@ public class Dispatcher {
try {
Class cls = ClassLoaderUtils.loadClass(cname,
this.getClass());
ConfigurationProvider prov =
(ConfigurationProvider)cls.newInstance();
- configurationManager.addConfigurationProvider(prov);
+ configurationManager.addContainerProvider(prov);
} catch (InstantiationException e) {
throw new ConfigurationException("Unable to instantiate
provider: "+cname, e);
} catch (IllegalAccessException e) {
@@ -362,11 +362,19 @@ public class Dispatcher {
}
private void init_FilterInitParameters() {
- configurationManager.addConfigurationProvider(new
ConfigurationProvider() {
- public void destroy() {}
- public void init(Configuration configuration) throws
ConfigurationException {}
- public void loadPackages() throws ConfigurationException {}
- public boolean needsReload() { return false; }
+ configurationManager.addContainerProvider(new ConfigurationProvider() {
+ public void destroy() {
+ }
+
+ public void init(Configuration configuration) throws
ConfigurationException {
+ }
+
+ public void loadPackages() throws ConfigurationException {
+ }
+
+ public boolean needsReload() {
+ return false;
+ }
public void register(ContainerBuilder builder, LocatableProperties
props) throws ConfigurationException {
props.putAll(initParams);
@@ -375,7 +383,7 @@ public class Dispatcher {
}
private void init_AliasStandardObjects() {
- configurationManager.addConfigurationProvider(new
BeanSelectionProvider());
+ configurationManager.addContainerProvider(new BeanSelectionProvider());
}
private Container init_PreloadConfiguration() {
@@ -396,7 +404,7 @@ public class Dispatcher {
private void init_CheckWebLogicWorkaround(Container container) {
// test whether param-access workaround needs to be enabled
if (servletContext != null && servletContext.getServerInfo() != null
- && servletContext.getServerInfo().indexOf("WebLogic") >= 0) {
+ && servletContext.getServerInfo().contains("WebLogic")) {
if (LOG.isInfoEnabled()) {
LOG.info("WebLogic server detected. Enabling Struts parameter
access work-around.");
}
@@ -634,7 +642,7 @@ public class Dispatcher {
File multipartSaveDir = new File(saveDir);
if (!multipartSaveDir.exists()) {
- if (multipartSaveDir.mkdir() == false) {
+ if (!multipartSaveDir.mkdir()) {
String logMessage;
try {
logMessage = "Could not find create multipart save
directory '"+multipartSaveDir.getCanonicalPath()+"'.";
@@ -715,7 +723,7 @@ public class Dispatcher {
}
String content_type = request.getContentType();
- if (content_type != null &&
content_type.indexOf("multipart/form-data") != -1) {
+ if (content_type != null &&
content_type.contains("multipart/form-data")) {
MultiPartRequest mpr = null;
//check for alternate implementations of MultiPartRequest
Set<String> multiNames =
getContainer().getInstanceNames(MultiPartRequest.class);
@@ -785,7 +793,7 @@ public class Dispatcher {
public void sendError(HttpServletRequest request, HttpServletResponse
response,
ServletContext ctx, int code, Exception e) {
Boolean devModeOverride = FilterDispatcher.getDevModeOverride();
- if (devModeOverride != null ? devModeOverride.booleanValue() :
devMode) {
+ if (devModeOverride != null ? devModeOverride : devMode) {
response.setContentType("text/html");
try {
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java?rev=1173248&r1=1173247&r2=1173248&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
Tue Sep 20 16:51:00 2011
@@ -269,8 +269,8 @@ public class UIComponentTest extends Abs
// form
public void testFormComponentDisposeItselfFromComponentStack() throws
Exception {
- configurationManager.clearConfigurationProviders();
- configurationManager.addConfigurationProvider(new
TestConfigurationProvider());
+ configurationManager.clearContainerProviders();
+ configurationManager.addContainerProvider(new
TestConfigurationProvider());
ActionContext.getContext().setValueStack(stack);
request.setupGetServletPath("/testAction");
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java?rev=1173248&r1=1173247&r2=1173248&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
Tue Sep 20 16:51:00 2011
@@ -21,28 +21,9 @@
package org.apache.struts2.interceptor;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.servlet.http.HttpSession;
-
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
-import org.apache.struts2.views.jsp.StrutsMockHttpSession;
-
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ActionProxyFactory;
-import com.opensymphony.xwork2.DefaultActionProxyFactory;
-import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.*;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.config.ConfigurationProvider;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.entities.InterceptorMapping;
@@ -52,6 +33,14 @@ import com.opensymphony.xwork2.inject.Co
import com.opensymphony.xwork2.interceptor.ParametersInterceptor;
import com.opensymphony.xwork2.mock.MockResult;
import com.opensymphony.xwork2.util.location.LocatableProperties;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
+import org.apache.struts2.views.jsp.StrutsMockHttpSession;
+
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.Map;
/**
* Test case for ExecuteAndWaitInterceptor.
@@ -193,7 +182,7 @@ public class ExecuteAndWaitInterceptorTe
}
protected void tearDown() throws Exception {
- configurationManager.clearConfigurationProviders();
+ configurationManager.clearContainerProviders();
configurationManager.destroyConfiguration();
ActionContext.setContext(null);
}
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=1173248&r1=1173247&r2=1173248&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
Tue Sep 20 16:51:00 2011
@@ -211,7 +211,7 @@ public class ConfigurationManager {
* Destroy its managing Configuration instance
*/
public synchronized void destroyConfiguration() {
- clearConfigurationProviders(); // let's destroy the
ConfigurationProvider first
+ clearContainerProviders(); // let's destroy the ConfigurationProvider
first
containerProviders = new CopyOnWriteArrayList<ContainerProvider>();
if (configuration != null)
configuration.destroy(); // let's destroy it first, before nulling
it.
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkTestCaseHelper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkTestCaseHelper.java?rev=1173248&r1=1173247&r2=1173248&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkTestCaseHelper.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/XWorkTestCaseHelper.java
Tue Sep 20 16:51:00 2011
@@ -71,7 +71,7 @@ public class XWorkTestCaseHelper {
if (prov instanceof XmlConfigurationProvider) {
((XmlConfigurationProvider)prov).setThrowExceptionOnDuplicateBeans(false);
}
- configurationManager.addConfigurationProvider(prov);
+ configurationManager.addContainerProvider(prov);
}
Container container =
configurationManager.getConfiguration().getContainer();
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=1173248&r1=1173247&r2=1173248&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
Tue Sep 20 16:51:00 2011
@@ -71,11 +71,11 @@ public class ConfigurationManagerTest ex
class State {
public boolean isDestroyed1 =false;
public boolean isDestroyed2 =false;
- };
+ }
final State state = new State();
ConfigurationManager configurationManager = new ConfigurationManager();
- configurationManager.addConfigurationProvider(new
ConfigurationProvider() {
+ configurationManager.addContainerProvider(new ConfigurationProvider() {
public void destroy() {
throw new RuntimeException("testing testing
123");
}
@@ -90,7 +90,7 @@ public class ConfigurationManagerTest ex
public void register(ContainerBuilder builder,
LocatableProperties props) throws ConfigurationException {
}
});
- configurationManager.addConfigurationProvider(new
ConfigurationProvider() {
+ configurationManager.addContainerProvider(new ConfigurationProvider() {
public void destroy() {
state.isDestroyed1 = true;
}
@@ -105,7 +105,7 @@ public class ConfigurationManagerTest ex
public void register(ContainerBuilder builder,
LocatableProperties props) throws ConfigurationException {
}
});
- configurationManager.addConfigurationProvider(new
ConfigurationProvider() {
+ configurationManager.addContainerProvider(new ConfigurationProvider() {
public void destroy() {
throw new RuntimeException("testing testing
123");
}
@@ -120,7 +120,7 @@ public class ConfigurationManagerTest ex
public void register(ContainerBuilder builder,
LocatableProperties props) throws ConfigurationException {
}
});
- configurationManager.addConfigurationProvider(new
ConfigurationProvider() {
+ configurationManager.addContainerProvider(new ConfigurationProvider() {
public void destroy() {
state.isDestroyed2 = true;
}
@@ -139,7 +139,7 @@ public class ConfigurationManagerTest ex
assertFalse(state.isDestroyed1);
assertFalse(state.isDestroyed2);
- configurationManager.clearConfigurationProviders();
+ configurationManager.clearContainerProviders();
assertTrue(state.isDestroyed1);
assertTrue(state.isDestroyed2);
@@ -147,7 +147,7 @@ public class ConfigurationManagerTest ex
public void testClearConfigurationProviders() throws Exception {
configProviderMock.expect("destroy");
- configurationManager.clearConfigurationProviders();
+ configurationManager.clearContainerProviders();
configProviderMock.verify();
}
@@ -160,8 +160,8 @@ public class ConfigurationManagerTest ex
configProviderMock.matchAndReturn("equals", C.ANY_ARGS, false);
ConfigurationProvider mockProvider = (ConfigurationProvider)
configProviderMock.proxy();
- configurationManager.addConfigurationProvider(new
XWorkConfigurationProvider());
- configurationManager.addConfigurationProvider(mockProvider);
+ configurationManager.addContainerProvider(new
XWorkConfigurationProvider());
+ configurationManager.addContainerProvider(mockProvider);
//the first time it always inits
configProviderMock.expect("init", C.isA(Configuration.class));
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=1173248&r1=1173247&r2=1173248&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
Tue Sep 20 16:51:00 2011
@@ -188,7 +188,7 @@ public class ConfigurationTest extends X
}
public void testMultipleConfigProviders() {
- configurationManager.addConfigurationProvider(new
MockConfigurationProvider());
+ configurationManager.addContainerProvider(new
MockConfigurationProvider());
try {
configurationManager.reload();
Modified:
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderGlobalResultInheritenceTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderGlobalResultInheritenceTest.java?rev=1173248&r1=1173247&r2=1173248&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderGlobalResultInheritenceTest.java
(original)
+++
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderGlobalResultInheritenceTest.java
Tue Sep 20 16:51:00 2011
@@ -20,20 +20,20 @@ public class XmlConfigurationProviderGlo
ConfigurationProvider provider =
buildConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml");
ConfigurationManager configurationManager = new ConfigurationManager();
- configurationManager.addConfigurationProvider(new
XWorkConfigurationProvider());
- configurationManager.addConfigurationProvider(provider);
+ configurationManager.addContainerProvider(new
XWorkConfigurationProvider());
+ configurationManager.addContainerProvider(provider);
Configuration configuration = configurationManager.getConfiguration();
ActionConfig parentActionConfig =
configuration.getRuntimeConfiguration().getActionConfig("/base",
"parentAction");
ActionConfig anotherActionConfig =
configuration.getRuntimeConfiguration().getActionConfig("/base",
"anotherAction");
ActionConfig childActionConfig =
configuration.getRuntimeConfiguration().getActionConfig("/base", "childAction");
- ResultConfig parentResultConfig1 = (ResultConfig)
parentActionConfig.getResults().get("mockResult1");
- ResultConfig parentResultConfig2 = (ResultConfig)
parentActionConfig.getResults().get("mockResult2");
- ResultConfig anotherResultConfig1 = (ResultConfig)
anotherActionConfig.getResults().get("mockResult1");
- ResultConfig anotherResultConfig2 = (ResultConfig)
anotherActionConfig.getResults().get("mockResult2");
- ResultConfig childResultConfig1 = (ResultConfig)
childActionConfig.getResults().get("mockResult1");
- ResultConfig childResultConfig2 = (ResultConfig)
childActionConfig.getResults().get("mockResult2");
+ ResultConfig parentResultConfig1 =
parentActionConfig.getResults().get("mockResult1");
+ ResultConfig parentResultConfig2 =
parentActionConfig.getResults().get("mockResult2");
+ ResultConfig anotherResultConfig1 =
anotherActionConfig.getResults().get("mockResult1");
+ ResultConfig anotherResultConfig2 =
anotherActionConfig.getResults().get("mockResult2");
+ ResultConfig childResultConfig1 =
childActionConfig.getResults().get("mockResult1");
+ ResultConfig childResultConfig2 =
childActionConfig.getResults().get("mockResult2");
System.out.println(parentResultConfig1.getParams().get("identity"));
System.out.println(parentResultConfig2.getParams().get("identity"));
Modified:
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderPackagesTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderPackagesTest.java?rev=1173248&r1=1173247&r2=1173248&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderPackagesTest.java
(original)
+++
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderPackagesTest.java
Tue Sep 20 16:51:00 2011
@@ -103,7 +103,7 @@ public class XmlConfigurationProviderPac
assertTrue(multipleParents.contains(abstractPackage));
assertTrue(multipleParents.contains(singlePackage));
- configurationManager.addConfigurationProvider(provider);
+ configurationManager.addContainerProvider(provider);
configurationManager.reload();
RuntimeConfiguration runtimeConfiguration =
configurationManager.getConfiguration().getRuntimeConfiguration();
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=1173248&r1=1173247&r2=1173248&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
Tue Sep 20 16:51:00 2011
@@ -127,7 +127,7 @@ public class XmlConfigurationProviderTes
assertEquals(1, namespace5.getParents().size());
assertEquals(namespace4, namespace5.getParents().get(0));
- configurationManager.addConfigurationProvider(provider);
+ configurationManager.addContainerProvider(provider);
configurationManager.reload();
RuntimeConfiguration runtimeConfiguration =
configurationManager.getConfiguration().getRuntimeConfiguration();
Modified:
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java?rev=1173248&r1=1173247&r2=1173248&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java
(original)
+++
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java
Tue Sep 20 16:51:00 2011
@@ -41,7 +41,7 @@ public class XmlConfigurationProviderWil
assertNotNull(defaultTwoPackage);
assertEquals("default-2", defaultTwoPackage.getName());
- configurationManager.addConfigurationProvider(provider);
+ configurationManager.addContainerProvider(provider);
configurationManager.reload();
}
