This is an automated email from the ASF dual-hosted git repository.

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

commit a4fe51f5b3bc04f91df3be163df9775b256795f8
Merge: cf2078d1d 3774ffa7c
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Tue Sep 27 09:49:33 2022 +0200

    Merge pull request #604 from apache/WW-5234-dtds
    
    [WW-5234] Improves DTD definitions to use proper URL

 apps/rest-showcase/src/main/resources/struts.xml   |   4 +-
 ...ction-lotsOfRichtexteditorSubmit-validation.xml |  14 +-
 .../showcase/action/EmployeeAction-validation.xml  |   2 +-
 .../showcase/action/SkillAction-validation.xml     |   2 +-
 .../fileupload/FileUploadAction-validation.xml     |   5 +-
 .../showcase/person/NewPersonAction-validation.xml |   2 +-
 .../struts2/showcase/person/Person-validation.xml  |   2 +-
 .../IteratorGeneratorTagDemo-validation.xml        |  12 +-
 ...ubmitClientSideValidationExample-validation.xml |   8 +-
 ...on-submitFieldValidatorsExamples-validation.xml |  10 +-
 ...submitNonFieldValidatorsExamples-validation.xml |  12 +-
 .../showcase/validation/QuizAction-validation.xml  |   4 +-
 ...mitApplication-submitApplication-validation.xml |   2 +-
 .../validation/User-userContext-validation.xml     |  10 +-
 ...-submitVisitorValidatorsExamples-validation.xml |   6 +-
 .../src/main/resources/struts-actionchaining.xml   |   6 +-
 apps/showcase/src/main/resources/struts-async.xml  |   2 +-
 .../src/main/resources/struts-conversion.xml       |  22 +-
 .../src/main/resources/struts-dispatcher.xml       |   2 +-
 .../src/main/resources/struts-filedownload.xml     |   2 +-
 .../src/main/resources/struts-fileupload.xml       |   8 +-
 .../src/main/resources/struts-freemarker.xml       |   6 +-
 .../showcase/src/main/resources/struts-hangman.xml |  10 +-
 .../src/main/resources/struts-interactive.xml      |   4 +-
 .../src/main/resources/struts-model-driven.xml     |   7 +-
 apps/showcase/src/main/resources/struts-person.xml |   2 +-
 .../src/main/resources/struts-tags-non-ui.xml      |  28 +-
 .../showcase/src/main/resources/struts-tags-ui.xml |   2 +-
 apps/showcase/src/main/resources/struts-tags.xml   |   2 +-
 apps/showcase/src/main/resources/struts-tiles.xml  |   2 +-
 apps/showcase/src/main/resources/struts-token.xml  |   2 +-
 .../src/main/resources/struts-validation.xml       |  40 +--
 apps/showcase/src/main/resources/struts-wait.xml   |   2 +-
 apps/showcase/src/main/resources/struts-xslt.xml   |   4 +-
 apps/showcase/src/main/resources/struts.xml        |   2 +-
 bundles/admin/src/main/resources/struts.xml        |   4 +-
 bundles/demo/src/main/resources/struts.xml         |   8 +-
 .../opensymphony/xwork2/validator/Validator.java   |   2 +-
 .../xwork2/validator/ValidatorFactory.java         |   2 +-
 .../xwork2/validator/validators/default.xml        |   2 +-
 core/src/main/resources/struts-2.0.dtd             |   8 +-
 core/src/main/resources/struts-2.1.7.dtd           |   2 +-
 core/src/main/resources/struts-2.1.dtd             |   2 +-
 core/src/main/resources/struts-2.3.dtd             |   2 +-
 core/src/main/resources/struts-2.5.dtd             |   2 +-
 core/src/main/resources/struts-6.0.dtd             |   2 +-
 core/src/main/resources/struts-default.xml         | 374 +++++++++++++--------
 core/src/main/resources/xwork-default.xml          |   2 +-
 core/src/main/resources/xwork-validator-1.0.2.dtd  |   6 +-
 core/src/main/resources/xwork-validator-1.0.3.dtd  |   2 +-
 core/src/main/resources/xwork-validator-1.0.dtd    |   6 +-
 .../main/resources/xwork-validator-config-1.0.dtd  |   2 +-
 .../resources/xwork-validator-definition-1.0.dtd   |   2 +-
 .../xwork2/ModelDrivenAction-validation.xml        |   2 +-
 .../xwork2/SimpleAction-some-alias-validation.xml  |   2 +-
 .../xwork2/SimpleAction-subproperty-validation.xml |   2 +-
 .../xwork2/SimpleAction-validation.xml             |   2 +-
 .../SimpleAction-validationAlias-validation.xml    |   2 +-
 .../xwork2/TestBean-anotherContext-validation.xml  |   2 +-
 .../xwork2/TestBean-badtest-validation.xml         |   2 +-
 .../TestBean-beanMessageBundle-validation.xml      |   2 +-
 .../TestBean-expressionValidation-validation.xml   |   2 +-
 .../opensymphony/xwork2/TestBean-validation.xml    |   2 +-
 .../TestBean-visitorChildValidation-validation.xml |   2 +-
 .../TestBean-visitorValidation-validation.xml      |   2 +-
 .../xwork2/TestChildBean-validation.xml            |   4 +-
 .../xwork2/ValidationOrderAction-validation.xml    |  18 +-
 .../providers/loadorder1/xwork-test-load-order.xml |   2 +-
 .../providers/loadorder2/xwork-test-load-order.xml |   2 +-
 .../providers/loadorder3/xwork-test-load-order.xml |   2 +-
 .../xwork2/config/providers/xwork- test.xml        |   2 +-
 .../providers/xwork-include-after-package-2.xml    |   2 +-
 .../providers/xwork-include-after-package.xml      |   2 +-
 .../providers/xwork-include-before-package-2.xml   |   2 +-
 .../providers/xwork-include-before-package.xml     |   2 +-
 .../config/providers/xwork-include-parent.xml      |   2 +-
 .../config/providers/xwork-test-action-invalid.xml |   2 +-
 .../xwork-test-actions-packagedefaultclassref.xml  |   2 +-
 .../xwork2/config/providers/xwork-test-actions.xml |   2 +-
 .../providers/xwork-test-allowed-methods.xml       |   2 +-
 .../providers/xwork-test-bad-inheritance.xml       |   4 +-
 .../config/providers/xwork-test-basic-packages.xml |   2 +-
 .../providers/xwork-test-default-package.xml       |   2 +-
 .../xwork-test-defaultclassref-package.xml         |   4 +-
 .../providers/xwork-test-envs-substitution.xml     |   2 +-
 .../providers/xwork-test-exception-mappings.xml    |   2 +-
 .../xwork-test-global-result-inheritence.xml       |   2 +-
 .../providers/xwork-test-include-wildcard.xml      |   2 +-
 .../xwork-test-interceptor-defaultref.xml          |   2 +-
 .../xwork-test-interceptor-inheritance.xml         |   2 +-
 .../xwork-test-interceptor-param-overriding.xml    |  11 +-
 .../providers/xwork-test-interceptor-params.xml    |   2 +-
 ...ork-test-interceptor-stack-param-overriding.xml |   2 +-
 .../providers/xwork-test-interceptors-basic.xml    |   2 +-
 .../providers/xwork-test-interceptors-spring.xml   |   2 +-
 .../config/providers/xwork-test-multilevel.xml     |   2 +-
 .../providers/xwork-test-package-inheritance.xml   |   4 +-
 .../xwork2/config/providers/xwork-test-reload.xml  |   2 +-
 .../providers/xwork-test-result-inheritance.xml    |   2 +-
 .../config/providers/xwork-test-result-names.xml   |   2 +-
 .../config/providers/xwork-test-result-types.xml   |   2 +-
 .../xwork2/config/providers/xwork-test-results.xml |   2 +-
 .../config/providers/xwork-test-wildcard-1.xml     |   2 +-
 .../config/providers/xwork-test-wildcard-2.xml     |   2 +-
 .../providers/xwork-test-wildcard-include.xml      |   4 +-
 .../providers/xwork-unknownhandler-stack-empty.xml |   2 +-
 .../providers/xwork-unknownhandler-stack.xml       |   2 +-
 .../xwork2/test/DataAware-validation.xml           |   2 +-
 .../test/DataAware-validationAlias-validation.xml  |   2 +-
 .../xwork2/test/DataAware2-validation.xml          |   2 +-
 .../xwork2/test/Equidae-validation.xml             |   2 +-
 .../xwork2/test/SimpleAction2-validation.xml       |   2 +-
 .../SimpleAction2-validationAlias-validation.xml   |   2 +-
 .../opensymphony/xwork2/test/User-validation.xml   |   2 +-
 .../xwork2/test/UserMarker-validation.xml          |   2 +-
 .../VisitorValidatorModelAction-validation.xml     |   2 +-
 ...atorTestAction-beanMessageBundle-validation.xml |   2 +-
 ...alidatorTestAction-validateArray-validation.xml |   2 +-
 ...ValidatorTestAction-validateList-validation.xml |   2 +-
 .../VisitorValidatorTestAction-validation.xml      |   2 +-
 ...estAction-visitorChildValidation-validation.xml |   2 +-
 ...atorTestAction-visitorValidation-validation.xml |   2 +-
 ...estAction-visitorValidationAlias-validation.xml |   2 +-
 .../xwork2/validator/validator-parser-test.xml     |   2 +-
 .../xwork2/validator/validator-parser-test2.xml    |  10 +-
 .../xwork2/validator/validator-parser-test3.xml    |   2 +-
 .../xwork2/validator/validator-parser-test4.xml    |   2 +-
 .../xwork2/validator/validator-parser-test5.xml    |   2 +-
 .../xwork2/validator/validator-parser-test6.xml    |   2 +-
 .../xwork2/validator/validators-fail.xml           |   2 +-
 core/src/test/resources/includeTest.xml            |   2 +-
 core/src/test/resources/my-validators.xml          |   2 +-
 core/src/test/resources/myOther-validators.xml     |   2 +-
 .../org/apache/struts2/TestAction-validation.xml   |   2 +-
 .../apache/struts2/dispatcher/ng/struts-no-op.xml  |   2 +-
 .../org/apache/struts2/views/jsp/WW3090-struts.xml |   2 +-
 .../jsp/ui/DoubleValidationAction-validation.xml   |   4 +-
 .../jsp/ui/IntValidationAction-validation.xml      |   2 +-
 .../struts2/views/jsp/ui/User-validation.xml       |   2 +-
 core/src/test/resources/struts-escape-body.xml     |   2 +-
 .../struts-object-factory-result-builder.xml       |   2 +-
 core/src/test/resources/struts-testing.xml         |   2 +-
 core/src/test/resources/struts.xml                 |   2 +-
 core/src/test/resources/validators.xml             |   2 +-
 core/src/test/resources/xwork-class-param-test.xml |   2 +-
 core/src/test/resources/xwork-param-test.xml       |   2 +-
 core/src/test/resources/xwork-proxyinvoke.xml      |   2 +-
 core/src/test/resources/xwork-sample.xml           |  14 +-
 core/src/test/resources/xwork-test-beans.xml       |   2 +-
 core/src/test/resources/xwork-test-default.xml     |   2 +-
 core/src/test/resources/xwork-test-validation.xml  |   4 +-
 plugins/async/src/main/resources/struts-plugin.xml |   2 +-
 .../src/main/resources/struts-plugin.xml           |   2 +-
 .../src/test/resources/bean-validation-test.xml    |   2 +-
 plugins/cdi/src/main/resources/struts-plugin.xml   |   4 +-
 .../src/main/resources/struts-plugin.xml           |  12 +-
 .../src/main/resources/struts-plugin.xml           |   2 +-
 .../src/main/resources/struts-plugin.xml           |   2 +-
 plugins/gxp/src/main/resources/struts-plugin.xml   |   4 +-
 .../src/main/resources/struts-plugin.xml           |   6 +-
 .../src/main/resources/struts-plugin.xml           |   4 +-
 .../src/main/resources/struts-plugin.xml           |   6 +-
 plugins/json/src/main/resources/struts-plugin.xml  |   2 +-
 .../resources/struts-convention-configuration.xml  |   2 +-
 .../test/resources/struts-session-values-test.xml  |   2 +-
 plugins/junit/src/test/resources/struts-test.xml   |   2 +-
 plugins/junit/src/test/resources/struts.xml        |   2 +-
 plugins/osgi/src/main/resources/struts-plugin.xml  |   6 +-
 plugins/oval/src/main/resources/struts-plugin.xml  |   2 +-
 plugins/oval/src/test/resources/oval-test.xml      |   2 +-
 .../src/main/resources/struts-plugin.xml           |   4 +-
 .../plexus/src/main/resources/struts-plugin.xml    |   4 +-
 .../src/main/resources/struts-plugin.xml           |   2 +-
 .../portlet/src/main/resources/struts-plugin.xml   |   2 +-
 plugins/portlet/src/test/resources/struts.xml      |   2 +-
 plugins/rest/src/main/resources/struts-plugin.xml  |   2 +-
 .../sitemesh/src/main/resources/struts-plugin.xml  |   2 +-
 .../spring/src/main/resources/struts-plugin.xml    |   8 +-
 .../xwork2/spring/actionContext-xwork.xml          |   4 +-
 plugins/tiles/src/main/resources/struts-plugin.xml |   2 +-
 .../velocity/src/main/resources/struts-plugin.xml  |   2 +-
 181 files changed, 559 insertions(+), 476 deletions(-)

Reply via email to