You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2017/03/16 10:09:35 UTC
[01/12] struts git commit: Defines new interface for factory
Repository: struts
Updated Branches:
refs/heads/master 6ee73dce7 -> 9d60f5bbc
Defines new interface for factory
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b42b9f16
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b42b9f16
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b42b9f16
Branch: refs/heads/master
Commit: b42b9f16c4598505e0b1cfef78e6639237b2d712
Parents: 6ee73dc
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Mar 15 08:46:09 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Mar 15 08:46:09 2017 +0100
----------------------------------------------------------------------
.../xwork2/LocaleProviderFactory.java | 32 ++++++++++++++++++++
1 file changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b42b9f16/core/src/main/java/com/opensymphony/xwork2/LocaleProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/LocaleProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/LocaleProviderFactory.java
new file mode 100644
index 0000000..dc2e7dd
--- /dev/null
+++ b/core/src/main/java/com/opensymphony/xwork2/LocaleProviderFactory.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2002-2006,2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.opensymphony.xwork2;
+
+/**
+ * Allows delegate creation of {@link LocaleProvider} to another implementation provided
+ * by a user. It also allows avoid problems with too many dependencies as {@link LocaleProvider}
+ * is implemented by the {@link ActionSupport} which can be defined as a bean in Spring.
+ */
+public interface LocaleProviderFactory {
+
+ /**
+ * Gets the provided locale.
+ *
+ * @return the locale.
+ */
+ LocaleProvider createLocaleProvider();
+
+}
[07/12] struts git commit: Drops unused import
Posted by lu...@apache.org.
Drops unused import
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/47382411
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/47382411
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/47382411
Branch: refs/heads/master
Commit: 47382411d79cddd65bc7c755b60f01fa1cf057ea
Parents: f912dab
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Mar 15 18:55:26 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Mar 15 18:55:26 2017 +0100
----------------------------------------------------------------------
core/src/main/java/com/opensymphony/xwork2/ActionSupport.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/47382411/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
index ea4be0d..0434469 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
@@ -19,7 +19,6 @@ import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.ValidationAware;
import com.opensymphony.xwork2.util.ValueStack;
-import net.sf.cglib.core.Local;
import java.io.Serializable;
import java.util.*;
[03/12] struts git commit: Replaces LocaleProvider with
LocaleProviderFactory
Posted by lu...@apache.org.
Replaces LocaleProvider with LocaleProviderFactory
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/09be1b9b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/09be1b9b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/09be1b9b
Branch: refs/heads/master
Commit: 09be1b9b773f164d59114b0a73d3a4fde366b673
Parents: 636821a
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Mar 15 08:50:05 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Mar 15 08:50:05 2017 +0100
----------------------------------------------------------------------
.../com/opensymphony/xwork2/TextProviderFactory.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/09be1b9b/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java
index 349d876..4d55d6c 100644
--- a/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java
+++ b/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java
@@ -28,7 +28,7 @@ import java.util.ResourceBundle;
public class TextProviderFactory {
private TextProvider textProvider;
- private LocaleProvider localeProvider;
+ private LocaleProviderFactory localeProviderFactory;
private LocalizedTextProvider localizedTextProvider;
@Inject
@@ -37,8 +37,8 @@ public class TextProviderFactory {
}
@Inject
- public void setLocaleProvider(LocaleProvider localeProvider) {
- this.localeProvider = localeProvider;
+ public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) {
+ this.localeProviderFactory = localeProviderFactory;
}
@Inject
@@ -50,7 +50,7 @@ public class TextProviderFactory {
TextProvider instance = getTextProvider(clazz);
if (instance instanceof ResourceBundleTextProvider) {
((ResourceBundleTextProvider) instance).setClazz(clazz);
- ((ResourceBundleTextProvider) instance).setLocaleProvider(localeProvider);
+ ((ResourceBundleTextProvider) instance).setLocaleProvider(localeProviderFactory.createLocaleProvider());
}
return instance;
}
@@ -59,14 +59,14 @@ public class TextProviderFactory {
TextProvider instance = getTextProvider(bundle);
if (instance instanceof ResourceBundleTextProvider) {
((ResourceBundleTextProvider) instance).setBundle(bundle);
- ((ResourceBundleTextProvider) instance).setLocaleProvider(localeProvider);
+ ((ResourceBundleTextProvider) instance).setLocaleProvider(localeProviderFactory.createLocaleProvider());
}
return instance;
}
protected TextProvider getTextProvider(Class clazz) {
if (this.textProvider == null) {
- return new TextProviderSupport(clazz, localeProvider, localizedTextProvider);
+ return new TextProviderSupport(clazz, localeProviderFactory.createLocaleProvider(), localizedTextProvider);
} else {
return textProvider;
}
@@ -74,7 +74,7 @@ public class TextProviderFactory {
private TextProvider getTextProvider(ResourceBundle bundle) {
if (this.textProvider == null) {
- return new TextProviderSupport(bundle, localeProvider, localizedTextProvider);
+ return new TextProviderSupport(bundle, localeProviderFactory.createLocaleProvider(), localizedTextProvider);
}
return textProvider;
}
[11/12] struts git commit: Decouples LocaleProvider instance from
long living interceptor state
Posted by lu...@apache.org.
Decouples LocaleProvider instance from long living interceptor state
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4eb22020
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4eb22020
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4eb22020
Branch: refs/heads/master
Commit: 4eb22020a474ffaa69484c8e3dd0711dc517d6e8
Parents: 8298371
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Mar 16 08:15:04 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Mar 16 08:15:04 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/struts2/interceptor/I18nInterceptor.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/4eb22020/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
index f97176f..722beb0 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
@@ -59,7 +59,7 @@ public class I18nInterceptor extends AbstractInterceptor {
protected String requestCookieParameterName = DEFAULT_COOKIE_PARAMETER;
protected Storage storage = Storage.SESSION;
- protected LocaleProvider localeProvider;
+ protected LocaleProviderFactory localeProviderFactory;
// Request-Only = None
protected enum Storage { COOKIE, SESSION, NONE }
@@ -95,7 +95,7 @@ public class I18nInterceptor extends AbstractInterceptor {
@Inject
public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) {
- this.localeProvider = localeProviderFactory.createLocaleProvider();
+ this.localeProviderFactory = localeProviderFactory;
}
@Override
@@ -157,6 +157,8 @@ public class I18nInterceptor extends AbstractInterceptor {
* @return the Locale
*/
protected Locale getLocaleFromParam(Object requestedLocale) {
+ LocaleProvider localeProvider = localeProviderFactory.createLocaleProvider();
+
Locale locale = null;
if (requestedLocale != null) {
if (requestedLocale instanceof Locale) {
[12/12] struts git commit: Adds missing annotation
Posted by lu...@apache.org.
Adds missing annotation
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9d60f5bb
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9d60f5bb
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9d60f5bb
Branch: refs/heads/master
Commit: 9d60f5bbc69b87628ac271e380355b2094deb0f3
Parents: 4eb2202
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Mar 16 08:15:48 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Mar 16 08:15:48 2017 +0100
----------------------------------------------------------------------
.../main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/9d60f5bb/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
index f28ef03..19c8f5d 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
@@ -14,6 +14,7 @@ public class DefaultLocaleProvider implements LocaleProvider {
private final static Logger LOG = LogManager.getLogger(DefaultLocaleProvider.class);
+ @Override
public Locale getLocale() {
ActionContext ctx = ActionContext.getContext();
if (ctx != null) {
[04/12] struts git commit: Injects factory instead of the provider
Posted by lu...@apache.org.
Injects factory instead of the provider
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3b738ad3
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3b738ad3
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3b738ad3
Branch: refs/heads/master
Commit: 3b738ad3ef01c434dbd673d5dca4659aa5779e7d
Parents: 09be1b9
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Mar 15 08:53:35 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Mar 15 08:53:35 2017 +0100
----------------------------------------------------------------------
.../java/com/opensymphony/xwork2/TextProviderSupport.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/3b738ad3/core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java b/core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
index cf177d3..528a910 100644
--- a/core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
@@ -67,6 +67,7 @@ public class TextProviderSupport implements ResourceBundleTextProvider {
/**
* @param bundle the resource bundle.
*/
+ @Override
public void setBundle(ResourceBundle bundle) {
this.bundle = bundle;
}
@@ -74,20 +75,25 @@ public class TextProviderSupport implements ResourceBundleTextProvider {
/**
* @param clazz a clazz to use for reading the resource bundle.
*/
+ @Override
public void setClazz(Class clazz) {
this.clazz = clazz;
}
-
/**
* @param localeProvider a locale provider.
*/
- @Inject
+ @Override
public void setLocaleProvider(LocaleProvider localeProvider) {
this.localeProvider = localeProvider;
}
@Inject
+ public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) {
+ this.localeProvider = localeProviderFactory.createLocaleProvider();
+ }
+
+ @Inject
public void setLocalizedTextProvider(LocalizedTextProvider localizedTextProvider) {
this.localizedTextProvider = localizedTextProvider;
}
[10/12] struts git commit: Adds info about what other extension point
to use
Posted by lu...@apache.org.
Adds info about what other extension point to use
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/82983713
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/82983713
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/82983713
Branch: refs/heads/master
Commit: 82983713aee8cb64cac06fde41a9ed72bf5b46e6
Parents: 5452f56
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Mar 15 18:59:55 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Mar 15 18:59:55 2017 +0100
----------------------------------------------------------------------
.../org/apache/struts2/config/DefaultBeanSelectionProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/82983713/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
index a72bd11..f77f8ae 100644
--- a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -221,7 +221,7 @@ import org.apache.struts2.views.velocity.VelocityManager;
* <td>com.opensymphony.xwork2.LocaleProvider</td>
* <td>struts.localeProvider</td>
* <td>singleton</td>
- * <td>DEPRECATED! Allows provide custom TextProvider for whole application</td>
+ * <td>DEPRECATED! Allows provide custom TextProvider for whole application - instead this endpoint use <b>struts.localeProviderFactory</b></td>
* </tr>
* <tr>
* <td>com.opensymphony.xwork2.LocaleProviderFactory</td>
[08/12] struts git commit: Updates JavaDoc
Posted by lu...@apache.org.
Updates JavaDoc
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c815f5c5
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c815f5c5
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c815f5c5
Branch: refs/heads/master
Commit: c815f5c54d8ba163b860ec70d3c6de44c8f6c4d8
Parents: 4738241
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Mar 15 18:56:31 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Mar 15 18:56:31 2017 +0100
----------------------------------------------------------------------
.../main/java/com/opensymphony/xwork2/LocaleProviderFactory.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/c815f5c5/core/src/main/java/com/opensymphony/xwork2/LocaleProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/LocaleProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/LocaleProviderFactory.java
index dc2e7dd..930418d 100644
--- a/core/src/main/java/com/opensymphony/xwork2/LocaleProviderFactory.java
+++ b/core/src/main/java/com/opensymphony/xwork2/LocaleProviderFactory.java
@@ -23,9 +23,9 @@ package com.opensymphony.xwork2;
public interface LocaleProviderFactory {
/**
- * Gets the provided locale.
+ * Create a new instance of {@link LocaleProvider}.
*
- * @return the locale.
+ * @return the localeProvider.
*/
LocaleProvider createLocaleProvider();
[05/12] struts git commit: Replaces LocaleProvider with
LocaleProviderFactory
Posted by lu...@apache.org.
Replaces LocaleProvider with LocaleProviderFactory
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4b022bfb
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4b022bfb
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4b022bfb
Branch: refs/heads/master
Commit: 4b022bfbe5f575908e61d84de885ca171fcca7f3
Parents: 3b738ad
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Mar 15 09:11:31 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Mar 15 09:11:31 2017 +0100
----------------------------------------------------------------------
.../com/opensymphony/xwork2/ActionSupport.java | 18 ++++++++++++++----
.../xwork2/config/impl/DefaultConfiguration.java | 2 +-
.../providers/XWorkConfigurationProvider.java | 4 +++-
.../conversion/impl/DefaultTypeConverter.java | 4 +++-
.../validator/DelegatingValidatorContext.java | 18 +++++++++++++++---
.../java/org/apache/struts2/StrutsConstants.java | 4 ++++
.../java/org/apache/struts2/components/I18n.java | 5 +++--
.../config/DefaultBeanSelectionProvider.java | 12 +++++++++---
.../org/apache/struts2/dispatcher/Dispatcher.java | 13 ++++++++++---
.../multipart/AbstractMultiPartRequest.java | 8 +++-----
.../interceptor/FileUploadInterceptor.java | 3 ++-
.../struts2/interceptor/I18nInterceptor.java | 5 +++--
core/src/main/resources/struts-default.xml | 2 +-
.../struts2/tiles/StrutsTilesLocaleResolver.java | 5 +++--
14 files changed, 74 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/4b022bfb/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
index bb7048f..ea4be0d 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
@@ -19,6 +19,7 @@ import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.ValidationAware;
import com.opensymphony.xwork2.util.ValueStack;
+import net.sf.cglib.core.Local;
import java.io.Serializable;
import java.util.*;
@@ -32,6 +33,7 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex
private final ValidationAwareSupport validationAware = new ValidationAwareSupport();
private transient TextProvider textProvider;
+ private transient LocaleProvider localeProvider;
protected Container container;
@@ -61,17 +63,17 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex
@Override
public Locale getLocale() {
- return container.getInstance(LocaleProvider.class).getLocale();
+ return getLocaleProvider().getLocale();
}
@Override
public boolean isValidLocaleString(String localeStr) {
- return container.getInstance(LocaleProvider.class).isValidLocaleString(localeStr);
+ return getLocaleProvider().isValidLocaleString(localeStr);
}
@Override
public boolean isValidLocale(Locale locale) {
- return container.getInstance(LocaleProvider.class).isValidLocale(locale);
+ return getLocaleProvider().isValidLocale(locale);
}
public boolean hasKey(String key) {
@@ -272,7 +274,7 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex
*
* @return reference to field with TextProvider
*/
- private TextProvider getTextProvider() {
+ protected TextProvider getTextProvider() {
if (textProvider == null) {
TextProviderFactory tpf = container.inject(TextProviderFactory.class);
textProvider = tpf.createInstance(getClass());
@@ -280,6 +282,14 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex
return textProvider;
}
+ protected LocaleProvider getLocaleProvider() {
+ if (localeProvider == null) {
+ LocaleProviderFactory localeProviderFactory = container.getInstance(LocaleProviderFactory.class);
+ localeProvider = localeProviderFactory.createLocaleProvider();
+ }
+ return localeProvider;
+ }
+
@Inject
public void setContainer(Container container) {
this.container = container;
http://git-wip-us.apache.org/repos/asf/struts/blob/4b022bfb/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
index 358eb5c..c7c5a92 100644
--- a/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
+++ b/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
@@ -264,7 +264,7 @@ public class DefaultConfiguration implements Configuration {
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(LocaleProviderFactory.class, DefaultLocaleProviderFactory.class, Scope.SINGLETON);
builder.factory(ObjectTypeDeterminer.class, DefaultObjectTypeDeterminer.class, Scope.SINGLETON);
builder.factory(PropertyAccessor.class, CompoundRoot.class.getName(), CompoundRootAccessor.class, Scope.SINGLETON);
http://git-wip-us.apache.org/repos/asf/struts/blob/4b022bfb/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 853f50e..5c912e1 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
@@ -2,6 +2,8 @@ package com.opensymphony.xwork2.config.providers;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.DefaultActionProxyFactory;
+import com.opensymphony.xwork2.DefaultLocaleProviderFactory;
+import com.opensymphony.xwork2.LocaleProviderFactory;
import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.factory.DefaultUnknownHandlerFactory;
import com.opensymphony.xwork2.factory.UnknownHandlerFactory;
@@ -186,7 +188,7 @@ public class XWorkConfigurationProvider implements ConfigurationProvider {
.factory(TextProvider.class, "system", DefaultTextProvider.class, Scope.SINGLETON)
.factory(TextProvider.class, TextProviderSupport.class, Scope.SINGLETON)
- .factory(LocaleProvider.class, DefaultLocaleProvider.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)
http://git-wip-us.apache.org/repos/asf/struts/blob/4b022bfb/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java
index 8b3a9a6..f191680 100644
--- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java
+++ b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java
@@ -32,6 +32,7 @@ package com.opensymphony.xwork2.conversion.impl;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.LocaleProvider;
+import com.opensymphony.xwork2.LocaleProviderFactory;
import com.opensymphony.xwork2.conversion.TypeConverter;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
@@ -349,7 +350,8 @@ public abstract class DefaultTypeConverter implements TypeConverter {
locale = (Locale) context.get(ActionContext.LOCALE);
}
if (locale == null) {
- locale = container.getInstance(LocaleProvider.class).getLocale();
+ LocaleProviderFactory localeProviderFactory = container.getInstance(LocaleProviderFactory.class);
+ locale = localeProviderFactory.createLocaleProvider().getLocale();
}
return locale;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/4b022bfb/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
index 90812bd..b8921e9 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
@@ -253,18 +253,30 @@ public class DelegatingValidatorContext implements ValidatorContext {
* An implementation of LocaleProvider which gets the locale from the action context.
*/
private static class ActionContextLocaleProvider implements LocaleProvider {
+
+ private LocaleProvider localeProvider;
+
+ private LocaleProvider getLocaleProvider() {
+ if (localeProvider == null) {
+ LocaleProviderFactory localeProviderFactory = ActionContext.getContext().getInstance(LocaleProviderFactory.class);
+ localeProvider = localeProviderFactory.createLocaleProvider();
+ }
+ return localeProvider;
+ }
+
+ @Override
public Locale getLocale() {
- return ActionContext.getContext().getInstance(LocaleProvider.class).getLocale();
+ return getLocaleProvider().getLocale();
}
@Override
public boolean isValidLocaleString(String localeStr) {
- return ActionContext.getContext().getInstance(LocaleProvider.class).isValidLocaleString(localeStr);
+ return getLocaleProvider().isValidLocaleString(localeStr);
}
@Override
public boolean isValidLocale(Locale locale) {
- return ActionContext.getContext().getInstance(LocaleProvider.class).isValidLocale(locale);
+ return getLocaleProvider().isValidLocale(locale);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/4b022bfb/core/src/main/java/org/apache/struts2/StrutsConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index 3d898ce..1160d88 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -201,8 +201,12 @@ public final class StrutsConstants {
public static final String STRUTS_XWORKTEXTPROVIDER = "struts.xworkTextProvider";
/** The {@link com.opensymphony.xwork2.LocaleProvider} implementation class */
+ @Deprecated
public static final String STRUTS_LOCALE_PROVIDER = "struts.localeProvider";
+ /** The {@link com.opensymphony.xwork2.LocaleProviderFactory} implementation class */
+ public static final String STRUTS_LOCALE_PROVIDER_FACTORY = "struts.localeProviderFactory";
+
/** The name of the parameter to create when mapping an id (used by some action mappers) */
public static final String STRUTS_ID_PARAMETER_NAME = "struts.mapper.idParameterName";
http://git-wip-us.apache.org/repos/asf/struts/blob/4b022bfb/core/src/main/java/org/apache/struts2/components/I18n.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/components/I18n.java b/core/src/main/java/org/apache/struts2/components/I18n.java
index f934a3e..89e38bb 100644
--- a/core/src/main/java/org/apache/struts2/components/I18n.java
+++ b/core/src/main/java/org/apache/struts2/components/I18n.java
@@ -24,6 +24,7 @@ package org.apache.struts2.components;
import java.io.Writer;
import java.util.ResourceBundle;
+import com.opensymphony.xwork2.LocaleProviderFactory;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.StrutsException;
@@ -109,8 +110,8 @@ public class I18n extends Component {
}
@Inject
- public void setLocaleProvider(LocaleProvider localeProvider) {
- this.localeProvider = localeProvider;
+ public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) {
+ this.localeProvider = localeProviderFactory.createLocaleProvider();
}
public boolean start(Writer writer) {
http://git-wip-us.apache.org/repos/asf/struts/blob/4b022bfb/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
index a89ae9a..a72bd11 100644
--- a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -22,6 +22,7 @@
package org.apache.struts2.config;
import com.opensymphony.xwork2.ActionProxyFactory;
+import com.opensymphony.xwork2.LocaleProviderFactory;
import com.opensymphony.xwork2.LocalizedTextProvider;
import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.factory.UnknownHandlerFactory;
@@ -29,7 +30,6 @@ import com.opensymphony.xwork2.security.AcceptedPatternsChecker;
import com.opensymphony.xwork2.security.ExcludedPatternsChecker;
import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.FileManagerFactory;
-import com.opensymphony.xwork2.LocaleProvider;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.TextProvider;
import com.opensymphony.xwork2.UnknownHandlerManager;
@@ -221,7 +221,13 @@ import org.apache.struts2.views.velocity.VelocityManager;
* <td>com.opensymphony.xwork2.LocaleProvider</td>
* <td>struts.localeProvider</td>
* <td>singleton</td>
- * <td>Allows provide custom TextProvider for whole application</td>
+ * <td>DEPRECATED! Allows provide custom TextProvider for whole application</td>
+ * </tr>
+ * <tr>
+ * <td>com.opensymphony.xwork2.LocaleProviderFactory</td>
+ * <td>struts.localeProviderFactory</td>
+ * <td>singleton</td>
+ * <td>Allows provide custom LocaleProvider for whole application</td>
* </tr>
* <tr>
* <td>org.apache.struts2.components.UrlRenderer</td>
@@ -393,7 +399,7 @@ public class DefaultBeanSelectionProvider extends AbstractBeanSelectionProvider
alias(TextProvider.class, StrutsConstants.STRUTS_XWORKTEXTPROVIDER, builder, props, Scope.PROTOTYPE);
alias(TextProviderFactory.class, StrutsConstants.STRUTS_TEXT_PROVIDER_FACTORY, builder, props, Scope.PROTOTYPE);
- alias(LocaleProvider.class, StrutsConstants.STRUTS_LOCALE_PROVIDER, builder, props);
+ alias(LocaleProviderFactory.class, StrutsConstants.STRUTS_LOCALE_PROVIDER_FACTORY, builder, props);
alias(LocalizedTextProvider.class, StrutsConstants.STRUTS_LOCALIZED_TEXT_PROVIDER, builder, props);
alias(ActionProxyFactory.class, StrutsConstants.STRUTS_ACTIONPROXYFACTORY, builder, props);
http://git-wip-us.apache.org/repos/asf/struts/blob/4b022bfb/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index 047238f..b7714be 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -783,9 +783,16 @@ public class Dispatcher {
String content_type = request.getContentType();
if (content_type != null && content_type.contains("multipart/form-data")) {
- MultiPartRequest mpr = getMultiPartRequest();
- LocaleProvider provider = getContainer().getInstance(LocaleProvider.class);
- request = new MultiPartRequestWrapper(mpr, request, getSaveDir(), provider, disableRequestAttributeValueStackLookup);
+ MultiPartRequest multiPartRequest = getMultiPartRequest();
+ LocaleProviderFactory localeProviderFactory = getContainer().getInstance(LocaleProviderFactory.class);
+
+ request = new MultiPartRequestWrapper(
+ multiPartRequest,
+ request,
+ getSaveDir(),
+ localeProviderFactory.createLocaleProvider(),
+ disableRequestAttributeValueStackLookup
+ );
} else {
request = new StrutsRequestWrapper(request, disableRequestAttributeValueStackLookup);
}
http://git-wip-us.apache.org/repos/asf/struts/blob/4b022bfb/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
index 6c3f1f3..cc20523 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
@@ -1,6 +1,7 @@
package org.apache.struts2.dispatcher.multipart;
import com.opensymphony.xwork2.LocaleProvider;
+import com.opensymphony.xwork2.LocaleProviderFactory;
import com.opensymphony.xwork2.inject.Inject;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -70,12 +71,9 @@ public abstract class AbstractMultiPartRequest implements MultiPartRequest {
this.maxSize = Long.parseLong(maxSize);
}
- /**
- * @param provider Injects the Struts locale provider.
- */
@Inject
- public void setLocaleProvider(LocaleProvider provider) {
- defaultLocale = provider.getLocale();
+ public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) {
+ defaultLocale = localeProviderFactory.createLocaleProvider().getLocale();
}
/**
http://git-wip-us.apache.org/repos/asf/struts/blob/4b022bfb/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
index a428b53..b00f2e3 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
@@ -455,7 +455,8 @@ public class FileUploadInterceptor extends AbstractInterceptor {
if (action instanceof LocaleProvider) {
localeProvider = (LocaleProvider) action;
} else {
- localeProvider = container.getInstance(LocaleProvider.class);
+ LocaleProviderFactory localeProviderFactory = container.getInstance(LocaleProviderFactory.class);
+ localeProvider = localeProviderFactory.createLocaleProvider();
}
return localeProvider;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/4b022bfb/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
index 4b6c8f5..f97176f 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
@@ -22,6 +22,7 @@ package org.apache.struts2.interceptor;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.LocaleProvider;
+import com.opensymphony.xwork2.LocaleProviderFactory;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import com.opensymphony.xwork2.util.DefaultLocalizedTextProvider;
@@ -93,8 +94,8 @@ public class I18nInterceptor extends AbstractInterceptor {
}
@Inject
- public void setLocaleProvider(LocaleProvider localeProvider) {
- this.localeProvider = localeProvider;
+ public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) {
+ this.localeProvider = localeProviderFactory.createLocaleProvider();
}
@Override
http://git-wip-us.apache.org/repos/asf/struts/blob/4b022bfb/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 1f516b7..3a4f6ee 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -133,7 +133,7 @@
<bean type="com.opensymphony.xwork2.TextProviderFactory" name="struts" class="com.opensymphony.xwork2.TextProviderFactory" scope="prototype" />
<bean type="com.opensymphony.xwork2.LocalizedTextProvider" name="struts" class="com.opensymphony.xwork2.util.DefaultLocalizedTextProvider" scope="singleton" />
<bean type="com.opensymphony.xwork2.TextProvider" name="struts" class="com.opensymphony.xwork2.TextProviderSupport" scope="prototype" />
- <bean type="com.opensymphony.xwork2.LocaleProvider" name="struts" class="com.opensymphony.xwork2.DefaultLocaleProvider" scope="singleton" />
+ <bean type="com.opensymphony.xwork2.LocaleProviderFactory" name="struts" class="com.opensymphony.xwork2.DefaultLocaleProviderFactory" scope="singleton" />
<bean type="org.apache.struts2.components.UrlRenderer" name="struts" class="org.apache.struts2.components.ServletUrlRenderer"/>
<bean type="org.apache.struts2.views.util.UrlHelper" name="struts" class="org.apache.struts2.views.util.DefaultUrlHelper"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/4b022bfb/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java
----------------------------------------------------------------------
diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java
index 2c0ef9d..e75cd48 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesLocaleResolver.java
@@ -21,6 +21,7 @@ package org.apache.struts2.tiles;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.LocaleProvider;
+import com.opensymphony.xwork2.LocaleProviderFactory;
import com.opensymphony.xwork2.config.ConfigurationException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -46,9 +47,9 @@ public class StrutsTilesLocaleResolver implements LocaleResolver {
throw new ConfigurationException("There is no ActionContext for current request!");
}
- LocaleProvider provider = ctx.getInstance(LocaleProvider.class);
+ LocaleProviderFactory localeProviderFactory = ctx.getInstance(LocaleProviderFactory.class);
- return provider.getLocale();
+ return localeProviderFactory.createLocaleProvider().getLocale();
}
}
[09/12] struts git commit: Adds proper deprecation explanation
Posted by lu...@apache.org.
Adds proper deprecation explanation
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5452f566
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5452f566
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5452f566
Branch: refs/heads/master
Commit: 5452f5664876981dcb537d1dc18db8b2b5781757
Parents: c815f5c
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Mar 15 18:58:42 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Mar 15 18:58:42 2017 +0100
----------------------------------------------------------------------
core/src/main/java/org/apache/struts2/StrutsConstants.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/5452f566/core/src/main/java/org/apache/struts2/StrutsConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index 1160d88..a868edd 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -200,7 +200,10 @@ public final class StrutsConstants {
/** XWork default text provider */
public static final String STRUTS_XWORKTEXTPROVIDER = "struts.xworkTextProvider";
- /** The {@link com.opensymphony.xwork2.LocaleProvider} implementation class */
+ /**
+ * The {@link com.opensymphony.xwork2.LocaleProvider} implementation class
+ * @deprecated use {@link StrutsConstants#STRUTS_LOCALE_PROVIDER_FACTORY} instead
+ */
@Deprecated
public static final String STRUTS_LOCALE_PROVIDER = "struts.localeProvider";
[06/12] struts git commit: Fixes test
Posted by lu...@apache.org.
Fixes test
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f912dab8
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f912dab8
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f912dab8
Branch: refs/heads/master
Commit: f912dab8f3c77ef9667370c57cf8d35cf0cf4a32
Parents: 4b022bf
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Mar 15 09:18:24 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Mar 15 09:18:24 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/struts2/interceptor/I18nInterceptorTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/f912dab8/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java
index d8c5944..4bbaa46 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java
@@ -24,6 +24,7 @@ import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.DefaultLocaleProvider;
+import com.opensymphony.xwork2.DefaultLocaleProviderFactory;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import com.opensymphony.xwork2.mock.MockActionProxy;
import junit.framework.TestCase;
@@ -217,7 +218,7 @@ public class I18nInterceptorTest extends TestCase {
public void setUp() throws Exception {
interceptor = new I18nInterceptor();
- interceptor.setLocaleProvider(new DefaultLocaleProvider());
+ interceptor.setLocaleProviderFactory(new DefaultLocaleProviderFactory());
interceptor.init();
session = new HashMap();
[02/12] struts git commit: Adds default implementation of the factory
Posted by lu...@apache.org.
Adds default implementation of the factory
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/636821aa
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/636821aa
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/636821aa
Branch: refs/heads/master
Commit: 636821aa2dfc32a4531b6e65717c38625bb5b4cc
Parents: b42b9f1
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Mar 15 08:46:37 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Mar 15 08:46:37 2017 +0100
----------------------------------------------------------------------
.../opensymphony/xwork2/DefaultLocaleProviderFactory.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/636821aa/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProviderFactory.java
new file mode 100644
index 0000000..7abb64f
--- /dev/null
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProviderFactory.java
@@ -0,0 +1,10 @@
+package com.opensymphony.xwork2;
+
+public class DefaultLocaleProviderFactory implements LocaleProviderFactory {
+
+ @Override
+ public LocaleProvider createLocaleProvider() {
+ return new DefaultLocaleProvider();
+ }
+
+}