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/24 09:09:56 UTC
[01/16] struts git commit: Adds missing class header with license
Repository: struts
Updated Branches:
refs/heads/master 3d3bee021 -> 350c77aba
Adds missing class header with license
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4f46f151
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4f46f151
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4f46f151
Branch: refs/heads/master
Commit: 4f46f151844bcef39cd631a6fb1cd781fd34224a
Parents: 9d60f5b
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Mar 16 14:39:06 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Mar 16 14:39:06 2017 +0100
----------------------------------------------------------------------
.../opensymphony/xwork2/DefaultLocaleProvider.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/4f46f151/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 19c8f5d..7fbc2bc 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
@@ -1,3 +1,18 @@
+/*
+ * 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;
import com.opensymphony.xwork2.util.DefaultLocalizedTextProvider;
[14/16] struts git commit: Increases visibility to allow reuse fields
when subclassing
Posted by lu...@apache.org.
Increases visibility to allow reuse fields when subclassing
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e9d7cd09
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e9d7cd09
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e9d7cd09
Branch: refs/heads/master
Commit: e9d7cd09db646fecb6cfd99d6523ec7d87b5b2bc
Parents: 0378161
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 17 09:19:23 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 17 09:19:23 2017 +0100
----------------------------------------------------------------------
.../com/opensymphony/xwork2/TextProviderSupport.java | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/e9d7cd09/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 528a910..d63291a 100644
--- a/core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
@@ -29,16 +29,10 @@ import java.util.*;
*/
public class TextProviderSupport implements ResourceBundleTextProvider {
- private Class clazz;
- private LocaleProvider localeProvider;
- private ResourceBundle bundle;
- private LocalizedTextProvider localizedTextProvider;
-
- /**
- * Default constructor
- */
- public TextProviderSupport() {
- }
+ protected Class clazz;
+ protected LocaleProvider localeProvider;
+ protected ResourceBundle bundle;
+ protected LocalizedTextProvider localizedTextProvider;
/**
* Constructor.
[08/16] struts git commit: Drops unavailable dependency
Posted by lu...@apache.org.
Drops unavailable dependency
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ee6c927d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ee6c927d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ee6c927d
Branch: refs/heads/master
Commit: ee6c927db6663741c3d0179e16687704359ea40c
Parents: 944b1a2
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 17 08:02:24 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 17 08:02:24 2017 +0100
----------------------------------------------------------------------
.../xwork2/StrutsTextProviderFactory.java | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/ee6c927d/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
index 7c703b7..9743b65 100644
--- a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
+++ b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
@@ -27,16 +27,10 @@ import java.util.ResourceBundle;
*/
public class StrutsTextProviderFactory implements TextProviderFactory {
- private TextProvider textProvider;
private LocaleProviderFactory localeProviderFactory;
private LocalizedTextProvider localizedTextProvider;
@Inject
- public void setTextProvider(TextProvider textProvider) {
- this.textProvider = textProvider;
- }
-
- @Inject
public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) {
this.localeProviderFactory = localeProviderFactory;
}
@@ -67,18 +61,11 @@ public class StrutsTextProviderFactory implements TextProviderFactory {
}
protected TextProvider getTextProvider(Class clazz) {
- if (this.textProvider == null) {
- return new TextProviderSupport(clazz, localeProviderFactory.createLocaleProvider(), localizedTextProvider);
- } else {
- return textProvider;
- }
+ return new TextProviderSupport(clazz, localeProviderFactory.createLocaleProvider(), localizedTextProvider);
}
private TextProvider getTextProvider(ResourceBundle bundle) {
- if (this.textProvider == null) {
- return new TextProviderSupport(bundle, localeProviderFactory.createLocaleProvider(), localizedTextProvider);
- }
- return textProvider;
+ return new TextProviderSupport(bundle, localeProviderFactory.createLocaleProvider(), localizedTextProvider);
}
}
[07/16] struts git commit: Injects proper dependencies into tag
Posted by lu...@apache.org.
Injects proper dependencies into tag
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/944b1a23
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/944b1a23
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/944b1a23
Branch: refs/heads/master
Commit: 944b1a2303536023973456d6685f9ab86a775cb0
Parents: 16d1d60
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 17 07:59:50 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 17 07:59:50 2017 +0100
----------------------------------------------------------------------
.../org/apache/struts2/components/I18n.java | 27 ++++++++++++--------
1 file changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/944b1a23/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 faacea4..497fff8 100644
--- a/core/src/main/java/org/apache/struts2/components/I18n.java
+++ b/core/src/main/java/org/apache/struts2/components/I18n.java
@@ -90,28 +90,35 @@ public class I18n extends Component {
protected boolean pushed;
protected String name;
- protected Container container;
+
+ private LocalizedTextProvider localizedTextProvider;
private TextProvider textProvider;
private TextProvider defaultTextProvider;
- private LocaleProvider localeProvider;
+ private LocaleProviderFactory localeProviderFactory;
+ private TextProviderFactory textProviderFactory;
public I18n(ValueStack stack) {
super(stack);
}
-
+
@Inject
- public void setContainer(Container container) {
- this.container = container;
+ public void setLocalizedTextProvider(LocalizedTextProvider localizedTextProvider) {
+ this.localizedTextProvider = localizedTextProvider;
}
- @Inject
+ @Inject("system")
public void setTextProvider(TextProvider textProvider) {
this.defaultTextProvider = textProvider;
}
@Inject
+ public void setTextProviderFactory(TextProviderFactory textProviderFactory) {
+ this.textProviderFactory = textProviderFactory;
+ }
+
+ @Inject
public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) {
- this.localeProvider = localeProviderFactory.createLocaleProvider();
+ this.localeProviderFactory = localeProviderFactory;
}
public boolean start(Writer writer) {
@@ -122,12 +129,12 @@ public class I18n extends Component {
ResourceBundle bundle = defaultTextProvider.getTexts(name);
if (bundle == null) {
- bundle = container.getInstance(LocalizedTextProvider.class).findResourceBundle(name, localeProvider.getLocale());
+ LocaleProvider localeProvider = localeProviderFactory.createLocaleProvider();
+ bundle = localizedTextProvider.findResourceBundle(name, localeProvider.getLocale());
}
if (bundle != null) {
- TextProviderFactory tpf = container.getInstance(TextProviderFactory.class);
- textProvider = tpf.createInstance(bundle);
+ textProvider = textProviderFactory.createInstance(bundle);
getStack().push(textProvider);
pushed = true;
}
[11/16] struts git commit: Updates test to use the new injectable
factory
Posted by lu...@apache.org.
Updates test to use the new injectable factory
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e8a598c7
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e8a598c7
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e8a598c7
Branch: refs/heads/master
Commit: e8a598c7bc83752f488ad4ccccd0d11a64df3f03
Parents: 132829c
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 17 08:03:48 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 17 08:03:48 2017 +0100
----------------------------------------------------------------------
.../java/com/opensymphony/xwork2/CompositeTextProviderTest.java | 3 +--
.../xwork2/validator/AnnotationActionValidatorManagerTest.java | 3 +--
.../RepopulateConversionErrorFieldValidatorSupportTest.java | 2 +-
.../validator/validators/AppendingValidatorContextTest.java | 3 +--
4 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/e8a598c7/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java b/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
index ab5c170..3b5f30c 100644
--- a/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
@@ -77,8 +77,7 @@ public class CompositeTextProviderTest extends XWorkTestCase {
protected void setUp() throws Exception {
super.setUp();
- StrutsTextProviderFactory tpf = container.getInstance(StrutsTextProviderFactory.class);
- tpf.setTextProvider(null);
+ TextProviderFactory tpf = container.getInstance(TextProviderFactory.class);
ActionContext.getContext().setLocale(Locale.ENGLISH);
http://git-wip-us.apache.org/repos/asf/struts/blob/e8a598c7/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
index 8a9a4cd..89c21e3 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
@@ -24,7 +24,6 @@ import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.FileManagerFactory;
import com.opensymphony.xwork2.SimpleAction;
import com.opensymphony.xwork2.SimpleAnnotationAction;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.config.entities.ActionConfig;
@@ -82,7 +81,7 @@ public class AnnotationActionValidatorManagerTest extends XWorkTestCase {
ActionContext.getContext().setActionInvocation(invocation);
- tpf = container.getInstance(StrutsTextProviderFactory.class);
+ tpf = container.getInstance(TextProviderFactory.class);
}
@Override protected void tearDown() throws Exception {
http://git-wip-us.apache.org/repos/asf/struts/blob/e8a598c7/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
index c4aa178..51d8236 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
@@ -92,7 +92,7 @@ public class RepopulateConversionErrorFieldValidatorSupportTest extends XWorkTes
conversionErrors.put("someFieldName", conversionErrorValue);
conversionErrors.put("xxxsomeFieldName", conversionErrorValue);
- TextProviderFactory tpf = container.inject(TextProviderFactory.class);
+ TextProviderFactory tpf = container.getInstance(TextProviderFactory.class);
action = container.inject(ActionSupport.class);
validator1 =
http://git-wip-us.apache.org/repos/asf/struts/blob/e8a598c7/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
index 52b331a..0446e97 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
@@ -6,7 +6,6 @@ import java.util.Map;
import com.opensymphony.xwork2.CompositeTextProvider;
import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.validator.DelegatingValidatorContext;
@@ -29,7 +28,7 @@ public class AppendingValidatorContextTest extends XWorkTestCase {
super.setUp();
action = container.inject(VisitorValidatorTestAction.class);
- TextProviderFactory tpf = container.getInstance(StrutsTextProviderFactory.class);
+ TextProviderFactory tpf = container.getInstance(TextProviderFactory.class);
ValidatorContext vc1 = new DelegatingValidatorContext(action, tpf);
VisitorFieldValidator.AppendingValidatorContext vc2 = new AppendingValidatorContext(vc1, createTextProvider(action, vc1), FIRST_NAME, "");
[04/16] struts git commit: Uses existing instance instead of creating
a new one
Posted by lu...@apache.org.
Uses existing instance instead of creating a new one
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3b73544a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3b73544a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3b73544a
Branch: refs/heads/master
Commit: 3b73544a8ff5e9d96885147bf25c7c2598ac6b21
Parents: 5497422
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 17 07:49:33 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 17 07:49:33 2017 +0100
----------------------------------------------------------------------
core/src/main/java/com/opensymphony/xwork2/ActionSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/3b73544a/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 0434469..cb1ac47 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
@@ -275,7 +275,7 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex
*/
protected TextProvider getTextProvider() {
if (textProvider == null) {
- TextProviderFactory tpf = container.inject(TextProviderFactory.class);
+ TextProviderFactory tpf = container.getInstance(TextProviderFactory.class);
textProvider = tpf.createInstance(getClass());
}
return textProvider;
[03/16] struts git commit: Extracts TextProviderFactory interface
Posted by lu...@apache.org.
Extracts TextProviderFactory interface
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/54974223
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/54974223
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/54974223
Branch: refs/heads/master
Commit: 54974223fa1f6a66d8c1d61b7b18c94ef5c50386
Parents: 9376bb0
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Mar 16 14:55:35 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Mar 16 14:55:35 2017 +0100
----------------------------------------------------------------------
.../xwork2/StrutsTextProviderFactory.java | 4 ++-
.../xwork2/TextProviderFactory.java | 26 ++++++++++++++++++++
.../AnnotationActionValidatorManager.java | 4 +--
.../DefaultActionValidatorManager.java | 6 ++---
.../validator/DelegatingValidatorContext.java | 4 +--
.../validator/validators/ValidatorSupport.java | 16 ++++++------
.../org/apache/struts2/components/I18n.java | 8 +++---
.../interceptor/FileUploadInterceptor.java | 2 +-
core/src/main/resources/struts-default.xml | 3 +--
.../AnnotationActionValidatorManagerTest.java | 3 ++-
.../ConversionErrorFieldValidatorTest.java | 4 +--
.../validator/DoubleRangeValidatorTest.java | 4 +--
.../xwork2/validator/DummyValidatorContext.java | 4 +--
.../xwork2/validator/EmailValidatorTest.java | 6 ++---
.../validator/ExpressionValidatorTest.java | 4 +--
.../validator/RegexFieldValidatorTest.java | 6 ++---
...onversionErrorFieldValidatorSupportTest.java | 4 +--
.../validator/SimpleActionValidationTest.java | 2 +-
.../StringLengthFieldValidatorTest.java | 4 +--
.../xwork2/validator/StringValidatorTest.java | 6 ++---
.../xwork2/validator/URLValidatorTest.java | 6 ++---
.../AppendingValidatorContextTest.java | 3 ++-
.../validators/DateRangeFieldValidatorTest.java | 6 ++---
.../validators/IntRangeFieldValidatorTest.java | 6 ++---
.../validators/LongRangeFieldValidatorTest.java | 6 ++---
.../validators/RequiredStringValidatorTest.java | 6 ++---
.../ShortRangeFieldValidatorTest.java | 6 ++---
.../interceptor/BeanValidationInterceptor.java | 6 ++---
.../interceptor/OValValidationInterceptor.java | 6 ++---
.../struts2/tiles/I18NAttributeEvaluator.java | 4 +--
30 files changed, 102 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
index c5123af..7c703b7 100644
--- a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
+++ b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
@@ -25,7 +25,7 @@ import java.util.ResourceBundle;
* @author Oleg Gorobets
* @author Rene Gielen
*/
-public class StrutsTextProviderFactory {
+public class StrutsTextProviderFactory implements TextProviderFactory {
private TextProvider textProvider;
private LocaleProviderFactory localeProviderFactory;
@@ -46,6 +46,7 @@ public class StrutsTextProviderFactory {
this.localizedTextProvider = localizedTextProvider;
}
+ @Override
public TextProvider createInstance(Class clazz) {
TextProvider instance = getTextProvider(clazz);
if (instance instanceof ResourceBundleTextProvider) {
@@ -55,6 +56,7 @@ public class StrutsTextProviderFactory {
return instance;
}
+ @Override
public TextProvider createInstance(ResourceBundle bundle) {
TextProvider instance = getTextProvider(bundle);
if (instance instanceof ResourceBundleTextProvider) {
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/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
new file mode 100644
index 0000000..e9b0623
--- /dev/null
+++ b/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2002-2007,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;
+
+import java.util.ResourceBundle;
+
+public interface TextProviderFactory {
+
+ TextProvider createInstance(Class clazz);
+
+ TextProvider createInstance(ResourceBundle bundle);
+
+}
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java b/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
index 2e0fc30..cd6fa4e 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
@@ -52,7 +52,7 @@ public class AnnotationActionValidatorManager implements ActionValidatorManager
private ValidatorFileParser validatorFileParser;
private FileManager fileManager;
private boolean reloadingConfigs;
- private StrutsTextProviderFactory textProviderFactory;
+ private TextProviderFactory textProviderFactory;
@Inject
public void setValidatorFactory(ValidatorFactory fac) {
@@ -75,7 +75,7 @@ public class AnnotationActionValidatorManager implements ActionValidatorManager
}
@Inject
- public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) {
+ public void setTextProviderFactory(TextProviderFactory textProviderFactory) {
this.textProviderFactory = textProviderFactory;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java b/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
index 85237c9..48d552a 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
@@ -18,7 +18,7 @@ package com.opensymphony.xwork2.validator;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.FileManagerFactory;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.XWorkConstants;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
@@ -63,7 +63,7 @@ public class DefaultActionValidatorManager implements ActionValidatorManager {
private ValidatorFileParser validatorFileParser;
private FileManager fileManager;
private boolean reloadingConfigs;
- private StrutsTextProviderFactory textProviderFactory;
+ private TextProviderFactory textProviderFactory;
@Inject
public void setValidatorFileParser(ValidatorFileParser parser) {
@@ -86,7 +86,7 @@ public class DefaultActionValidatorManager implements ActionValidatorManager {
}
@Inject
- public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) {
+ public void setTextProviderFactory(TextProviderFactory textProviderFactory) {
this.textProviderFactory = textProviderFactory;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/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 3c75e2b..0e3fe97 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
@@ -57,7 +57,7 @@ public class DelegatingValidatorContext implements ValidatorContext {
*
* @param object the object to use for validation (usually an Action).
*/
- public DelegatingValidatorContext(Object object, StrutsTextProviderFactory textProviderFactory) {
+ public DelegatingValidatorContext(Object object, TextProviderFactory textProviderFactory) {
this.localeProvider = makeLocaleProvider(object);
this.validationAware = makeValidationAware(object);
this.textProvider = makeTextProvider(object, textProviderFactory);
@@ -196,7 +196,7 @@ public class DelegatingValidatorContext implements ValidatorContext {
return validationAware.hasFieldErrors();
}
- public TextProvider makeTextProvider(Object object, StrutsTextProviderFactory textProviderFactory) {
+ public TextProvider makeTextProvider(Object object, TextProviderFactory textProviderFactory) {
// the object argument passed through here will most probably be an ActionSupport descendant which does
// implements TextProvider.
if (object != null && object instanceof DelegatingValidatorContext) {
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java
index f99db43..2173a2f 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java
@@ -15,7 +15,7 @@
*/
package com.opensymphony.xwork2.validator.validators;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.TextParseUtil;
import com.opensymphony.xwork2.util.ValueStack;
@@ -37,20 +37,20 @@ import java.util.List;
*/
public abstract class ValidatorSupport implements Validator, ShortCircuitableValidator {
- protected final Logger log = LogManager.getLogger(this.getClass());
+ private static final Logger LOG = LogManager.getLogger(ValidatorSupport.class);
- protected String defaultMessage = "";
- protected String messageKey;
private ValidatorContext validatorContext;
private boolean shortCircuit;
private String type;
private String[] messageParameters;
- protected ValueStack stack;
- protected StrutsTextProviderFactory textProviderFactory;
+ protected String defaultMessage = "";
+ protected String messageKey;
+ protected ValueStack stack;
+ protected TextProviderFactory textProviderFactory;
@Inject
- public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) {
+ public void setTextProviderFactory(TextProviderFactory textProviderFactory) {
this.textProviderFactory = textProviderFactory;
}
@@ -97,7 +97,7 @@ public abstract class ValidatorSupport implements Validator, ShortCircuitableVal
} catch (Exception e) {
// if there's an exception in parsing, we'll just treat the expression itself as the
// parameter
- log.warn("exception while parsing message parameter [{}]", messageParameter, e);
+ LOG.warn("exception while parsing message parameter [{}]", messageParameter, e);
parsedMessageParameters.add(messageParameter);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/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 6d173ef..faacea4 100644
--- a/core/src/main/java/org/apache/struts2/components/I18n.java
+++ b/core/src/main/java/org/apache/struts2/components/I18n.java
@@ -25,16 +25,16 @@ import java.io.Writer;
import java.util.ResourceBundle;
import com.opensymphony.xwork2.LocaleProviderFactory;
+import com.opensymphony.xwork2.LocalizedTextProvider;
+import com.opensymphony.xwork2.TextProviderFactory;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.StrutsException;
import com.opensymphony.xwork2.LocaleProvider;
import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.DefaultLocalizedTextProvider;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -122,11 +122,11 @@ public class I18n extends Component {
ResourceBundle bundle = defaultTextProvider.getTexts(name);
if (bundle == null) {
- bundle = container.getInstance(DefaultLocalizedTextProvider.class).findResourceBundle(name, localeProvider.getLocale());
+ bundle = container.getInstance(LocalizedTextProvider.class).findResourceBundle(name, localeProvider.getLocale());
}
if (bundle != null) {
- StrutsTextProviderFactory tpf = container.inject(StrutsTextProviderFactory.class);
+ TextProviderFactory tpf = container.getInstance(TextProviderFactory.class);
textProvider = tpf.createInstance(bundle);
getStack().push(textProvider);
pushed = true;
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/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 138b033..a392813 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
@@ -446,7 +446,7 @@ public class FileUploadInterceptor extends AbstractInterceptor {
}
private TextProvider getTextProvider(Object action) {
- StrutsTextProviderFactory tpf = container.inject(StrutsTextProviderFactory.class);
+ TextProviderFactory tpf = container.getInstance(TextProviderFactory.class);
return tpf.createInstance(action.getClass());
}
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/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 b0c0769..72d6a69 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -130,9 +130,8 @@
<bean type="com.opensymphony.xwork2.conversion.impl.NumberConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.NumberConverter" scope="singleton"/>
<bean type="com.opensymphony.xwork2.conversion.impl.StringConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.StringConverter" scope="singleton"/>
- <bean type="com.opensymphony.xwork2.StrutsTextProviderFactory" name="struts" class="com.opensymphony.xwork2.StrutsTextProviderFactory" 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.TextProviderFactory" name="struts" class="com.opensymphony.xwork2.StrutsTextProviderFactory" 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"/>
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
index c2b3ba2..8a9a4cd 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
@@ -25,6 +25,7 @@ import com.opensymphony.xwork2.FileManagerFactory;
import com.opensymphony.xwork2.SimpleAction;
import com.opensymphony.xwork2.SimpleAnnotationAction;
import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.test.AnnotationDataAware2;
@@ -59,7 +60,7 @@ public class AnnotationActionValidatorManagerTest extends XWorkTestCase {
protected final String alias = "annotationValidationAlias";
AnnotationActionValidatorManager annotationActionValidatorManager;
- private StrutsTextProviderFactory tpf;
+ private TextProviderFactory tpf;
@Override protected void setUp() throws Exception {
super.setUp();
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
index 9cdeac0..411dbf8 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
@@ -16,7 +16,7 @@
package com.opensymphony.xwork2.validator;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.interceptor.ValidationAware;
import com.opensymphony.xwork2.ValidationAwareSupport;
import com.opensymphony.xwork2.XWorkTestCase;
@@ -53,7 +53,7 @@ public class ConversionErrorFieldValidatorTest extends XWorkTestCase {
validator = new ConversionErrorFieldValidator();
validationAware = new ValidationAwareSupport();
- DelegatingValidatorContext validatorContext = new DelegatingValidatorContext(validationAware, container.inject(StrutsTextProviderFactory.class));
+ DelegatingValidatorContext validatorContext = new DelegatingValidatorContext(validationAware, container.getInstance(TextProviderFactory.class));
stack.push(validatorContext);
validator.setValidatorContext(validatorContext);
validator.setFieldName("foo");
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
index bd3d9da..e60d247 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
*/
public class DoubleRangeValidatorTest extends XWorkTestCase {
private DoubleRangeFieldValidator val;
- private StrutsTextProviderFactory tpf;
+ private TextProviderFactory tpf;
public void testRangeValidationWithError() throws Exception {
//Explicitly set an out-of-range double for DoubleRangeValidatorTest
@@ -237,7 +237,7 @@ public class DoubleRangeValidatorTest extends XWorkTestCase {
val = new DoubleRangeFieldValidator();
val.setValueStack(ActionContext.getContext().getValueStack());
ActionContext.getContext().setParameters(HttpParameters.create().build());
- tpf = container.inject(StrutsTextProviderFactory.class);
+ tpf = container.getInstance(TextProviderFactory.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java b/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java
index d9e138c..e0f5f33 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java
@@ -15,7 +15,7 @@
*/
package com.opensymphony.xwork2.validator;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import java.util.*;
@@ -33,7 +33,7 @@ public class DummyValidatorContext extends DelegatingValidatorContext {
private Map<String, List<String>> fieldErrors;
- public DummyValidatorContext(Object object, StrutsTextProviderFactory tpf) {
+ public DummyValidatorContext(Object object, TextProviderFactory tpf) {
super(object, tpf);
}
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
index 5a66920..dffad12 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
@@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.validator.validators.EmailValidator;
@@ -30,7 +30,7 @@ import com.opensymphony.xwork2.validator.validators.EmailValidator;
*/
public class EmailValidatorTest extends XWorkTestCase {
- private StrutsTextProviderFactory tpf;
+ private TextProviderFactory tpf;
public void testEmailValidity() throws Exception {
assertTrue(verifyEmailValidity("TmJee@Yahoo.com"));
@@ -162,6 +162,6 @@ public class EmailValidatorTest extends XWorkTestCase {
public void setUp() throws Exception {
super.setUp();
- tpf = container.inject(StrutsTextProviderFactory.class);
+ tpf = container.getInstance(TextProviderFactory.class);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
index 7ce38c5..92c5a5a 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
@@ -38,7 +38,7 @@ import java.util.Map;
*/
public class ExpressionValidatorTest extends XWorkTestCase {
- private StrutsTextProviderFactory tpf;
+ private TextProviderFactory tpf;
public void testExpressionValidationOfStringLength() throws ValidationException {
TestBean bean = new TestBean();
@@ -139,7 +139,7 @@ public class ExpressionValidatorTest extends XWorkTestCase {
ActionContext.getContext().setActionInvocation(invocation);
- tpf = container.inject(StrutsTextProviderFactory.class);
+ tpf = container.getInstance(TextProviderFactory.class);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java
index 6dd8e3f..4fa50fd 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java
@@ -16,7 +16,7 @@
package com.opensymphony.xwork2.validator;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.validator.validators.RegexFieldValidator;
@@ -37,11 +37,11 @@ import java.util.List;
*/
public class RegexFieldValidatorTest extends XWorkTestCase {
- private StrutsTextProviderFactory tpf;
+ private TextProviderFactory tpf;
public void setUp() throws Exception {
super.setUp();
- tpf = container.inject(StrutsTextProviderFactory.class);
+ tpf = container.getInstance(TextProviderFactory.class);
}
public void testMatch() throws Exception {
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
index ad8418b..c4aa178 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
@@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import com.opensymphony.xwork2.util.ValueStack;
@@ -92,7 +92,7 @@ public class RepopulateConversionErrorFieldValidatorSupportTest extends XWorkTes
conversionErrors.put("someFieldName", conversionErrorValue);
conversionErrors.put("xxxsomeFieldName", conversionErrorValue);
- StrutsTextProviderFactory tpf = container.inject(StrutsTextProviderFactory.class);
+ TextProviderFactory tpf = container.inject(TextProviderFactory.class);
action = container.inject(ActionSupport.class);
validator1 =
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
index e737dde..06695ea 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
@@ -153,7 +153,7 @@ public class SimpleActionValidationTest extends XWorkTestCase {
SimpleAction action = new SimpleAction();
container.inject(action);
- ValidatorContext validatorContext = new DelegatingValidatorContext(action, container.inject(StrutsTextProviderFactory.class));
+ ValidatorContext validatorContext = new DelegatingValidatorContext(action, container.getInstance(TextProviderFactory.class));
validator.setValidatorContext(validatorContext);
validator.validate(this);
assertTrue(validatorContext.hasActionErrors());
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java
index b8f3472..ee6daf7 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java
@@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator;
@@ -163,7 +163,7 @@ public class StringLengthFieldValidatorTest extends XWorkTestCase {
validator = new StringLengthFieldValidator();
validator.setFieldName("myField");
validator.setMessageKey("error");
- validator.setValidatorContext(new DelegatingValidatorContext(action, container.inject(StrutsTextProviderFactory.class)));
+ validator.setValidatorContext(new DelegatingValidatorContext(action, container.getInstance(TextProviderFactory.class)));
validator.setMaxLength(5);
validator.setMinLength(2);
validator.setValueStack(valueStack);
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java
index 0ca581c..45a0211 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java
@@ -19,7 +19,7 @@ import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.ValidationAwareSupport;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.config.entities.ActionConfig;
@@ -37,7 +37,7 @@ import java.util.Map;
*/
public class StringValidatorTest extends XWorkTestCase {
- private StrutsTextProviderFactory tpf;
+ private TextProviderFactory tpf;
public void testRequiredStringWithNullValue() throws Exception {
Equidae equidae = new Equidae();
@@ -217,6 +217,6 @@ public class StringValidatorTest extends XWorkTestCase {
ActionContext.getContext().setActionInvocation(invocation);
- tpf = container.inject(StrutsTextProviderFactory.class);
+ tpf = container.getInstance(TextProviderFactory.class);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
index d377bc9..b961d78 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
@@ -16,7 +16,7 @@
package com.opensymphony.xwork2.validator;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.validator.validators.URLValidator;
@@ -37,7 +37,7 @@ public class URLValidatorTest extends XWorkTestCase {
ValueStack stack;
ActionContext actionContext;
- private StrutsTextProviderFactory tpf;
+ private TextProviderFactory tpf;
public void testAcceptNullValueForMutualExclusionOfValidators() throws Exception {
@@ -205,7 +205,7 @@ public class URLValidatorTest extends XWorkTestCase {
super.setUp();
stack = ActionContext.getContext().getValueStack();
actionContext = ActionContext.getContext();
- tpf = container.inject(StrutsTextProviderFactory.class);
+ tpf = container.getInstance(TextProviderFactory.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
index 5727e45..52b331a 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
@@ -7,6 +7,7 @@ import java.util.Map;
import com.opensymphony.xwork2.CompositeTextProvider;
import com.opensymphony.xwork2.TextProvider;
import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.validator.DelegatingValidatorContext;
import com.opensymphony.xwork2.validator.ValidatorContext;
@@ -28,7 +29,7 @@ public class AppendingValidatorContextTest extends XWorkTestCase {
super.setUp();
action = container.inject(VisitorValidatorTestAction.class);
- StrutsTextProviderFactory tpf = container.getInstance(StrutsTextProviderFactory.class);
+ TextProviderFactory tpf = container.getInstance(StrutsTextProviderFactory.class);
ValidatorContext vc1 = new DelegatingValidatorContext(action, tpf);
VisitorFieldValidator.AppendingValidatorContext vc2 = new AppendingValidatorContext(vc1, createTextProvider(action, vc1), FIRST_NAME, "");
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
index 789c6a4..597a19b 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
@@ -1,7 +1,7 @@
package com.opensymphony.xwork2.validator.validators;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -14,7 +14,7 @@ import java.util.Locale;
public class DateRangeFieldValidatorTest extends XWorkTestCase {
- private StrutsTextProviderFactory tpf;
+ private TextProviderFactory tpf;
public void testPassValidation() throws Exception {
// given
@@ -91,7 +91,7 @@ public class DateRangeFieldValidatorTest extends XWorkTestCase {
public void setUp() throws Exception {
super.setUp();
ActionContext.getContext().setLocale(new Locale("DE"));
- tpf = container.inject(StrutsTextProviderFactory.class);
+ tpf = container.getInstance(TextProviderFactory.class);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java
index 26dd422..229e8fc 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java
@@ -1,6 +1,6 @@
package com.opensymphony.xwork2.validator.validators;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -9,11 +9,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext;
public class IntRangeFieldValidatorTest extends XWorkTestCase {
- private StrutsTextProviderFactory tpf;
+ private TextProviderFactory tpf;
public void setUp() throws Exception {
super.setUp();
- tpf = container.inject(StrutsTextProviderFactory.class);
+ tpf = container.getInstance(TextProviderFactory.class);
}
public void testPassValidation() throws Exception {
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java
index bc26cb4..fc99e8b 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java
@@ -1,6 +1,6 @@
package com.opensymphony.xwork2.validator.validators;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -9,11 +9,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext;
public class LongRangeFieldValidatorTest extends XWorkTestCase {
- private StrutsTextProviderFactory tpf;
+ private TextProviderFactory tpf;
public void setUp() throws Exception {
super.setUp();
- tpf = container.inject(StrutsTextProviderFactory.class);
+ tpf = container.getInstance(TextProviderFactory.class);
}
public void testPassValidation() throws Exception {
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java
index 614c406..8d4d919 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java
@@ -2,7 +2,7 @@ package com.opensymphony.xwork2.validator.validators;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.validator.DummyValidatorContext;
@@ -10,11 +10,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext;
public class RequiredStringValidatorTest extends XWorkTestCase {
- private StrutsTextProviderFactory tpf;
+ private TextProviderFactory tpf;
public void setUp() throws Exception {
super.setUp();
- tpf = container.inject(StrutsTextProviderFactory.class);
+ tpf = container.getInstance(TextProviderFactory.class);
}
public void testRequiredStringPass() throws Exception {
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java
index e6d3fb2..869f439 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java
@@ -1,6 +1,6 @@
package com.opensymphony.xwork2.validator.validators;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -9,11 +9,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext;
public class ShortRangeFieldValidatorTest extends XWorkTestCase {
- private StrutsTextProviderFactory tpf;
+ private TextProviderFactory tpf;
public void setUp() throws Exception {
super.setUp();
- tpf = container.inject(StrutsTextProviderFactory.class);
+ tpf = container.getInstance(TextProviderFactory.class);
}
public void testPassValidation() throws Exception {
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
index 27660fb..3123a4b 100644
--- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
+++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
@@ -23,7 +23,7 @@ package org.apache.struts.beanvalidation.validation.interceptor;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ModelDriven;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
import com.opensymphony.xwork2.util.AnnotationUtils;
@@ -58,7 +58,7 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor {
private static final Logger LOG = LogManager.getLogger(BeanValidationInterceptor.class);
protected BeanValidationManager beanValidationManager;
- protected StrutsTextProviderFactory textProviderFactory;
+ protected TextProviderFactory textProviderFactory;
protected boolean convertToUtf8 = false;
protected String convertFromEncoding = "ISO-8859-1";
@@ -68,7 +68,7 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor {
}
@Inject
- public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) {
+ public void setTextProviderFactory(TextProviderFactory textProviderFactory) {
this.textProviderFactory = textProviderFactory;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
----------------------------------------------------------------------
diff --git a/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
index 2373b16..473c9a7 100644
--- a/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
+++ b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
@@ -23,7 +23,7 @@ package org.apache.struts2.oval.interceptor;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ModelDriven;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.Validateable;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
@@ -59,7 +59,7 @@ public class OValValidationInterceptor extends MethodFilterInterceptor {
protected boolean programmatic = true;
protected OValValidationManager validationManager;
protected boolean validateJPAAnnotations;
- protected StrutsTextProviderFactory textProviderFactory;
+ protected TextProviderFactory textProviderFactory;
@Inject
public void setValidationManager(OValValidationManager validationManager) {
@@ -67,7 +67,7 @@ public class OValValidationInterceptor extends MethodFilterInterceptor {
}
@Inject
- public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) {
+ public void setTextProviderFactory(TextProviderFactory textProviderFactory) {
this.textProviderFactory = textProviderFactory;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/54974223/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java
----------------------------------------------------------------------
diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java
index d1a3442..1ef7357 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java
@@ -21,7 +21,7 @@ package org.apache.struts2.tiles;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.config.ConfigurationException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -48,7 +48,7 @@ public class I18NAttributeEvaluator extends AbstractAttributeEvaluator {
throw new ConfigurationException("There is no ActionContext for current request!");
}
- StrutsTextProviderFactory tpf = ctx.getContainer().inject(StrutsTextProviderFactory.class);
+ TextProviderFactory tpf = ctx.getContainer().getInstance(TextProviderFactory.class);
TextProvider textProvider = tpf.createInstance(ctx.getActionInvocation().getAction().getClass());
if (textProvider != null) {
[02/16] struts git commit: Renames TextProviderFactory into
StrutsTextProviderFactory
Posted by lu...@apache.org.
Renames TextProviderFactory into StrutsTextProviderFactory
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9376bb0c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9376bb0c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9376bb0c
Branch: refs/heads/master
Commit: 9376bb0ca16595cac0a1d03fb7b4fa55ab66a8f3
Parents: 4f46f15
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Mar 16 14:43:07 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Mar 16 14:43:07 2017 +0100
----------------------------------------------------------------------
.../xwork2/StrutsTextProviderFactory.java | 82 ++++++++++++++++++++
.../xwork2/TextProviderFactory.java | 82 --------------------
.../providers/XWorkConfigurationProvider.java | 6 +-
.../AnnotationActionValidatorManager.java | 4 +-
.../DefaultActionValidatorManager.java | 6 +-
.../validator/DelegatingValidatorContext.java | 6 +-
.../validator/validators/ValidatorSupport.java | 6 +-
.../org/apache/struts2/components/I18n.java | 4 +-
.../config/DefaultBeanSelectionProvider.java | 4 +-
.../interceptor/FileUploadInterceptor.java | 2 +-
core/src/main/resources/struts-default.xml | 2 +-
.../xwork2/CompositeTextProviderTest.java | 2 +-
.../AnnotationActionValidatorManagerTest.java | 6 +-
.../ConversionErrorFieldValidatorTest.java | 4 +-
.../validator/DoubleRangeValidatorTest.java | 4 +-
.../xwork2/validator/DummyValidatorContext.java | 4 +-
.../xwork2/validator/EmailValidatorTest.java | 6 +-
.../validator/ExpressionValidatorTest.java | 4 +-
.../validator/RegexFieldValidatorTest.java | 6 +-
...onversionErrorFieldValidatorSupportTest.java | 4 +-
.../validator/SimpleActionValidationTest.java | 2 +-
.../StringLengthFieldValidatorTest.java | 4 +-
.../xwork2/validator/StringValidatorTest.java | 6 +-
.../xwork2/validator/URLValidatorTest.java | 6 +-
.../AppendingValidatorContextTest.java | 4 +-
.../validators/DateRangeFieldValidatorTest.java | 6 +-
.../validators/IntRangeFieldValidatorTest.java | 6 +-
.../validators/LongRangeFieldValidatorTest.java | 6 +-
.../validators/RequiredStringValidatorTest.java | 6 +-
.../ShortRangeFieldValidatorTest.java | 6 +-
.../interceptor/BeanValidationInterceptor.java | 6 +-
.../interceptor/OValValidationInterceptor.java | 6 +-
.../struts2/tiles/I18NAttributeEvaluator.java | 8 +-
33 files changed, 155 insertions(+), 161 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
new file mode 100644
index 0000000..c5123af
--- /dev/null
+++ b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2002-2007,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;
+
+import com.opensymphony.xwork2.inject.Inject;
+
+import java.util.ResourceBundle;
+
+/**
+ * This factory enables users to provide and correctly initialize a custom TextProvider.
+ *
+ * @author Oleg Gorobets
+ * @author Rene Gielen
+ */
+public class StrutsTextProviderFactory {
+
+ private TextProvider textProvider;
+ private LocaleProviderFactory localeProviderFactory;
+ private LocalizedTextProvider localizedTextProvider;
+
+ @Inject
+ public void setTextProvider(TextProvider textProvider) {
+ this.textProvider = textProvider;
+ }
+
+ @Inject
+ public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) {
+ this.localeProviderFactory = localeProviderFactory;
+ }
+
+ @Inject
+ public void setLocalizedTextProvider(LocalizedTextProvider localizedTextProvider) {
+ this.localizedTextProvider = localizedTextProvider;
+ }
+
+ public TextProvider createInstance(Class clazz) {
+ TextProvider instance = getTextProvider(clazz);
+ if (instance instanceof ResourceBundleTextProvider) {
+ ((ResourceBundleTextProvider) instance).setClazz(clazz);
+ ((ResourceBundleTextProvider) instance).setLocaleProvider(localeProviderFactory.createLocaleProvider());
+ }
+ return instance;
+ }
+
+ public TextProvider createInstance(ResourceBundle bundle) {
+ TextProvider instance = getTextProvider(bundle);
+ if (instance instanceof ResourceBundleTextProvider) {
+ ((ResourceBundleTextProvider) instance).setBundle(bundle);
+ ((ResourceBundleTextProvider) instance).setLocaleProvider(localeProviderFactory.createLocaleProvider());
+ }
+ return instance;
+ }
+
+ protected TextProvider getTextProvider(Class clazz) {
+ if (this.textProvider == null) {
+ return new TextProviderSupport(clazz, localeProviderFactory.createLocaleProvider(), localizedTextProvider);
+ } else {
+ return textProvider;
+ }
+ }
+
+ private TextProvider getTextProvider(ResourceBundle bundle) {
+ if (this.textProvider == null) {
+ return new TextProviderSupport(bundle, localeProviderFactory.createLocaleProvider(), localizedTextProvider);
+ }
+ return textProvider;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/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
deleted file mode 100644
index 4d55d6c..0000000
--- a/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2002-2007,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;
-
-import com.opensymphony.xwork2.inject.Inject;
-
-import java.util.ResourceBundle;
-
-/**
- * This factory enables users to provide and correctly initialize a custom TextProvider.
- *
- * @author Oleg Gorobets
- * @author Rene Gielen
- */
-public class TextProviderFactory {
-
- private TextProvider textProvider;
- private LocaleProviderFactory localeProviderFactory;
- private LocalizedTextProvider localizedTextProvider;
-
- @Inject
- public void setTextProvider(TextProvider textProvider) {
- this.textProvider = textProvider;
- }
-
- @Inject
- public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) {
- this.localeProviderFactory = localeProviderFactory;
- }
-
- @Inject
- public void setLocalizedTextProvider(LocalizedTextProvider localizedTextProvider) {
- this.localizedTextProvider = localizedTextProvider;
- }
-
- public TextProvider createInstance(Class clazz) {
- TextProvider instance = getTextProvider(clazz);
- if (instance instanceof ResourceBundleTextProvider) {
- ((ResourceBundleTextProvider) instance).setClazz(clazz);
- ((ResourceBundleTextProvider) instance).setLocaleProvider(localeProviderFactory.createLocaleProvider());
- }
- return instance;
- }
-
- public TextProvider createInstance(ResourceBundle bundle) {
- TextProvider instance = getTextProvider(bundle);
- if (instance instanceof ResourceBundleTextProvider) {
- ((ResourceBundleTextProvider) instance).setBundle(bundle);
- ((ResourceBundleTextProvider) instance).setLocaleProvider(localeProviderFactory.createLocaleProvider());
- }
- return instance;
- }
-
- protected TextProvider getTextProvider(Class clazz) {
- if (this.textProvider == null) {
- return new TextProviderSupport(clazz, localeProviderFactory.createLocaleProvider(), localizedTextProvider);
- } else {
- return textProvider;
- }
- }
-
- private TextProvider getTextProvider(ResourceBundle bundle) {
- if (this.textProvider == null) {
- return new TextProviderSupport(bundle, localeProviderFactory.createLocaleProvider(), localizedTextProvider);
- }
- return textProvider;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/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 5c912e1..d29cf0e 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
@@ -4,7 +4,7 @@ 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.StrutsTextProviderFactory;
import com.opensymphony.xwork2.factory.DefaultUnknownHandlerFactory;
import com.opensymphony.xwork2.factory.UnknownHandlerFactory;
import com.opensymphony.xwork2.ognl.accessor.HttpParametersPropertyAccessor;
@@ -12,13 +12,11 @@ import com.opensymphony.xwork2.ognl.accessor.ParameterPropertyAccessor;
import com.opensymphony.xwork2.security.AcceptedPatternsChecker;
import com.opensymphony.xwork2.security.DefaultAcceptedPatternsChecker;
import com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker;
-import com.opensymphony.xwork2.DefaultLocaleProvider;
import com.opensymphony.xwork2.DefaultTextProvider;
import com.opensymphony.xwork2.DefaultUnknownHandlerManager;
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.TextProviderSupport;
@@ -183,7 +181,7 @@ public class XWorkConfigurationProvider implements ConfigurationProvider {
.factory(ActionValidatorManager.class, AnnotationActionValidatorManager.class, Scope.SINGLETON)
.factory(ActionValidatorManager.class, "no-annotations", DefaultActionValidatorManager.class, Scope.SINGLETON)
- .factory(TextProviderFactory.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)
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java b/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
index cd6fa4e..2e0fc30 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
@@ -52,7 +52,7 @@ public class AnnotationActionValidatorManager implements ActionValidatorManager
private ValidatorFileParser validatorFileParser;
private FileManager fileManager;
private boolean reloadingConfigs;
- private TextProviderFactory textProviderFactory;
+ private StrutsTextProviderFactory textProviderFactory;
@Inject
public void setValidatorFactory(ValidatorFactory fac) {
@@ -75,7 +75,7 @@ public class AnnotationActionValidatorManager implements ActionValidatorManager
}
@Inject
- public void setTextProviderFactory(TextProviderFactory textProviderFactory) {
+ public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) {
this.textProviderFactory = textProviderFactory;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java b/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
index 48d552a..85237c9 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
@@ -18,7 +18,7 @@ package com.opensymphony.xwork2.validator;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.FileManagerFactory;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.XWorkConstants;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
@@ -63,7 +63,7 @@ public class DefaultActionValidatorManager implements ActionValidatorManager {
private ValidatorFileParser validatorFileParser;
private FileManager fileManager;
private boolean reloadingConfigs;
- private TextProviderFactory textProviderFactory;
+ private StrutsTextProviderFactory textProviderFactory;
@Inject
public void setValidatorFileParser(ValidatorFileParser parser) {
@@ -86,7 +86,7 @@ public class DefaultActionValidatorManager implements ActionValidatorManager {
}
@Inject
- public void setTextProviderFactory(TextProviderFactory textProviderFactory) {
+ public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) {
this.textProviderFactory = textProviderFactory;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/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 b8921e9..3c75e2b 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
@@ -57,7 +57,7 @@ public class DelegatingValidatorContext implements ValidatorContext {
*
* @param object the object to use for validation (usually an Action).
*/
- public DelegatingValidatorContext(Object object, TextProviderFactory textProviderFactory) {
+ public DelegatingValidatorContext(Object object, StrutsTextProviderFactory textProviderFactory) {
this.localeProvider = makeLocaleProvider(object);
this.validationAware = makeValidationAware(object);
this.textProvider = makeTextProvider(object, textProviderFactory);
@@ -74,7 +74,7 @@ public class DelegatingValidatorContext implements ValidatorContext {
@Deprecated
public DelegatingValidatorContext(Class clazz) {
localeProvider = new ActionContextLocaleProvider();
- textProvider = new TextProviderFactory().createInstance(clazz);
+ textProvider = new StrutsTextProviderFactory().createInstance(clazz);
validationAware = new LoggingValidationAware(clazz);
}
@@ -196,7 +196,7 @@ public class DelegatingValidatorContext implements ValidatorContext {
return validationAware.hasFieldErrors();
}
- public TextProvider makeTextProvider(Object object, TextProviderFactory textProviderFactory) {
+ public TextProvider makeTextProvider(Object object, StrutsTextProviderFactory textProviderFactory) {
// the object argument passed through here will most probably be an ActionSupport descendant which does
// implements TextProvider.
if (object != null && object instanceof DelegatingValidatorContext) {
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java
index 3cfdb4b..f99db43 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java
@@ -15,7 +15,7 @@
*/
package com.opensymphony.xwork2.validator.validators;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.TextParseUtil;
import com.opensymphony.xwork2.util.ValueStack;
@@ -47,10 +47,10 @@ public abstract class ValidatorSupport implements Validator, ShortCircuitableVal
private String[] messageParameters;
protected ValueStack stack;
- protected TextProviderFactory textProviderFactory;
+ protected StrutsTextProviderFactory textProviderFactory;
@Inject
- public void setTextProviderFactory(TextProviderFactory textProviderFactory) {
+ public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) {
this.textProviderFactory = textProviderFactory;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/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 89e38bb..6d173ef 100644
--- a/core/src/main/java/org/apache/struts2/components/I18n.java
+++ b/core/src/main/java/org/apache/struts2/components/I18n.java
@@ -31,7 +31,7 @@ import org.apache.struts2.StrutsException;
import com.opensymphony.xwork2.LocaleProvider;
import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.DefaultLocalizedTextProvider;
@@ -126,7 +126,7 @@ public class I18n extends Component {
}
if (bundle != null) {
- TextProviderFactory tpf = container.inject(TextProviderFactory.class);
+ StrutsTextProviderFactory tpf = container.inject(StrutsTextProviderFactory.class);
textProvider = tpf.createInstance(bundle);
getStack().push(textProvider);
pushed = true;
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/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 f77f8ae..2f1db95 100644
--- a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -24,7 +24,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.StrutsTextProviderFactory;
import com.opensymphony.xwork2.factory.UnknownHandlerFactory;
import com.opensymphony.xwork2.security.AcceptedPatternsChecker;
import com.opensymphony.xwork2.security.ExcludedPatternsChecker;
@@ -398,7 +398,7 @@ public class DefaultBeanSelectionProvider extends AbstractBeanSelectionProvider
alias(TypeConverterHolder.class, StrutsConstants.STRUTS_CONVERTER_HOLDER, builder, props);
alias(TextProvider.class, StrutsConstants.STRUTS_XWORKTEXTPROVIDER, builder, props, Scope.PROTOTYPE);
- alias(TextProviderFactory.class, StrutsConstants.STRUTS_TEXT_PROVIDER_FACTORY, builder, props, Scope.PROTOTYPE);
+ alias(StrutsTextProviderFactory.class, StrutsConstants.STRUTS_TEXT_PROVIDER_FACTORY, builder, props, Scope.PROTOTYPE);
alias(LocaleProviderFactory.class, StrutsConstants.STRUTS_LOCALE_PROVIDER_FACTORY, builder, props);
alias(LocalizedTextProvider.class, StrutsConstants.STRUTS_LOCALIZED_TEXT_PROVIDER, builder, props);
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/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 b00f2e3..138b033 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
@@ -446,7 +446,7 @@ public class FileUploadInterceptor extends AbstractInterceptor {
}
private TextProvider getTextProvider(Object action) {
- TextProviderFactory tpf = container.inject(TextProviderFactory.class);
+ StrutsTextProviderFactory tpf = container.inject(StrutsTextProviderFactory.class);
return tpf.createInstance(action.getClass());
}
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/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 3a4f6ee..b0c0769 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -130,7 +130,7 @@
<bean type="com.opensymphony.xwork2.conversion.impl.NumberConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.NumberConverter" scope="singleton"/>
<bean type="com.opensymphony.xwork2.conversion.impl.StringConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.StringConverter" scope="singleton"/>
- <bean type="com.opensymphony.xwork2.TextProviderFactory" name="struts" class="com.opensymphony.xwork2.TextProviderFactory" scope="prototype" />
+ <bean type="com.opensymphony.xwork2.StrutsTextProviderFactory" name="struts" class="com.opensymphony.xwork2.StrutsTextProviderFactory" 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.LocaleProviderFactory" name="struts" class="com.opensymphony.xwork2.DefaultLocaleProviderFactory" scope="singleton" />
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java b/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
index 7290902..ab5c170 100644
--- a/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
@@ -77,7 +77,7 @@ public class CompositeTextProviderTest extends XWorkTestCase {
protected void setUp() throws Exception {
super.setUp();
- TextProviderFactory tpf = container.getInstance(TextProviderFactory.class);
+ StrutsTextProviderFactory tpf = container.getInstance(StrutsTextProviderFactory.class);
tpf.setTextProvider(null);
ActionContext.getContext().setLocale(Locale.ENGLISH);
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
index 89c21e3..c2b3ba2 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
@@ -24,7 +24,7 @@ import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.FileManagerFactory;
import com.opensymphony.xwork2.SimpleAction;
import com.opensymphony.xwork2.SimpleAnnotationAction;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.test.AnnotationDataAware2;
@@ -59,7 +59,7 @@ public class AnnotationActionValidatorManagerTest extends XWorkTestCase {
protected final String alias = "annotationValidationAlias";
AnnotationActionValidatorManager annotationActionValidatorManager;
- private TextProviderFactory tpf;
+ private StrutsTextProviderFactory tpf;
@Override protected void setUp() throws Exception {
super.setUp();
@@ -81,7 +81,7 @@ public class AnnotationActionValidatorManagerTest extends XWorkTestCase {
ActionContext.getContext().setActionInvocation(invocation);
- tpf = container.getInstance(TextProviderFactory.class);
+ tpf = container.getInstance(StrutsTextProviderFactory.class);
}
@Override protected void tearDown() throws Exception {
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
index 8182d77..9cdeac0 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
@@ -16,7 +16,7 @@
package com.opensymphony.xwork2.validator;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.interceptor.ValidationAware;
import com.opensymphony.xwork2.ValidationAwareSupport;
import com.opensymphony.xwork2.XWorkTestCase;
@@ -53,7 +53,7 @@ public class ConversionErrorFieldValidatorTest extends XWorkTestCase {
validator = new ConversionErrorFieldValidator();
validationAware = new ValidationAwareSupport();
- DelegatingValidatorContext validatorContext = new DelegatingValidatorContext(validationAware, container.inject(TextProviderFactory.class));
+ DelegatingValidatorContext validatorContext = new DelegatingValidatorContext(validationAware, container.inject(StrutsTextProviderFactory.class));
stack.push(validatorContext);
validator.setValidatorContext(validatorContext);
validator.setFieldName("foo");
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
index 3f75a14..bd3d9da 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
*/
public class DoubleRangeValidatorTest extends XWorkTestCase {
private DoubleRangeFieldValidator val;
- private TextProviderFactory tpf;
+ private StrutsTextProviderFactory tpf;
public void testRangeValidationWithError() throws Exception {
//Explicitly set an out-of-range double for DoubleRangeValidatorTest
@@ -237,7 +237,7 @@ public class DoubleRangeValidatorTest extends XWorkTestCase {
val = new DoubleRangeFieldValidator();
val.setValueStack(ActionContext.getContext().getValueStack());
ActionContext.getContext().setParameters(HttpParameters.create().build());
- tpf = container.inject(TextProviderFactory.class);
+ tpf = container.inject(StrutsTextProviderFactory.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java b/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java
index e0f5f33..d9e138c 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java
@@ -15,7 +15,7 @@
*/
package com.opensymphony.xwork2.validator;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import java.util.*;
@@ -33,7 +33,7 @@ public class DummyValidatorContext extends DelegatingValidatorContext {
private Map<String, List<String>> fieldErrors;
- public DummyValidatorContext(Object object, TextProviderFactory tpf) {
+ public DummyValidatorContext(Object object, StrutsTextProviderFactory tpf) {
super(object, tpf);
}
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
index ae8c036..5a66920 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
@@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.validator.validators.EmailValidator;
@@ -30,7 +30,7 @@ import com.opensymphony.xwork2.validator.validators.EmailValidator;
*/
public class EmailValidatorTest extends XWorkTestCase {
- private TextProviderFactory tpf;
+ private StrutsTextProviderFactory tpf;
public void testEmailValidity() throws Exception {
assertTrue(verifyEmailValidity("TmJee@Yahoo.com"));
@@ -162,6 +162,6 @@ public class EmailValidatorTest extends XWorkTestCase {
public void setUp() throws Exception {
super.setUp();
- tpf = container.inject(TextProviderFactory.class);
+ tpf = container.inject(StrutsTextProviderFactory.class);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
index 30613a4..7ce38c5 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
@@ -38,7 +38,7 @@ import java.util.Map;
*/
public class ExpressionValidatorTest extends XWorkTestCase {
- private TextProviderFactory tpf;
+ private StrutsTextProviderFactory tpf;
public void testExpressionValidationOfStringLength() throws ValidationException {
TestBean bean = new TestBean();
@@ -139,7 +139,7 @@ public class ExpressionValidatorTest extends XWorkTestCase {
ActionContext.getContext().setActionInvocation(invocation);
- tpf = container.inject(TextProviderFactory.class);
+ tpf = container.inject(StrutsTextProviderFactory.class);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java
index 5c7e94b..6dd8e3f 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java
@@ -16,7 +16,7 @@
package com.opensymphony.xwork2.validator;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.validator.validators.RegexFieldValidator;
@@ -37,11 +37,11 @@ import java.util.List;
*/
public class RegexFieldValidatorTest extends XWorkTestCase {
- private TextProviderFactory tpf;
+ private StrutsTextProviderFactory tpf;
public void setUp() throws Exception {
super.setUp();
- tpf = container.inject(TextProviderFactory.class);
+ tpf = container.inject(StrutsTextProviderFactory.class);
}
public void testMatch() throws Exception {
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
index c4aa178..ad8418b 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
@@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import com.opensymphony.xwork2.util.ValueStack;
@@ -92,7 +92,7 @@ public class RepopulateConversionErrorFieldValidatorSupportTest extends XWorkTes
conversionErrors.put("someFieldName", conversionErrorValue);
conversionErrors.put("xxxsomeFieldName", conversionErrorValue);
- TextProviderFactory tpf = container.inject(TextProviderFactory.class);
+ StrutsTextProviderFactory tpf = container.inject(StrutsTextProviderFactory.class);
action = container.inject(ActionSupport.class);
validator1 =
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
index 991a75e..e737dde 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
@@ -153,7 +153,7 @@ public class SimpleActionValidationTest extends XWorkTestCase {
SimpleAction action = new SimpleAction();
container.inject(action);
- ValidatorContext validatorContext = new DelegatingValidatorContext(action, container.inject(TextProviderFactory.class));
+ ValidatorContext validatorContext = new DelegatingValidatorContext(action, container.inject(StrutsTextProviderFactory.class));
validator.setValidatorContext(validatorContext);
validator.validate(this);
assertTrue(validatorContext.hasActionErrors());
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java
index 884d495..b8f3472 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java
@@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator;
@@ -163,7 +163,7 @@ public class StringLengthFieldValidatorTest extends XWorkTestCase {
validator = new StringLengthFieldValidator();
validator.setFieldName("myField");
validator.setMessageKey("error");
- validator.setValidatorContext(new DelegatingValidatorContext(action, container.inject(TextProviderFactory.class)));
+ validator.setValidatorContext(new DelegatingValidatorContext(action, container.inject(StrutsTextProviderFactory.class)));
validator.setMaxLength(5);
validator.setMinLength(2);
validator.setValueStack(valueStack);
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java
index c737d97..0ca581c 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java
@@ -19,7 +19,7 @@ import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.ValidationAwareSupport;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.config.entities.ActionConfig;
@@ -37,7 +37,7 @@ import java.util.Map;
*/
public class StringValidatorTest extends XWorkTestCase {
- private TextProviderFactory tpf;
+ private StrutsTextProviderFactory tpf;
public void testRequiredStringWithNullValue() throws Exception {
Equidae equidae = new Equidae();
@@ -217,6 +217,6 @@ public class StringValidatorTest extends XWorkTestCase {
ActionContext.getContext().setActionInvocation(invocation);
- tpf = container.inject(TextProviderFactory.class);
+ tpf = container.inject(StrutsTextProviderFactory.class);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
index ff9ab50..d377bc9 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
@@ -16,7 +16,7 @@
package com.opensymphony.xwork2.validator;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.validator.validators.URLValidator;
@@ -37,7 +37,7 @@ public class URLValidatorTest extends XWorkTestCase {
ValueStack stack;
ActionContext actionContext;
- private TextProviderFactory tpf;
+ private StrutsTextProviderFactory tpf;
public void testAcceptNullValueForMutualExclusionOfValidators() throws Exception {
@@ -205,7 +205,7 @@ public class URLValidatorTest extends XWorkTestCase {
super.setUp();
stack = ActionContext.getContext().getValueStack();
actionContext = ActionContext.getContext();
- tpf = container.inject(TextProviderFactory.class);
+ tpf = container.inject(StrutsTextProviderFactory.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
index 0446e97..5727e45 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
@@ -6,7 +6,7 @@ import java.util.Map;
import com.opensymphony.xwork2.CompositeTextProvider;
import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.validator.DelegatingValidatorContext;
import com.opensymphony.xwork2.validator.ValidatorContext;
@@ -28,7 +28,7 @@ public class AppendingValidatorContextTest extends XWorkTestCase {
super.setUp();
action = container.inject(VisitorValidatorTestAction.class);
- TextProviderFactory tpf = container.getInstance(TextProviderFactory.class);
+ StrutsTextProviderFactory tpf = container.getInstance(StrutsTextProviderFactory.class);
ValidatorContext vc1 = new DelegatingValidatorContext(action, tpf);
VisitorFieldValidator.AppendingValidatorContext vc2 = new AppendingValidatorContext(vc1, createTextProvider(action, vc1), FIRST_NAME, "");
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
index 6129fc0..789c6a4 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
@@ -1,7 +1,7 @@
package com.opensymphony.xwork2.validator.validators;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -14,7 +14,7 @@ import java.util.Locale;
public class DateRangeFieldValidatorTest extends XWorkTestCase {
- private TextProviderFactory tpf;
+ private StrutsTextProviderFactory tpf;
public void testPassValidation() throws Exception {
// given
@@ -91,7 +91,7 @@ public class DateRangeFieldValidatorTest extends XWorkTestCase {
public void setUp() throws Exception {
super.setUp();
ActionContext.getContext().setLocale(new Locale("DE"));
- tpf = container.inject(TextProviderFactory.class);
+ tpf = container.inject(StrutsTextProviderFactory.class);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java
index 7703732..26dd422 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java
@@ -1,6 +1,6 @@
package com.opensymphony.xwork2.validator.validators;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -9,11 +9,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext;
public class IntRangeFieldValidatorTest extends XWorkTestCase {
- private TextProviderFactory tpf;
+ private StrutsTextProviderFactory tpf;
public void setUp() throws Exception {
super.setUp();
- tpf = container.inject(TextProviderFactory.class);
+ tpf = container.inject(StrutsTextProviderFactory.class);
}
public void testPassValidation() throws Exception {
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java
index bc14b57..bc26cb4 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java
@@ -1,6 +1,6 @@
package com.opensymphony.xwork2.validator.validators;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -9,11 +9,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext;
public class LongRangeFieldValidatorTest extends XWorkTestCase {
- private TextProviderFactory tpf;
+ private StrutsTextProviderFactory tpf;
public void setUp() throws Exception {
super.setUp();
- tpf = container.inject(TextProviderFactory.class);
+ tpf = container.inject(StrutsTextProviderFactory.class);
}
public void testPassValidation() throws Exception {
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java
index 1495733..614c406 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java
@@ -2,7 +2,7 @@ package com.opensymphony.xwork2.validator.validators;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.validator.DummyValidatorContext;
@@ -10,11 +10,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext;
public class RequiredStringValidatorTest extends XWorkTestCase {
- private TextProviderFactory tpf;
+ private StrutsTextProviderFactory tpf;
public void setUp() throws Exception {
super.setUp();
- tpf = container.inject(TextProviderFactory.class);
+ tpf = container.inject(StrutsTextProviderFactory.class);
}
public void testRequiredStringPass() throws Exception {
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java
index bb27664..e6d3fb2 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java
@@ -1,6 +1,6 @@
package com.opensymphony.xwork2.validator.validators;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -9,11 +9,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext;
public class ShortRangeFieldValidatorTest extends XWorkTestCase {
- private TextProviderFactory tpf;
+ private StrutsTextProviderFactory tpf;
public void setUp() throws Exception {
super.setUp();
- tpf = container.inject(TextProviderFactory.class);
+ tpf = container.inject(StrutsTextProviderFactory.class);
}
public void testPassValidation() throws Exception {
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
----------------------------------------------------------------------
diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
index 3123a4b..27660fb 100644
--- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
+++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
@@ -23,7 +23,7 @@ package org.apache.struts.beanvalidation.validation.interceptor;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ModelDriven;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
import com.opensymphony.xwork2.util.AnnotationUtils;
@@ -58,7 +58,7 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor {
private static final Logger LOG = LogManager.getLogger(BeanValidationInterceptor.class);
protected BeanValidationManager beanValidationManager;
- protected TextProviderFactory textProviderFactory;
+ protected StrutsTextProviderFactory textProviderFactory;
protected boolean convertToUtf8 = false;
protected String convertFromEncoding = "ISO-8859-1";
@@ -68,7 +68,7 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor {
}
@Inject
- public void setTextProviderFactory(TextProviderFactory textProviderFactory) {
+ public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) {
this.textProviderFactory = textProviderFactory;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
----------------------------------------------------------------------
diff --git a/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
index 473c9a7..2373b16 100644
--- a/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
+++ b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
@@ -23,7 +23,7 @@ package org.apache.struts2.oval.interceptor;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.ModelDriven;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.Validateable;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
@@ -59,7 +59,7 @@ public class OValValidationInterceptor extends MethodFilterInterceptor {
protected boolean programmatic = true;
protected OValValidationManager validationManager;
protected boolean validateJPAAnnotations;
- protected TextProviderFactory textProviderFactory;
+ protected StrutsTextProviderFactory textProviderFactory;
@Inject
public void setValidationManager(OValValidationManager validationManager) {
@@ -67,7 +67,7 @@ public class OValValidationInterceptor extends MethodFilterInterceptor {
}
@Inject
- public void setTextProviderFactory(TextProviderFactory textProviderFactory) {
+ public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) {
this.textProviderFactory = textProviderFactory;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java
----------------------------------------------------------------------
diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java
index 647a289..d1a3442 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java
@@ -20,17 +20,13 @@
package org.apache.struts2.tiles;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.LocaleProvider;
import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.StrutsTextProviderFactory;
import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.ognl.OgnlUtil;
-import ognl.OgnlException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.apache.tiles.evaluator.AbstractAttributeEvaluator;
-import org.apache.tiles.evaluator.EvaluationException;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.servlet.ServletUtil;
@@ -52,7 +48,7 @@ public class I18NAttributeEvaluator extends AbstractAttributeEvaluator {
throw new ConfigurationException("There is no ActionContext for current request!");
}
- TextProviderFactory tpf = ctx.getContainer().inject(TextProviderFactory.class);
+ StrutsTextProviderFactory tpf = ctx.getContainer().inject(StrutsTextProviderFactory.class);
TextProvider textProvider = tpf.createInstance(ctx.getActionInvocation().getAction().getClass());
if (textProvider != null) {
[06/16] struts git commit: Uses dedicated logger instead the one from
parent class
Posted by lu...@apache.org.
Uses dedicated logger instead the one from parent class
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/16d1d60e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/16d1d60e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/16d1d60e
Branch: refs/heads/master
Commit: 16d1d60ed826c639d2298b77b27c184d9684f21c
Parents: 207ac17
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 17 07:51:57 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 17 07:51:57 2017 +0100
----------------------------------------------------------------------
.../validators/ConditionalVisitorFieldValidator.java | 6 +++++-
.../xwork2/validator/validators/ExpressionValidator.java | 8 ++++++--
.../validator/validators/FieldExpressionValidator.java | 8 ++++++--
.../xwork2/validator/validators/VisitorFieldValidator.java | 6 +++++-
4 files changed, 22 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/16d1d60e/core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
index 7e92f3f..3952698 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
@@ -1,6 +1,8 @@
package com.opensymphony.xwork2.validator.validators;
import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* <!-- START SNIPPET: javadoc -->
@@ -29,6 +31,8 @@ import com.opensymphony.xwork2.validator.ValidationException;
*/
public class ConditionalVisitorFieldValidator extends VisitorFieldValidator {
+ private static final Logger LOG = LogManager.getLogger(ConditionalVisitorFieldValidator.class);
+
private String expression;
public void setExpression(String expression) {
@@ -75,7 +79,7 @@ public class ConditionalVisitorFieldValidator extends VisitorFieldValidator {
if ((obj != null) && (obj instanceof Boolean)) {
answer = (Boolean) obj;
} else {
- log.warn("Got result of {} when trying to get Boolean.", obj);
+ LOG.warn("Got result of {} when trying to get Boolean.", obj);
}
return answer;
http://git-wip-us.apache.org/repos/asf/struts/blob/16d1d60e/core/src/main/java/com/opensymphony/xwork2/validator/validators/ExpressionValidator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ExpressionValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ExpressionValidator.java
index 6e59af2..f3e3da0 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ExpressionValidator.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ExpressionValidator.java
@@ -16,6 +16,8 @@
package com.opensymphony.xwork2.validator.validators;
import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* <!-- START SNIPPET: javadoc -->
@@ -44,6 +46,8 @@ import com.opensymphony.xwork2.validator.ValidationException;
*/
public class ExpressionValidator extends ValidatorSupport {
+ private static final Logger LOG = LogManager.getLogger(ExpressionValidator.class);
+
private String expression;
public void setExpression(String expression) {
@@ -69,11 +73,11 @@ public class ExpressionValidator extends ValidatorSupport {
if ((obj != null) && (obj instanceof Boolean)) {
answer = (Boolean) obj;
} else {
- log.warn("Got result of [{}] when trying to get Boolean.", obj);
+ LOG.warn("Got result of [{}] when trying to get Boolean.", obj);
}
if (!answer) {
- log.debug("Validation failed on expression [{}] with validated object [{}]", expression, object);
+ LOG.debug("Validation failed on expression [{}] with validated object [{}]", expression, object);
addActionError(object);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/16d1d60e/core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldExpressionValidator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldExpressionValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldExpressionValidator.java
index 12dd7c5..e1f5618 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldExpressionValidator.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldExpressionValidator.java
@@ -16,6 +16,8 @@
package com.opensymphony.xwork2.validator.validators;
import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
@@ -55,6 +57,8 @@ import com.opensymphony.xwork2.validator.ValidationException;
*/
public class FieldExpressionValidator extends FieldValidatorSupport {
+ private static final Logger LOG = LogManager.getLogger(FieldExpressionValidator.class);
+
private String expression;
public void setExpression(String expression) {
@@ -82,10 +86,10 @@ public class FieldExpressionValidator extends FieldValidatorSupport {
if ((obj != null) && (obj instanceof Boolean)) {
answer = (Boolean) obj;
} else {
- log.warn("Got result of {} when trying to get Boolean.", obj);
+ LOG.warn("Got result of {} when trying to get Boolean.", obj);
}
- if (!answer.booleanValue()) {
+ if (!answer) {
addFieldError(fieldName, object);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/16d1d60e/core/src/main/java/com/opensymphony/xwork2/validator/validators/VisitorFieldValidator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/VisitorFieldValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/VisitorFieldValidator.java
index 8fd62a6..ce87316 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/VisitorFieldValidator.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/validators/VisitorFieldValidator.java
@@ -24,6 +24,8 @@ import com.opensymphony.xwork2.validator.ActionValidatorManager;
import com.opensymphony.xwork2.validator.DelegatingValidatorContext;
import com.opensymphony.xwork2.validator.ValidationException;
import com.opensymphony.xwork2.validator.ValidatorContext;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import java.util.Collection;
import java.util.LinkedList;
@@ -85,6 +87,8 @@ import java.util.List;
*/
public class VisitorFieldValidator extends FieldValidatorSupport {
+ private static final Logger LOG = LogManager.getLogger(VisitorFieldValidator.class);
+
private String context;
private boolean appendPrefix = true;
private ActionValidatorManager actionValidatorManager;
@@ -125,7 +129,7 @@ public class VisitorFieldValidator extends FieldValidatorSupport {
String fieldName = getFieldName();
Object value = this.getFieldValue(fieldName, object);
if (value == null) {
- log.warn("The visited object is null, VisitorValidator will not be able to handle validation properly. Please make sure the visited object is not null for VisitorValidator to function properly");
+ LOG.warn("The visited object is null, VisitorValidator will not be able to handle validation properly. Please make sure the visited object is not null for VisitorValidator to function properly");
return;
}
ValueStack stack = ActionContext.getContext().getValueStack();
[09/16] struts git commit: Moves bean into same area are other
releated to it beans
Posted by lu...@apache.org.
Moves bean into same area are other releated to it beans
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c039685c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c039685c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c039685c
Branch: refs/heads/master
Commit: c039685cf946f5e9864ae175a14f3ccdc0edbe59
Parents: ee6c927
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 17 08:02:52 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 17 08:02:52 2017 +0100
----------------------------------------------------------------------
core/src/main/resources/struts-default.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/c039685c/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 72d6a69..d666541 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -130,6 +130,7 @@
<bean type="com.opensymphony.xwork2.conversion.impl.NumberConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.NumberConverter" scope="singleton"/>
<bean type="com.opensymphony.xwork2.conversion.impl.StringConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.StringConverter" scope="singleton"/>
+ <bean type="com.opensymphony.xwork2.TextProvider" name="system" class="com.opensymphony.xwork2.DefaultTextProvider" scope="singleton" />
<bean type="com.opensymphony.xwork2.LocalizedTextProvider" name="struts" class="com.opensymphony.xwork2.util.DefaultLocalizedTextProvider" scope="singleton" />
<bean type="com.opensymphony.xwork2.TextProviderFactory" name="struts" class="com.opensymphony.xwork2.StrutsTextProviderFactory" scope="singleton" />
<bean type="com.opensymphony.xwork2.LocaleProviderFactory" name="struts" class="com.opensymphony.xwork2.DefaultLocaleProviderFactory" scope="singleton" />
@@ -141,7 +142,6 @@
<bean type="com.opensymphony.xwork2.util.reflection.ReflectionProvider" name="struts" class="com.opensymphony.xwork2.ognl.OgnlReflectionProvider" />
<bean type="com.opensymphony.xwork2.util.reflection.ReflectionContextFactory" name="struts" class="com.opensymphony.xwork2.ognl.OgnlReflectionContextFactory" />
- <bean type="com.opensymphony.xwork2.TextProvider" name="system" class="com.opensymphony.xwork2.DefaultTextProvider" />
<bean type="com.opensymphony.xwork2.conversion.NullHandler" name="java.lang.Object" class="com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler" />
<bean type="com.opensymphony.xwork2.validator.ActionValidatorManager" name="struts" class="com.opensymphony.xwork2.validator.AnnotationActionValidatorManager" />
[05/16] struts git commit: Defines proper interfaces and default
implementation in configuration
Posted by lu...@apache.org.
Defines proper interfaces and default implementation in configuration
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/207ac177
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/207ac177
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/207ac177
Branch: refs/heads/master
Commit: 207ac1774439f72cdfab32c45a3c59ba5a972899
Parents: 3b73544
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 17 07:51:12 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 17 07:51:12 2017 +0100
----------------------------------------------------------------------
.../xwork2/config/impl/DefaultConfiguration.java | 9 +++++----
.../apache/struts2/config/DefaultBeanSelectionProvider.java | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/207ac177/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 c7c5a92..8882a2f 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
@@ -245,8 +245,6 @@ public class DefaultConfiguration implements Configuration {
builder.factory(ReflectionProvider.class, OgnlReflectionProvider.class, Scope.SINGLETON);
builder.factory(ValueStackFactory.class, OgnlValueStackFactory.class, Scope.SINGLETON);
- builder.factory(LocalizedTextProvider.class, DefaultLocalizedTextProvider.class, Scope.SINGLETON);
-
builder.factory(XWorkConverter.class, Scope.SINGLETON);
builder.factory(ConversionPropertiesProcessor.class, DefaultConversionPropertiesProcessor.class, Scope.SINGLETON);
builder.factory(ConversionFileProcessor.class, DefaultConversionFileProcessor.class, Scope.SINGLETON);
@@ -261,11 +259,14 @@ public class DefaultConfiguration implements Configuration {
builder.factory(TypeConverter.class, XWorkConstants.NUMBER_CONVERTER, NumberConverter.class, Scope.SINGLETON);
builder.factory(TypeConverter.class, XWorkConstants.STRING_CONVERTER, StringConverter.class, Scope.SINGLETON);
- 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(LocalizedTextProvider.class, DefaultLocalizedTextProvider.class, Scope.SINGLETON);
+ builder.factory(TextProviderFactory.class, StrutsTextProviderFactory.class, Scope.SINGLETON);
builder.factory(LocaleProviderFactory.class, DefaultLocaleProviderFactory.class, Scope.SINGLETON);
+ builder.factory(TextParser.class, OgnlTextParser.class, Scope.SINGLETON);
+
builder.factory(ObjectTypeDeterminer.class, DefaultObjectTypeDeterminer.class, Scope.SINGLETON);
builder.factory(PropertyAccessor.class, CompoundRoot.class.getName(), CompoundRootAccessor.class, Scope.SINGLETON);
builder.factory(OgnlUtil.class, Scope.SINGLETON);
http://git-wip-us.apache.org/repos/asf/struts/blob/207ac177/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 2f1db95..f77f8ae 100644
--- a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -24,7 +24,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.StrutsTextProviderFactory;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.factory.UnknownHandlerFactory;
import com.opensymphony.xwork2.security.AcceptedPatternsChecker;
import com.opensymphony.xwork2.security.ExcludedPatternsChecker;
@@ -398,7 +398,7 @@ public class DefaultBeanSelectionProvider extends AbstractBeanSelectionProvider
alias(TypeConverterHolder.class, StrutsConstants.STRUTS_CONVERTER_HOLDER, builder, props);
alias(TextProvider.class, StrutsConstants.STRUTS_XWORKTEXTPROVIDER, builder, props, Scope.PROTOTYPE);
- alias(StrutsTextProviderFactory.class, StrutsConstants.STRUTS_TEXT_PROVIDER_FACTORY, builder, props, Scope.PROTOTYPE);
+ alias(TextProviderFactory.class, StrutsConstants.STRUTS_TEXT_PROVIDER_FACTORY, builder, props, Scope.PROTOTYPE);
alias(LocaleProviderFactory.class, StrutsConstants.STRUTS_LOCALE_PROVIDER_FACTORY, builder, props);
alias(LocalizedTextProvider.class, StrutsConstants.STRUTS_LOCALIZED_TEXT_PROVIDER, builder, props);
[13/16] struts git commit: Increases visibility to allow reuse fields
when subclassing
Posted by lu...@apache.org.
Increases visibility to allow reuse fields when subclassing
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/03781613
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/03781613
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/03781613
Branch: refs/heads/master
Commit: 0378161365554f124b9a67f0a4ceca225bad7e89
Parents: 88a3933
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 17 09:09:23 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 17 09:09:23 2017 +0100
----------------------------------------------------------------------
.../java/com/opensymphony/xwork2/StrutsTextProviderFactory.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/03781613/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
index b242e39..ff752b9 100644
--- a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
+++ b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
@@ -24,8 +24,8 @@ import java.util.ResourceBundle;
*/
public class StrutsTextProviderFactory implements TextProviderFactory {
- private LocaleProviderFactory localeProviderFactory;
- private LocalizedTextProvider localizedTextProvider;
+ protected LocaleProviderFactory localeProviderFactory;
+ protected LocalizedTextProvider localizedTextProvider;
@Inject
public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) {
[12/16] struts git commit: Drops authors tags
Posted by lu...@apache.org.
Drops authors tags
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/88a39333
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/88a39333
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/88a39333
Branch: refs/heads/master
Commit: 88a39333ceb4890b40fa2ca8dbcc6681b899248c
Parents: e8a598c
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 17 08:12:52 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 17 08:12:52 2017 +0100
----------------------------------------------------------------------
.../java/com/opensymphony/xwork2/StrutsTextProviderFactory.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/88a39333/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
index 9743b65..b242e39 100644
--- a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
+++ b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
@@ -21,9 +21,6 @@ import java.util.ResourceBundle;
/**
* This factory enables users to provide and correctly initialize a custom TextProvider.
- *
- * @author Oleg Gorobets
- * @author Rene Gielen
*/
public class StrutsTextProviderFactory implements TextProviderFactory {
[16/16] struts git commit: WW-4756 Implements TextProviderFactory and
used it accros the framework
Posted by lu...@apache.org.
WW-4756 Implements TextProviderFactory and used it accros the framework
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/350c77ab
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/350c77ab
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/350c77ab
Branch: refs/heads/master
Commit: 350c77aba8776bec0c11ebdd6e331cb6028e0972
Parents: 3d3bee0 915e162
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 24 10:09:46 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 24 10:09:46 2017 +0100
----------------------------------------------------------------------
.../com/opensymphony/xwork2/ActionSupport.java | 2 +-
.../xwork2/DefaultLocaleProvider.java | 15 +++++
.../xwork2/StrutsTextProviderFactory.java | 68 ++++++++++++++++++++
.../xwork2/TextProviderFactory.java | 68 ++------------------
.../xwork2/TextProviderSupport.java | 14 ++--
.../config/impl/DefaultConfiguration.java | 9 +--
.../providers/XWorkConfigurationProvider.java | 11 ++--
.../validator/DelegatingValidatorContext.java | 2 +-
.../ConditionalVisitorFieldValidator.java | 6 +-
.../validators/ExpressionValidator.java | 8 ++-
.../validators/FieldExpressionValidator.java | 8 ++-
.../validator/validators/ValidatorSupport.java | 10 +--
.../validators/VisitorFieldValidator.java | 6 +-
.../org/apache/struts2/components/I18n.java | 31 +++++----
.../interceptor/FileUploadInterceptor.java | 2 +-
core/src/main/resources/struts-default.xml | 5 +-
.../xwork2/CompositeTextProviderTest.java | 1 -
.../ConversionErrorFieldValidatorTest.java | 2 +-
.../validator/DoubleRangeValidatorTest.java | 2 +-
.../xwork2/validator/EmailValidatorTest.java | 2 +-
.../validator/ExpressionValidatorTest.java | 2 +-
.../validator/RegexFieldValidatorTest.java | 2 +-
...onversionErrorFieldValidatorSupportTest.java | 2 +-
.../validator/SimpleActionValidationTest.java | 2 +-
.../StringLengthFieldValidatorTest.java | 2 +-
.../xwork2/validator/StringValidatorTest.java | 2 +-
.../xwork2/validator/URLValidatorTest.java | 2 +-
.../validators/DateRangeFieldValidatorTest.java | 2 +-
.../validators/IntRangeFieldValidatorTest.java | 2 +-
.../validators/LongRangeFieldValidatorTest.java | 2 +-
.../validators/RequiredStringValidatorTest.java | 2 +-
.../ShortRangeFieldValidatorTest.java | 2 +-
.../struts2/tiles/I18NAttributeEvaluator.java | 6 +-
33 files changed, 169 insertions(+), 133 deletions(-)
----------------------------------------------------------------------
[15/16] struts git commit: Uses protected scope instead of private to
allow override when subclassing
Posted by lu...@apache.org.
Uses protected scope instead of private to allow override when subclassing
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/915e162e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/915e162e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/915e162e
Branch: refs/heads/master
Commit: 915e162e8edd23f62089119768b0a02646e9c782
Parents: e9d7cd0
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 17 09:25:03 2017 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 17 09:25:03 2017 +0100
----------------------------------------------------------------------
.../java/com/opensymphony/xwork2/StrutsTextProviderFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/915e162e/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
index ff752b9..d398e69 100644
--- a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
+++ b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
@@ -61,7 +61,7 @@ public class StrutsTextProviderFactory implements TextProviderFactory {
return new TextProviderSupport(clazz, localeProviderFactory.createLocaleProvider(), localizedTextProvider);
}
- private TextProvider getTextProvider(ResourceBundle bundle) {
+ protected TextProvider getTextProvider(ResourceBundle bundle) {
return new TextProviderSupport(bundle, localeProviderFactory.createLocaleProvider(), localizedTextProvider);
}
[10/16] struts git commit: Defines bean in test configuration
Posted by lu...@apache.org.
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 <lu...@apache.org>
Authored: Fri Mar 17 08:03:28 2017 +0100
Committer: Lukasz Lenart <lu...@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)