This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
from 957783b8a Merge pull request #1112 from
apache/feature/WW-5459-restructure
add 80dab5294 WW-5481 Moves text related classes into
org.apache.struts2.text
add e6c7ced60 WW-5481 Extracts duplicated code
add 058a4495b Merge pull request #1113 from apache/feature/WW-5481-text
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/struts2/ActionSupport.java | 2 +
.../org/apache/struts2/DefaultActionProxy.java | 1 +
.../java/org/apache/struts2/LocaleProvider.java | 5 +-
.../org/apache/struts2/LocalizedTextProvider.java | 49 ---
.../java/org/apache/struts2/components/Date.java | 2 +-
.../java/org/apache/struts2/components/I18n.java | 6 +-
.../config/StrutsBeanSelectionProvider.java | 6 +-
.../struts2/config/impl/DefaultConfiguration.java | 12 +-
.../struts2/conversion/impl/DateConverter.java | 2 +-
.../struts2/conversion/impl/XWorkConverter.java | 2 +-
.../interceptor/AbstractFileUploadInterceptor.java | 6 +-
.../struts2/interceptor/AliasInterceptor.java | 2 +-
.../interceptor/StaticParametersInterceptor.java | 2 +-
.../struts2/interceptor/TokenInterceptor.java | 6 +-
.../org/apache/struts2/ognl/OgnlValueStack.java | 2 +-
.../apache/struts2/ognl/OgnlValueStackFactory.java | 2 +-
.../AbstractLocalizedTextProvider.java | 220 ++++++------
.../struts2/{ => text}/CompositeTextProvider.java | 2 +-
.../struts2/{ => text}/DefaultTextProvider.java | 4 +-
.../struts2/text/GlobalLocalizedTextProvider.java | 82 +++++
.../LocalizedTextProvider.java} | 192 +++++------
.../{ => text}/ResourceBundleTextProvider.java | 6 +-
.../struts2/text/StrutsLocalizedTextProvider.java | 213 ++++++++++++
.../{ => text}/StrutsTextProviderFactory.java | 5 +-
.../apache/struts2/{ => text}/TextProvider.java | 8 +-
.../struts2/{ => text}/TextProviderFactory.java | 4 +-
.../struts2/{ => text}/TextProviderSupport.java | 66 ++--
.../java/org/apache/struts2/util/DebugUtils.java | 2 +-
.../struts2/util/StrutsLocalizedTextProvider.java | 382 ---------------------
.../apache/struts2/util/TextProviderHelper.java | 3 +-
.../java/org/apache/struts2/util/TokenHelper.java | 2 +-
.../validator/DefaultActionValidatorManager.java | 2 +-
.../validator/DelegatingValidatorContext.java | 6 +-
.../apache/struts2/validator/ValidatorContext.java | 2 +-
.../validator/validators/ValidatorSupport.java | 2 +-
.../validators/VisitorFieldValidator.java | 4 +-
core/src/main/resources/struts-beans.xml | 14 +-
.../java/org/apache/struts2/ActionSupportTest.java | 1 +
.../java/org/apache/struts2/LocaleAwareTest.java | 1 +
.../java/org/apache/struts2/ModelDrivenAction.java | 2 +-
.../java/org/apache/struts2/ObjectFactoryTest.java | 1 +
.../apache/struts2/components/ComponentTest.java | 2 +-
.../org/apache/struts2/config/SettingsTest.java | 2 +-
.../config/StrutsBeanSelectionProviderTest.java | 3 +-
.../ConfigurationProviderOgnlAllowlistTest.java | 6 +-
.../struts2/conversion/impl/DateConverterTest.java | 2 +-
.../conversion/impl/XWorkBasicConverterTest.java | 2 +-
.../conversion/impl/XWorkConverterTest.java | 4 +-
.../apache/struts2/dispatcher/DispatcherTest.java | 2 +-
.../parameter/ParametersInterceptorTest.java | 2 +-
.../org/apache/struts2/mock/DummyTextProvider.java | 2 +-
.../org/apache/struts2/mock/InjectableAction.java | 2 +-
.../java/org/apache/struts2/ognl/OgnlUtilTest.java | 2 +-
.../apache/struts2/ognl/OgnlValueStackTest.java | 2 +-
.../apache/struts2/test/ModelDrivenAction2.java | 1 -
.../{ => text}/CompositeTextProviderTest.java | 46 +--
.../{ => text}/DefaultTextProviderTest.java | 32 +-
.../StrutsLocalizedTextProviderTest.java | 111 +++---
.../struts2/{ => text}/StubTextProvider.java | 2 +-
.../{ => text}/TextProviderSupportTest.java | 33 +-
.../AnnotationActionValidatorManagerTest.java | 2 +-
.../ConversionErrorFieldValidatorTest.java | 2 +-
.../validator/DoubleRangeFieldValidatorTest.java | 2 +-
.../struts2/validator/DummyValidatorContext.java | 2 +-
.../struts2/validator/EmailValidatorTest.java | 2 +-
.../struts2/validator/ExpressionValidatorTest.java | 2 +-
.../struts2/validator/RegexFieldValidatorTest.java | 3 +-
...teConversionErrorFieldValidatorSupportTest.java | 2 +-
.../validator/SimpleActionValidationTest.java | 4 +-
.../validator/StringLengthFieldValidatorTest.java | 2 +-
.../struts2/validator/StringValidatorTest.java | 2 +-
.../apache/struts2/validator/URLValidatorTest.java | 2 +-
.../validators/AppendingValidatorContextTest.java | 6 +-
.../validators/CreditCardValidatorTest.java | 2 +-
.../validators/DateRangeFieldValidatorTest.java | 2 +-
.../validators/IntRangeFieldValidatorTest.java | 2 +-
.../validators/LongRangeFieldValidatorTest.java | 2 +-
.../validators/RequiredFieldValidatorTest.java | 2 +-
.../validators/RequiredStringValidatorTest.java | 2 +-
.../validators/ShortRangeFieldValidatorTest.java | 2 +-
.../DefaultTextProviderTest_en_CA.properties | 0
.../TextProviderSupportTest_en.properties | 0
.../interceptor/BeanValidationInterceptor.java | 2 +-
.../org/apache/struts2/mock/DummyTextProvider.java | 2 +-
.../struts2/spring/SpringObjectFactoryTest.java | 2 +-
.../struts2/tiles/I18NAttributeEvaluator.java | 4 +-
86 files changed, 719 insertions(+), 929 deletions(-)
delete mode 100644
core/src/main/java/org/apache/struts2/LocalizedTextProvider.java
rename core/src/main/java/org/apache/struts2/{util =>
text}/AbstractLocalizedTextProvider.java (77%)
rename core/src/main/java/org/apache/struts2/{ =>
text}/CompositeTextProvider.java (99%)
rename core/src/main/java/org/apache/struts2/{ =>
text}/DefaultTextProvider.java (97%)
create mode 100644
core/src/main/java/org/apache/struts2/text/GlobalLocalizedTextProvider.java
rename
core/src/main/java/org/apache/struts2/{util/GlobalLocalizedTextProvider.java =>
text/LocalizedTextProvider.java} (53%)
rename core/src/main/java/org/apache/struts2/{ =>
text}/ResourceBundleTextProvider.java (93%)
create mode 100644
core/src/main/java/org/apache/struts2/text/StrutsLocalizedTextProvider.java
rename core/src/main/java/org/apache/struts2/{ =>
text}/StrutsTextProviderFactory.java (95%)
rename core/src/main/java/org/apache/struts2/{ => text}/TextProvider.java (96%)
rename core/src/main/java/org/apache/struts2/{ =>
text}/TextProviderFactory.java (91%)
rename core/src/main/java/org/apache/struts2/{ =>
text}/TextProviderSupport.java (90%)
delete mode 100644
core/src/main/java/org/apache/struts2/util/StrutsLocalizedTextProvider.java
rename core/src/test/java/org/apache/struts2/{ =>
text}/CompositeTextProviderTest.java (83%)
rename core/src/test/java/org/apache/struts2/{ =>
text}/DefaultTextProviderTest.java (89%)
rename core/src/test/java/org/apache/struts2/{util =>
text}/StrutsLocalizedTextProviderTest.java (92%)
rename core/src/test/java/org/apache/struts2/{ => text}/StubTextProvider.java
(98%)
rename core/src/test/java/org/apache/struts2/{ =>
text}/TextProviderSupportTest.java (88%)
rename core/src/test/resources/org/apache/struts2/{ =>
text}/DefaultTextProviderTest_en_CA.properties (100%)
rename core/src/test/resources/org/apache/struts2/{ =>
text}/TextProviderSupportTest_en.properties (100%)
