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 803a85735 Merge pull request #1118 from
apache/7.0.x/merge-master-2024-11-03-v2
add 0c2d275dc WW-5482 Moves locale related code into
org.apache.struts2.locale
add 7fc0c41b1 Merge pull request #1114 from apache/feature/WW-5482-locale
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/struts2/ActionSupport.java | 2 +
.../java/org/apache/struts2/StrutsConstants.java | 383 +++++++++++++++------
.../java/org/apache/struts2/components/I18n.java | 4 +-
.../config/StrutsBeanSelectionProvider.java | 2 +-
.../struts2/config/impl/DefaultConfiguration.java | 4 +-
.../conversion/impl/DefaultTypeConverter.java | 2 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 2 +-
.../multipart/MultiPartRequestWrapper.java | 2 +-
.../interceptor/AbstractFileUploadInterceptor.java | 4 +-
.../struts2/interceptor/I18nInterceptor.java | 5 +-
.../{ => locale}/DefaultLocaleProvider.java | 3 +-
.../{ => locale}/DefaultLocaleProviderFactory.java | 2 +-
.../struts2/{ => locale}/LocaleProvider.java | 9 +-
.../{ => locale}/LocaleProviderFactory.java | 4 +-
.../struts2/text/ResourceBundleTextProvider.java | 2 +-
.../struts2/text/StrutsTextProviderFactory.java | 2 +-
.../java/org/apache/struts2/text/TextProvider.java | 7 +-
.../apache/struts2/text/TextProviderSupport.java | 4 +-
.../validator/DelegatingValidatorContext.java | 4 +-
.../apache/struts2/validator/ValidatorContext.java | 2 +-
.../struts2/views/freemarker/FreemarkerResult.java | 2 +-
core/src/main/resources/struts-beans.xml | 4 +-
.../org/apache/struts2/LocaleProviderTest.java | 1 +
.../ConfigurationProviderOgnlAllowlistTest.java | 6 +-
.../ActionFileUploadInterceptorTest.java | 2 +-
.../struts2/interceptor/I18nInterceptorTest.java | 2 +-
.../{ => locale}/DefaultLocaleProviderTest.java | 3 +-
.../struts2/text/TextProviderSupportTest.java | 2 +-
.../struts2/tiles/StrutsTilesLocaleResolver.java | 2 +-
29 files changed, 333 insertions(+), 140 deletions(-)
rename core/src/main/java/org/apache/struts2/{ =>
locale}/DefaultLocaleProvider.java (96%)
rename core/src/main/java/org/apache/struts2/{ =>
locale}/DefaultLocaleProviderFactory.java (96%)
rename core/src/main/java/org/apache/struts2/{ => locale}/LocaleProvider.java
(96%)
rename core/src/main/java/org/apache/struts2/{ =>
locale}/LocaleProviderFactory.java (94%)
rename core/src/test/java/org/apache/struts2/{ =>
locale}/DefaultLocaleProviderTest.java (98%)
