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 (210a530 -> 57db5c3)
Date Mon, 11 Jan 2021 06:33:17 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 210a530  Merge pull request #466 from apache/WW-5056-allows-dash
     add ef72783  WW-5021 Introduces a new constant to allow define a path to static content
     add f956910  WW-5021 Adds validation of the provided static content path
     add 1f70627  WW-5021 Adds missing validation for trailing "/"
     new 57db5c3  Merge pull request #462 from apache/WW-5021-static-content-path

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:
 .../apache/struts2/showcase/StaticContentTest.java |  4 +-
 .../admin/src/main/resources/osgi/admin/shell.ftl  | 12 ++--
 .../src/main/resources/osgi/admin/viewBundle.ftl   |  8 +--
 .../src/main/resources/osgi/admin/viewBundles.ftl  |  8 +--
 .../java/org/apache/struts2/StrutsConstants.java   |  3 +
 .../java/org/apache/struts2/components/UIBean.java | 12 +++-
 .../struts2/config/entities/ConstantConfig.java    | 11 ++++
 .../dispatcher/DefaultStaticContentLoader.java     | 64 +++++++++++++---------
 .../struts2/dispatcher/StaticContentLoader.java    | 50 +++++++++++++++--
 .../org/apache/struts2/default.properties          |  8 ++-
 .../resources/template/css_xhtml/form-validate.ftl |  2 +-
 .../src/main/resources/template/css_xhtml/head.ftl |  2 +-
 .../template/simple/form-close-tooltips.ftl        |  4 +-
 core/src/main/resources/template/simple/head.ftl   |  2 +-
 .../template/simple/inputtransferselect.ftl        |  2 +-
 .../template/simple/optiontransferselect.ftl       |  2 +-
 .../resources/template/simple/updownselect.ftl     |  2 +-
 .../resources/template/xhtml/form-validate.ftl     |  2 +-
 core/src/main/resources/template/xhtml/head.ftl    |  2 +-
 core/src/main/resources/template/xhtml/tooltip.ftl |  2 +-
 .../org/apache/struts2/components/UIBeanTest.java  | 37 +++++++++++++
 .../config/entities/ConstantConfigTest.java        | 32 +++++++++++
 .../dispatcher/DefaultStaticContentLoaderTest.java | 45 ++++++++++++---
 .../dispatcher/StaticContentLoaderTest.java        | 18 +++---
 ...rutsPrepareAndExecuteFilterIntegrationTest.java |  2 +-
 .../dispatcher/TwoFilterIntegrationTest.java       |  2 +-
 .../apache/struts2/views/jsp/ui/TooltipTest.java   | 26 ++++-----
 .../org/apache/struts2/views/jsp/ui/Formtag-11.txt |  4 +-
 .../org/apache/struts2/views/jsp/ui/Formtag-2.txt  |  4 +-
 .../org/apache/struts2/views/jsp/ui/Formtag-22.txt |  4 +-
 .../org/apache/struts2/views/jsp/ui/Formtag-24.txt |  4 +-
 .../org/apache/struts2/views/jsp/ui/Formtag-6.txt  |  2 +-
 .../apache/struts2/views/jsp/ui/HeadTagTest-1.txt  |  4 +-
 .../struts2/views/jsp/ui/inputtransferselect-1.txt |  2 +-
 .../views/jsp/ui/optiontransferselect-1.txt        |  2 +-
 .../views/jsp/ui/optiontransferselect-2.txt        |  2 +-
 .../views/jsp/ui/optiontransferselect-3.txt        |  2 +-
 .../views/jsp/ui/optiontransferselect-4.txt        |  2 +-
 .../views/jsp/ui/optiontransferselect-5.txt        |  2 +-
 .../views/jsp/ui/optiontransferselect-6.txt        |  2 +-
 .../views/jsp/ui/optiontransferselect-7.txt        |  2 +-
 .../org/apache/struts2/views/jsp/ui/tooltip-1.txt  |  6 +-
 .../org/apache/struts2/views/jsp/ui/tooltip-2.txt  |  6 +-
 .../org/apache/struts2/views/jsp/ui/tooltip-3.txt  |  6 +-
 .../org/apache/struts2/views/jsp/ui/tooltip-4.txt  |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-1.txt     |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-10.txt    |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-11.txt    |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-2.txt     |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-3.txt     |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-4.txt     |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-5.txt     |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-6.txt     |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-7.txt     |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-8.txt     |  2 +-
 .../struts2/views/jsp/ui/updownselecttag-9.txt     |  2 +-
 .../struts2/views/java/simple/HeadHandler.java     |  2 +-
 .../apache/struts2/views/java/simple/HeadTest.java |  2 +-
 58 files changed, 316 insertions(+), 132 deletions(-)


Mime
View raw message