struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [struts] branch master updated (a72d1a8 -> deb4f9f)
Date Wed, 02 Dec 2020 19:11:10 GMT
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.


    from a72d1a8  WW-4929 Uses Accept-Language first even with cookies, then fallbacks to
Request
     add b4bc5dc  WW-5078 Removes support for <xwork> DTDs
     add 8a0cdb4  WW-5078 Uses more informative name for XWorkConfigurationProvider
     add b2fb778  WW-5078 Drops unneeded DTDs
     new deb4f9f  Merge pull request #452 from apache/WW-5078-removes-xwork-dtds

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../xwork2/config/ConfigurationManager.java        |  12 +-
 .../xwork2/config/impl/MockConfiguration.java      |   4 +-
 ...ava => StrutsDefaultConfigurationProvider.java} |   2 +-
 .../config/providers/XmlConfigurationProvider.java |  45 ++----
 .../xwork2/util/XWorkTestCaseHelper.java           |   6 +-
 .../config/StrutsXmlConfigurationProvider.java     |  12 +-
 .../org/apache/struts2/dispatcher/Dispatcher.java  |   2 +-
 core/src/main/resources/struts-default.xml         |   8 +-
 core/src/main/resources/xwork-1.0.dtd              | 106 --------------
 core/src/main/resources/xwork-1.1.1.dtd            | 123 ----------------
 core/src/main/resources/xwork-1.1.2.dtd            | 131 -----------------
 core/src/main/resources/xwork-1.1.dtd              | 115 ---------------
 core/src/main/resources/xwork-2.0.dtd              | 137 ------------------
 core/src/main/resources/xwork-2.1.3.dtd            | 146 -------------------
 core/src/main/resources/xwork-2.1.dtd              | 143 ------------------
 core/src/main/resources/xwork-2.3.dtd              | 149 -------------------
 core/src/main/resources/xwork-2.5.dtd              | 151 -------------------
 core/src/main/resources/xwork-2.6.dtd              | 157 --------------------
 core/src/main/resources/xwork-default.xml          |  11 +-
 .../opensymphony/xwork2/ActionInvocationTest.java  |  50 ++++---
 .../com/opensymphony/xwork2/ChainResultTest.java   |  15 +-
 .../xwork2/DefaultActionInvocationTest.java        |  22 +--
 .../xwork2/DefaultActionProxyTest.java             |   4 +-
 .../com/opensymphony/xwork2/DefaultClasstTest.java |  13 +-
 .../com/opensymphony/xwork2/LocaleAwareTest.java   |   5 +-
 .../opensymphony/xwork2/ProxyInvocationTest.java   |  13 +-
 .../opensymphony/xwork2/WildCardResultTest.java    |   3 +-
 .../xwork2/config/ConfigurationManagerTest.java    |   4 +-
 .../xwork2/config/ConfigurationTest.java           |  66 +++++----
 .../config/providers/ConfigurationTestBase.java    |   7 +-
 ...urationProviderGlobalResultInheritenceTest.java |   2 +-
 ...tionProviderInterceptorParamOverridingTest.java |   6 +-
 ...roviderInterceptorStackParamOverridingTest.java | 112 +++++++-------
 .../XmlConfigurationProviderInterceptorsTest.java  |  33 +++--
 .../providers/XmlConfigurationProviderTest.java    | 161 +++++++++++----------
 .../xwork2/interceptor/AliasInterceptorTest.java   |  25 ++--
 .../ChainingInterceptorWithConfigTest.java         |  44 +++---
 .../interceptor/ParametersInterceptorTest.java     |  71 +++++----
 .../AnnotationWorkflowInterceptorTest.java         |  37 +++--
 .../xwork2/ognl/SecurityMemberAccessProxyTest.java |  15 +-
 .../xwork2/spring/ActionsFromSpringTest.java       |  38 +++--
 .../xwork2/spring/SpringProxyUtilTest.java         |  27 ++--
 .../ActionAutowiringInterceptorTest.java           |  11 +-
 .../xwork2/util/ClassLoaderUtilTest.java           |  12 +-
 .../opensymphony/xwork2/util/MyBeanActionTest.java |   4 +-
 .../util/StrutsLocalizedTextProviderTest.java      | 125 ++++++++--------
 .../validator/DoubleRangeFieldValidatorTest.java   |   4 +-
 .../xwork2/validator/IntRangeValidatorTest.java    |   5 +-
 .../xwork2/validator/LongRangeValidatorTest.java   |   5 +-
 .../validator/ModelDrivenValidationTest.java       |  11 +-
 .../xwork2/validator/ShortRangeValidatorTest.java  |   5 +-
 .../validator/SimpleActionValidationTest.java      |  17 ++-
 .../xwork2/validator/ValidatorAnnotationTest.java  |   7 +-
 .../factory/PrefixBasedActionProxyFactoryTest.java |  68 ++++-----
 .../interceptor/FetchMetadataInterceptorTest.java  |   4 +-
 .../providers/loadorder1/xwork-test-load-order.xml |  11 +-
 .../providers/loadorder2/xwork-test-load-order.xml |  11 +-
 .../providers/loadorder3/xwork-test-load-order.xml |  11 +-
 .../xwork2/config/providers/xwork- test.xml        |  22 ++-
 .../providers/xwork-include-after-package-2.xml    |  12 +-
 .../providers/xwork-include-after-package.xml      |  12 +-
 .../providers/xwork-include-before-package-2.xml   |  12 +-
 .../providers/xwork-include-before-package.xml     |  12 +-
 .../config/providers/xwork-include-parent.xml      |  12 +-
 .../config/providers/xwork-test-action-invalid.xml |  12 +-
 .../xwork-test-actions-packagedefaultclassref.xml  |  12 +-
 .../xwork2/config/providers/xwork-test-actions.xml |  22 ++-
 .../providers/xwork-test-allowed-methods.xml       |  12 +-
 .../providers/xwork-test-bad-inheritance.xml       |  12 +-
 .../config/providers/xwork-test-basic-packages.xml |  20 ++-
 .../providers/xwork-test-default-package.xml       |  12 +-
 .../xwork-test-defaultclassref-package.xml         |  14 +-
 .../providers/xwork-test-envs-substitution.xml     |  12 +-
 .../providers/xwork-test-exception-mappings.xml    |  12 +-
 .../xwork-test-global-result-inheritence.xml       |  86 ++++++-----
 .../providers/xwork-test-include-wildcard.xml      |  12 +-
 .../xwork-test-interceptor-defaultref.xml          |  12 +-
 .../xwork-test-interceptor-inheritance.xml         |  14 +-
 .../xwork-test-interceptor-param-overriding.xml    |  11 +-
 .../providers/xwork-test-interceptor-params.xml    |  12 +-
 ...ork-test-interceptor-stack-param-overriding.xml |  88 +++++------
 .../providers/xwork-test-interceptors-basic.xml    |  12 +-
 .../providers/xwork-test-interceptors-spring.xml   |  14 +-
 .../config/providers/xwork-test-multilevel.xml     |  12 +-
 .../providers/xwork-test-package-inheritance.xml   |  12 +-
 .../xwork2/config/providers/xwork-test-reload.xml  |  12 +-
 .../providers/xwork-test-result-inheritance.xml    |  12 +-
 .../config/providers/xwork-test-result-names.xml   |  12 +-
 .../config/providers/xwork-test-result-types.xml   | 103 +++++++------
 .../xwork2/config/providers/xwork-test-results.xml |  12 +-
 .../config/providers/xwork-test-wildcard-1.xml     |  12 +-
 .../config/providers/xwork-test-wildcard-2.xml     |  12 +-
 .../providers/xwork-test-wildcard-include.xml      |  12 +-
 .../providers/xwork-unknownhandler-stack-empty.xml |  12 +-
 .../providers/xwork-unknownhandler-stack.xml       |  12 +-
 .../xwork2/spring/actionContext-xwork.xml          |   8 +-
 .../opensymphony/xwork2/spring/xwork-autowire.xml  |  24 +--
 core/src/test/resources/includeTest.xml            |  12 +-
 .../apache/struts2/dispatcher/ng/struts-no-op.xml  |   4 +-
 .../org/apache/struts2/views/jsp/WW3090-struts.xml |   4 +-
 .../resources/{xwork-1.0.dtd => struts-2.0.dtd}    |   0
 core/src/test/resources/struts.xml                 |   4 +-
 core/src/test/resources/xwork - jar.jar            | Bin 2538 -> 2063 bytes
 core/src/test/resources/xwork - zip.zip            | Bin 2509 -> 2572 bytes
 core/src/test/resources/xwork-class-param-test.xml |  11 +-
 core/src/test/resources/xwork-jar.jar              | Bin 2501 -> 2059 bytes
 core/src/test/resources/xwork-param-test.xml       |  11 +-
 core/src/test/resources/xwork-proxyinvoke.xml      |  11 +-
 core/src/test/resources/xwork-sample.xml           |  13 +-
 core/src/test/resources/xwork-test-beans.xml       |  11 +-
 core/src/test/resources/xwork-test-default.xml     |  12 +-
 core/src/test/resources/xwork-test-validation.xml  |  12 +-
 core/src/test/resources/xwork-zip.zip              | Bin 2500 -> 2564 bytes
 .../BeanValidationInterceptorTest.java             |   3 +-
 .../src/test/resources/bean-validation-test.xml    |  12 +-
 .../interceptor/OValValidationInterceptorTest.java |  61 ++++----
 plugins/oval/src/test/resources/oval-test.xml      |  27 ++--
 117 files changed, 1083 insertions(+), 2419 deletions(-)
 rename core/src/main/java/com/opensymphony/xwork2/config/providers/{XWorkConfigurationProvider.java
=> StrutsDefaultConfigurationProvider.java} (99%)
 delete mode 100644 core/src/main/resources/xwork-1.0.dtd
 delete mode 100644 core/src/main/resources/xwork-1.1.1.dtd
 delete mode 100644 core/src/main/resources/xwork-1.1.2.dtd
 delete mode 100644 core/src/main/resources/xwork-1.1.dtd
 delete mode 100644 core/src/main/resources/xwork-2.0.dtd
 delete mode 100644 core/src/main/resources/xwork-2.1.3.dtd
 delete mode 100644 core/src/main/resources/xwork-2.1.dtd
 delete mode 100644 core/src/main/resources/xwork-2.3.dtd
 delete mode 100644 core/src/main/resources/xwork-2.5.dtd
 delete mode 100644 core/src/main/resources/xwork-2.6.dtd
 rename core/src/test/resources/{xwork-1.0.dtd => struts-2.0.dtd} (100%)


Mime
View raw message