This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch WW-5233-tiles
in repository https://gitbox.apache.org/repos/asf/struts.git
omit 6fc1b9c97 WW-5233 Marks Velocity dependencies as optional
omit 86c81ca27 Make plugin standalone with all generated resources for
velocity.
omit 0568c2d3e Make plugin standalone with all generated resources for
velocity.
omit bae3e3954 Make plugin standalone with all generated resources.
omit 6715a5243 Add generating of Autotags and tests.
omit fff3cc8ac Add missing classes and tld definition.
omit add505a3b WW-5233 Adds Tiles DTD definition
omit d694cce7c WW-5233 Fixes broken test
omit 55987963a WW-5233 Copies Tiles Portal related tests
omit c8d843e70 WW-5233 Addresses a few code smells
omit 69e5efc84 WW-5233 Addresses bugs reported by Sonar
omit 6d1f60ae1 WW-5233 Drops useless @version tag and addresses some
potential RegEx vulnerabilities
omit 3eeb2885b WW-5233 Copies Tiles Autotag related tests
omit c912c4eea WW-5233 Copies Tiles Request related tests
omit 48c522fa1 WW-5233 Upgrades Easymock to version 4.3 to support Java 17
omit e6f8f68af WW-5233 Copies Tiles Servlet related tests
omit 1d36a148b WW-5233 Copies Tiles Template related tests
omit fe815e879 WW-5233 Copies Tiles OGNL related tests
omit 53e219931 WW-5233 Copies Tiles EL related tests
omit c77dcb530 WW-5233 Copies Tiles Core related tests
omit 128d5a519 WW-5233 Copies Tiles API related tests
omit 2fd075271 WW-5233 Copies Portlet related Tiles code base
omit 1d58de276 WW-5233 Copies a based set of Tiles classes used by Struts
add c6c560516 Defines to autolink PRs to issues in ASF JIRA
add 45b36a13e Merge pull request #638 from apache/jira-autolink
add ea15306aa WW-5263 Uses porper names for CSP, COOP and COEP interceptors
add 79eebf371 Merge pull request #639 from apache/WW-5263-csp-naming
add b9b9aaf71 WW-5262 Extracts excluded classes and beans into dedicated
XML config files
add 97691a106 Merge pull request #640 from apache/WW-5262-beans
add afd04ea5a WW-5199 Allow forwarding from/to actions
add 579796de5 Merge pull request #642 from atlassian/WW-5199-forward-action
add 15dd2f223 WW-5264 Moves XSLT result into a dedicated plugin
add 0e62b4b53 Merge pull request #641 from apache/WW-5264-xslt
add 0b6735008 Applies permission to GH workflows
add 56d905d72 Merge pull request #643 from apache/gh-permission
add 63dd9536c WW-5264 Removes XSLTResult from struts-default.xml as it was
moved into plugin
add d11cf771b WW-5264 Uses proper parent package when testing XSLT result
add 0d81cdd85 Merge pull request #646 from apache/WW-5264-xslt-cleanup
add b795a920a WW-5265 Formatting fixes
add 45aa17238 WW-5265 Allow removal of a single/specific container
provider from Struts configuration
add 266d2d4ed Merge pull request #645 from
atlassian/WW-5265-remove-container-provider
add 3bad2d0ce WW-5269 Upgrades Jackson to version 2.14.1
add bcf2e1151 Merge pull request #647 from apache/WW-5269-jackson
add 08de24588 WW-5272 Extends <s:date/> to support java.sql.Time
add d90bee49b Merge pull request #649 from apache/WW-5272-time
add cde175334 WW-5277 Upgrades Freemarker to version 2.3.32
add 46738c970 Merge pull request #651 from apache/WW-5277-freemarker
new 9bb0c9ad3 WW-5233 Introduces Tiles base code into the Tiles plugin
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (6fc1b9c97)
\
N -- N -- N refs/heads/WW-5233-tiles (9bb0c9ad3)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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:
.asf.yaml | 2 +
.github/workflows/codeql.yml | 10 +-
.github/workflows/maven.yml | 2 +
apps/showcase/pom.xml | 5 +
apps/showcase/src/main/resources/struts-xslt.xml | 6 +-
.../struts2/showcase/DispatcherResultTest.java | 9 +-
bom/pom.xml | 7 +-
.../xwork2/config/ConfigurationManager.java | 9 +-
.../java/org/apache/struts2/StrutsConstants.java | 3 -
.../java/org/apache/struts2/components/Date.java | 5 +-
.../components/date/SimpleDateFormatAdapter.java | 2 +-
.../struts2/config/entities/ConstantConfig.java | 1 -
.../struts2/dispatcher/PrepareOperations.java | 15 +-
.../dispatcher/filter/StrutsExecuteFilter.java | 13 +-
.../dispatcher/filter/StrutsPrepareFilter.java | 2 +-
core/src/main/resources/struts-beans.xml | 248 +++++++++++++++++
core/src/main/resources/struts-default.xml | 310 +--------------------
.../src/main/resources/struts-excluded-classes.xml | 106 +++++++
.../xwork2/config/ConfigurationManagerTest.java | 166 ++++++-----
.../org/apache/struts2/components/DateTest.java | 32 ++-
.../apache/struts2/dispatcher/DispatcherTest.java | 2 +
plugins/pom.xml | 1 +
plugins/xslt/README.md | 3 +
plugins/{testng => xslt}/pom.xml | 23 +-
.../result}/xslt/AbstractAdapterElement.java | 31 ++-
.../struts2/result}/xslt/AbstractAdapterNode.java | 117 ++++----
.../struts2/result}/xslt/AdapterFactory.java | 26 +-
.../apache/struts2/result}/xslt/AdapterNode.java | 2 +-
.../apache/struts2/result}/xslt/ArrayAdapter.java | 7 +-
.../apache/struts2/result}/xslt/BeanAdapter.java | 57 ++--
.../struts2/result}/xslt/CollectionAdapter.java | 13 +-
.../apache/struts2/result}/xslt/MapAdapter.java | 30 +-
.../struts2/result}/xslt/ProxyAttrAdapter.java | 13 +-
.../struts2/result}/xslt/ProxyElementAdapter.java | 27 +-
.../struts2/result}/xslt/ProxyNamedNodeMap.java | 10 +-
.../struts2/result}/xslt/ProxyNodeAdapter.java | 61 ++--
.../struts2/result}/xslt/ProxyTextNodeAdapter.java | 3 +-
.../struts2/result}/xslt/ServletURIResolver.java | 26 +-
.../result}/xslt/SimpleAdapterDocument.java | 43 +--
.../struts2/result}/xslt/SimpleNodeList.java | 16 +-
.../struts2/result}/xslt/SimpleTextNode.java | 15 +-
.../apache/struts2/result}/xslt/StringAdapter.java | 10 +-
.../apache/struts2/result}/xslt/XSLTResult.java | 21 +-
.../apache/struts2/result/xslt/XsltConstants.java | 17 +-
.../org/apache/struts2/result}/xslt/package.html | 0
.../xslt/src/main/resources/struts-plugin.xml | 9 +-
.../struts2/result}/xslt/XSLTResultTest.java | 124 ++++-----
.../src/test/resources/XSLTResultTest-val.xml | 0
.../resources/XSLTResultTest.bad.character.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest2.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest3.xsl | 0
.../test/resources/XSLTResultTest4.badinclude.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest4.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest5.xsl | 0
.../xslt}/src/test/resources/XSLTResultTest6.xsl | 0
pom.xml | 52 ++--
57 files changed, 923 insertions(+), 789 deletions(-)
create mode 100644 core/src/main/resources/struts-beans.xml
create mode 100644 core/src/main/resources/struts-excluded-classes.xml
create mode 100644 plugins/xslt/README.md
copy plugins/{testng => xslt}/pom.xml (86%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/AbstractAdapterElement.java
(86%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/AbstractAdapterNode.java
(76%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/AdapterFactory.java
(91%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/AdapterNode.java
(98%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/ArrayAdapter.java
(89%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/BeanAdapter.java
(77%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/CollectionAdapter.java
(84%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/MapAdapter.java (72%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/ProxyAttrAdapter.java
(93%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/ProxyElementAdapter.java
(89%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/ProxyNamedNodeMap.java
(93%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/ProxyNodeAdapter.java
(68%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/ProxyTextNodeAdapter.java
(98%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/ServletURIResolver.java
(73%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/SimpleAdapterDocument.java
(89%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/SimpleNodeList.java
(82%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/SimpleTextNode.java
(88%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/StringAdapter.java
(93%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/XSLTResult.java (94%)
copy core/src/main/java/com/opensymphony/xwork2/util/ClearableValueStack.java
=> plugins/xslt/src/main/java/org/apache/struts2/result/xslt/XsltConstants.java
(75%)
rename {core/src/main/java/org/apache/struts2/views =>
plugins/xslt/src/main/java/org/apache/struts2/result}/xslt/package.html (100%)
copy core/src/test/resources/struts-checkbox-submit-unchecked.xml =>
plugins/xslt/src/main/resources/struts-plugin.xml (81%)
rename {core/src/test/java/org/apache/struts2/views =>
plugins/xslt/src/test/java/org/apache/struts2/result}/xslt/XSLTResultTest.java
(68%)
rename {core => plugins/xslt}/src/test/resources/XSLTResultTest-val.xml (100%)
rename {core =>
plugins/xslt}/src/test/resources/XSLTResultTest.bad.character.xsl (100%)
rename {core => plugins/xslt}/src/test/resources/XSLTResultTest.xsl (100%)
rename {core => plugins/xslt}/src/test/resources/XSLTResultTest2.xsl (100%)
rename {core => plugins/xslt}/src/test/resources/XSLTResultTest3.xsl (100%)
rename {core =>
plugins/xslt}/src/test/resources/XSLTResultTest4.badinclude.xsl (100%)
rename {core => plugins/xslt}/src/test/resources/XSLTResultTest4.xsl (100%)
rename {core => plugins/xslt}/src/test/resources/XSLTResultTest5.xsl (100%)
rename {core => plugins/xslt}/src/test/resources/XSLTResultTest6.xsl (100%)