struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [10/16] struts git commit: Defines bean in test configuration
Date Fri, 24 Mar 2017 09:10:05 GMT
Defines bean in test configuration


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/132829cc
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/132829cc
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/132829cc

Branch: refs/heads/master
Commit: 132829cc244d60692e3547c5c40b72e29eea1a9e
Parents: c039685
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Fri Mar 17 08:03:28 2017 +0100
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Fri Mar 17 08:03:28 2017 +0100

----------------------------------------------------------------------
 .../xwork2/config/providers/XWorkConfigurationProvider.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/132829cc/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
index d29cf0e..1bc6986 100644
--- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
@@ -5,6 +5,7 @@ import com.opensymphony.xwork2.DefaultActionProxyFactory;
 import com.opensymphony.xwork2.DefaultLocaleProviderFactory;
 import com.opensymphony.xwork2.LocaleProviderFactory;
 import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
 import com.opensymphony.xwork2.factory.DefaultUnknownHandlerFactory;
 import com.opensymphony.xwork2.factory.UnknownHandlerFactory;
 import com.opensymphony.xwork2.ognl.accessor.HttpParametersPropertyAccessor;
@@ -19,7 +20,6 @@ import com.opensymphony.xwork2.FileManager;
 import com.opensymphony.xwork2.FileManagerFactory;
 import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.TextProviderSupport;
 import com.opensymphony.xwork2.UnknownHandlerManager;
 import com.opensymphony.xwork2.XWorkConstants;
 import com.opensymphony.xwork2.config.Configuration;
@@ -181,12 +181,11 @@ public class XWorkConfigurationProvider implements ConfigurationProvider
{
                 .factory(ActionValidatorManager.class, AnnotationActionValidatorManager.class,
Scope.SINGLETON)
                 .factory(ActionValidatorManager.class, "no-annotations", DefaultActionValidatorManager.class,
Scope.SINGLETON)
 
-                .factory(StrutsTextProviderFactory.class, Scope.SINGLETON)
-                .factory(LocalizedTextProvider.class, DefaultLocalizedTextProvider.class,
Scope.SINGLETON)
                 .factory(TextProvider.class, "system", DefaultTextProvider.class, Scope.SINGLETON)
-                .factory(TextProvider.class, TextProviderSupport.class, Scope.SINGLETON)
-
+                .factory(LocalizedTextProvider.class, DefaultLocalizedTextProvider.class,
Scope.SINGLETON)
+                .factory(TextProviderFactory.class, StrutsTextProviderFactory.class, Scope.SINGLETON)
                 .factory(LocaleProviderFactory.class, DefaultLocaleProviderFactory.class,
Scope.SINGLETON)
+
                 .factory(OgnlUtil.class, Scope.SINGLETON)
                 .factory(CollectionConverter.class, Scope.SINGLETON)
                 .factory(ArrayConverter.class, Scope.SINGLETON)


Mime
View raw message