Puts back the default bean name to allow alias beans

core/src/main/java/com/opensymphony/xwork2/config/ConfigurationManager.java

@@ -47,10 +47,6 @@ public class ConfigurationManager {
     private boolean providersChanged = false;
     private boolean reloadConfigs = true; // for the first time
 
-    public ConfigurationManager() {
-        this("xwork");
-    }
-
     public ConfigurationManager(String name) {
         this.defaultFrameworkBeanName = name;
     }

core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java

@@ -51,11 +51,8 @@
  */
 public class DefaultConfiguration implements Configuration {
 
-    public static final String DEFAULT_BEAN_NAME = "struts";
-
     protected static final Logger LOG = LogManager.getLogger(DefaultConfiguration.class);
 
-
     // Programmatic Action Configurations
     protected Map<String, PackageConfig> packageContexts = new LinkedHashMap<>();
     protected RuntimeConfiguration runtimeConfiguration;
@@ -68,7 +65,7 @@ public class DefaultConfiguration implements Configuration {
     ObjectFactory objectFactory;
 
     public DefaultConfiguration() {
-        this(DEFAULT_BEAN_NAME);
+        this(Container.DEFAULT_NAME);
     }
 
     public DefaultConfiguration(String defaultBeanName) {
@@ -266,6 +263,8 @@ protected Container createBootstrapContainer(List<ContainerProvider> providers)
 
         builder.factory(TextParser.class, OgnlTextParser.class, Scope.SINGLETON);
         builder.factory(TextProvider.class, "system", DefaultTextProvider.class, Scope.SINGLETON);
+        builder.factory(TextProvider.class, TextProviderSupport.class, Scope.SINGLETON);
+        builder.factory(LocaleProvider.class, DefaultLocaleProvider.class, Scope.SINGLETON);
 
         builder.factory(ObjectTypeDeterminer.class, DefaultObjectTypeDeterminer.class, Scope.SINGLETON);
         builder.factory(PropertyAccessor.class, CompoundRoot.class.getName(), CompoundRootAccessor.class, Scope.SINGLETON);

core/src/main/java/com/opensymphony/xwork2/util/XWorkTestCaseHelper.java

@@ -29,7 +29,7 @@
 public class XWorkTestCaseHelper {
 
     public static ConfigurationManager setUp() throws Exception {
-        ConfigurationManager configurationManager = new ConfigurationManager();
+        ConfigurationManager configurationManager = new ConfigurationManager(Container.DEFAULT_NAME);
         configurationManager.addContainerProvider(new XWorkConfigurationProvider());
         Configuration config = configurationManager.getConfiguration();
         Container container = config.getContainer();
@@ -54,7 +54,7 @@ public static ConfigurationManager loadConfigurationProviders(ConfigurationManag
         } catch (Exception e) {
             throw new RuntimeException("Cannot clean old configuration", e);
         }
-        configurationManager = new ConfigurationManager();
+        configurationManager = new ConfigurationManager(Container.DEFAULT_NAME);
         configurationManager.addContainerProvider(new ContainerProvider() {
             public void destroy() {}
             public void init(Configuration configuration) throws ConfigurationException {}

core/src/main/java/org/apache/struts2/StrutsConstants.java

@@ -306,4 +306,6 @@ public final class StrutsConstants {
     public static final String STRUTS_CONTENT_TYPE_MATCHER = "struts.contentTypeMatcher";
 
     public static final String STRUTS_SMI_METHOD_REGEX = "struts.strictMethodInvocation.methodRegex";
+
+    public static final String STRUTS_LOCALIZED_TEXT_PROVIDER = "struts.localizedTextProvider";
 }

core/src/main/java/org/apache/struts2/config/AbstractBeanSelectionProvider.java

@@ -4,7 +4,6 @@
 import com.opensymphony.xwork2.config.BeanSelectionProvider;
 import com.opensymphony.xwork2.config.Configuration;
 import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
 import com.opensymphony.xwork2.inject.*;
 import com.opensymphony.xwork2.util.ClassLoaderUtil;
 import com.opensymphony.xwork2.util.location.LocatableProperties;
@@ -20,6 +19,8 @@ public abstract class AbstractBeanSelectionProvider implements BeanSelectionProv
 
     private static final Logger LOG = LogManager.getLogger(AbstractBeanSelectionProvider.class);
 
+    public static final String DEFAULT_BEAN_NAME = "struts";
+
     public void destroy() {
         // NO-OP
     }
@@ -41,8 +42,8 @@ protected void alias(Class type, String key, ContainerBuilder builder, Propertie
     }
 
     protected void alias(Class type, String key, ContainerBuilder builder, Properties props, Scope scope) {
-        if (!builder.contains(type)) {
-            String foundName = props.getProperty(key, DefaultConfiguration.DEFAULT_BEAN_NAME);
+        if (!builder.contains(type, Container.DEFAULT_NAME)) {
+            String foundName = props.getProperty(key, DEFAULT_BEAN_NAME);
             if (builder.contains(type, foundName)) {
                 LOG.trace("Choosing bean ({}) for ({})", foundName, type.getName());
                 builder.alias(type, foundName, Container.DEFAULT_NAME);
@@ -54,7 +55,7 @@ protected void alias(Class type, String key, ContainerBuilder builder, Propertie
                 } catch (ClassNotFoundException ex) {
                     // Perhaps a spring bean id, so we'll delegate to the object factory at runtime
                     LOG.trace("Choosing bean ({}) for ({}) to be loaded from the ObjectFactory", foundName, type.getName());
-                    if (DefaultConfiguration.DEFAULT_BEAN_NAME.equals(foundName)) {
+                    if (DEFAULT_BEAN_NAME.equals(foundName)) {
                         // Probably an optional bean, will ignore
                     } else {
                         if (ObjectFactory.class != type) {

core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java

@@ -387,8 +387,9 @@ public void register(ContainerBuilder builder, LocatableProperties props) {
         alias(TypeConverterHolder.class, StrutsConstants.STRUTS_CONVERTER_HOLDER, builder, props);
 
         alias(TextProvider.class, StrutsConstants.STRUTS_XWORKTEXTPROVIDER, builder, props, Scope.PROTOTYPE);
-
         alias(LocaleProvider.class, StrutsConstants.STRUTS_LOCALE_PROVIDER, builder, props);
+        alias(LocalizedTextUtil.class, StrutsConstants.STRUTS_LOCALIZED_TEXT_PROVIDER, builder, props);
+
         alias(ActionProxyFactory.class, StrutsConstants.STRUTS_ACTIONPROXYFACTORY, builder, props);
         alias(ObjectTypeDeterminer.class, StrutsConstants.STRUTS_OBJECTTYPEDETERMINER, builder, props);
         alias(ActionMapper.class, StrutsConstants.STRUTS_MAPPER_CLASS, builder, props);

core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java

@@ -456,7 +456,7 @@ private void init_CheckWebLogicWorkaround(Container container) {
     public void init() {
 
     	if (configurationManager == null) {
-    		configurationManager = createConfigurationManager(DefaultConfiguration.DEFAULT_BEAN_NAME);
+    		configurationManager = createConfigurationManager(Container.DEFAULT_NAME);
     	}
 
         try {

core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java

@@ -22,6 +22,7 @@
 import com.opensymphony.xwork2.FileManagerFactory;
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.config.providers.XWorkConfigurationProvider;
+import com.opensymphony.xwork2.inject.Container;
 import com.opensymphony.xwork2.inject.ContainerBuilder;
 import com.opensymphony.xwork2.util.location.LocatableProperties;
 
@@ -73,7 +74,7 @@ class State {
     	}
 
     	final State state = new State();
-    	ConfigurationManager configurationManager = new ConfigurationManager();
+    	ConfigurationManager configurationManager = new ConfigurationManager(Container.DEFAULT_NAME);
     	configurationManager.addContainerProvider(new ConfigurationProvider() {
 			public void destroy() { 
 				throw new RuntimeException("testing testing 123");

core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderGlobalResultInheritenceTest.java

@@ -6,6 +6,7 @@
 import com.opensymphony.xwork2.config.ConfigurationProvider;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.inject.Container;
 
 /**
  * <code>XmlConfigurationProviderGlobalResultInheritenceTest</code>
@@ -19,7 +20,7 @@ public class XmlConfigurationProviderGlobalResultInheritenceTest extends Configu
     public void testGlobalResultInheritenceTest() throws Exception {
         ConfigurationProvider provider = buildConfigurationProvider("com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml");
 
-        ConfigurationManager configurationManager = new ConfigurationManager();
+        ConfigurationManager configurationManager = new ConfigurationManager(Container.DEFAULT_NAME);
         configurationManager.addContainerProvider(new XWorkConfigurationProvider());
         configurationManager.addContainerProvider(provider);
         Configuration configuration = configurationManager.getConfiguration();

core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java

@@ -175,7 +175,7 @@ public void dispatcherInitialized(Dispatcher du) {
 
     public void testConfigurationManager() {
     	Dispatcher du;
-    	final InternalConfigurationManager configurationManager = new InternalConfigurationManager();
+    	final InternalConfigurationManager configurationManager = new InternalConfigurationManager(Container.DEFAULT_NAME);
     	try {
     		du = new MockDispatcher(new MockServletContext(), new HashMap<String, String>(), configurationManager);
     		du.init();
@@ -196,7 +196,7 @@ public void testConfigurationManager() {
     public void testObjectFactoryDestroy() throws Exception {
 
         final InnerDestroyableObjectFactory destroyedObjectFactory = new InnerDestroyableObjectFactory();
-        ConfigurationManager cm = new ConfigurationManager();
+        ConfigurationManager cm = new ConfigurationManager(Container.DEFAULT_NAME);
         Dispatcher du = new MockDispatcher(new MockServletContext(), new HashMap<String, String>(), cm);
         Mock mockConfiguration = new Mock(Configuration.class);
         cm.setConfiguration((Configuration)mockConfiguration.proxy());
@@ -245,7 +245,7 @@ public void testInterceptorDestroy() throws Exception {
         mockConfiguration.matchAndReturn("getContainer", mockContainer.proxy());
         mockConfiguration.expect("destroy");
 
-        ConfigurationManager configurationManager = new ConfigurationManager();
+        ConfigurationManager configurationManager = new ConfigurationManager(Container.DEFAULT_NAME);
         configurationManager.setConfiguration((Configuration) mockConfiguration.proxy());
 
         Dispatcher dispatcher = new MockDispatcher(new MockServletContext(), new HashMap<String, String>(), configurationManager);
@@ -259,8 +259,12 @@ public void testInterceptorDestroy() throws Exception {
 
     class InternalConfigurationManager extends ConfigurationManager {
     	public boolean destroyConfiguration = false;
-
-    	@Override
+
+        public InternalConfigurationManager(String name) {
+            super(name);
+        }
+
+        @Override
     	public synchronized void destroyConfiguration() {
     		super.destroyConfiguration();
     		destroyConfiguration = true;

core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java

@@ -51,7 +51,7 @@ public void testGetActionMappingAndUri1() throws Exception {
         mockContainer.expectAndReturn("getInstance", C.args(C.eq(ActionMapper.class), C.eq("mapper3")), mapper2);
         CompositeActionMapper compositeActionMapper = new CompositeActionMapper((Container) mockContainer.proxy(), "mapper1,mapper2,mapper3");
 
-        ActionMapping actionMapping = compositeActionMapper.getMapping(new MockHttpServletRequest(), new ConfigurationManager());
+        ActionMapping actionMapping = compositeActionMapper.getMapping(new MockHttpServletRequest(), new ConfigurationManager(Container.DEFAULT_NAME));
         String uri = compositeActionMapper.getUriFromActionMapping(new ActionMapping());
         mockContainer.verify();
 
@@ -69,7 +69,7 @@ public void testGetActionMappingAndUri2() throws Exception {
         mockContainer.expectAndReturn("getInstance", C.args(C.eq(ActionMapper.class), C.eq("mapper2")), mapper2);
         CompositeActionMapper compositeActionMapper = new CompositeActionMapper((Container) mockContainer.proxy(), "mapper1,mapper2");
 
-        ActionMapping actionMapping = compositeActionMapper.getMapping(new MockHttpServletRequest(), new ConfigurationManager());
+        ActionMapping actionMapping = compositeActionMapper.getMapping(new MockHttpServletRequest(), new ConfigurationManager(Container.DEFAULT_NAME));
         String uri = compositeActionMapper.getUriFromActionMapping(new ActionMapping());
         mockContainer.verify();
 

core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java

@@ -29,6 +29,7 @@
 import com.opensymphony.xwork2.config.ConfigurationManager;
 import com.opensymphony.xwork2.config.entities.PackageConfig;
 import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
+import com.opensymphony.xwork2.inject.Container;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.StrutsException;
 import org.apache.struts2.StrutsInternalTestCase;
@@ -61,7 +62,7 @@ protected void setUp() throws Exception {
         PackageConfig pkg2 = new PackageConfig.Builder("my").namespace("/my").build();
         config.addPackageConfig("mvns", pkg);
         config.addPackageConfig("my", pkg2);
-        configManager = new ConfigurationManager() {
+        configManager = new ConfigurationManager(Container.DEFAULT_NAME) {
             public Configuration getConfiguration() {
                 return config;
             }
@@ -139,7 +140,7 @@ public void testGetMappingWithSlashedNameAtRoot() throws Exception {
         config.addPackageConfig("mvns", pkg);
         config.addPackageConfig("my", pkg2);
         config.addPackageConfig("root", pkg3);
-        configManager = new ConfigurationManager() {
+        configManager = new ConfigurationManager(Container.DEFAULT_NAME) {
             public Configuration getConfiguration() {
                 return config;
             }

core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java

@@ -21,6 +21,7 @@
 
 package org.apache.struts2.dispatcher.mapper;
 
+import com.opensymphony.xwork2.inject.Container;
 import org.apache.struts2.StrutsInternalTestCase;
 import com.mockobjects.servlet.MockHttpServletRequest;
 import com.opensymphony.xwork2.config.ConfigurationManager;
@@ -53,7 +54,7 @@ protected void setUp() throws Exception {
             .namespace("/my").build();
         config.addPackageConfig("mvns", pkg);
         config.addPackageConfig("my", pkg2);
-        configManager = new ConfigurationManager() {
+        configManager = new ConfigurationManager(Container.DEFAULT_NAME) {
             public Configuration getConfiguration() {
                 return config;
             }

plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java

@@ -25,6 +25,7 @@
 import com.opensymphony.xwork2.config.ConfigurationManager;
 import com.opensymphony.xwork2.config.entities.PackageConfig;
 import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
+import com.opensymphony.xwork2.inject.Container;
 import junit.framework.TestCase;
 import org.apache.struts2.dispatcher.mapper.ActionMapping;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -50,7 +51,7 @@ protected void setUp() throws Exception {
         PackageConfig pkg2 = new PackageConfig.Builder("my").namespace("/my").build();
         config.addPackageConfig("mvns", pkg);
         config.addPackageConfig("my", pkg2);
-        configManager = new ConfigurationManager() {
+        configManager = new ConfigurationManager(Container.DEFAULT_NAME) {
             public Configuration getConfiguration() {
                 return config;
             }

plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java

@@ -25,6 +25,7 @@
 import com.opensymphony.xwork2.config.ConfigurationProvider;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.inject.Container;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.struts2.config.DefaultBeanSelectionProvider;
@@ -71,7 +72,7 @@ private static void initXWork() {
         File configFile = new File(configFilePath);
         try {
             ConfigurationProvider configProvider = new StrutsXmlConfigurationProvider(configFile.getCanonicalPath(), true, null);
-            cm = new ConfigurationManager();
+            cm = new ConfigurationManager(Container.DEFAULT_NAME);
             cm.addContainerProvider(new DefaultPropertiesProvider());
             cm.addContainerProvider(new StrutsXmlConfigurationProvider("struts-default.xml", false, null));
             cm.addContainerProvider(configProvider);