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 579796de5 Merge pull request #642 from atlassian/WW-5199-forward-action add 15dd2f223 WW-5264 Moves XSLT result into a dedicated plugin new 0e62b4b53 Merge pull request #641 from apache/WW-5264-xslt 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: apps/showcase/pom.xml | 5 + bom/pom.xml | 5 + .../java/org/apache/struts2/StrutsConstants.java | 3 - .../struts2/config/entities/ConstantConfig.java | 1 - core/src/main/resources/struts-default.xml | 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 | 45 +++++--- 41 files changed, 388 insertions(+), 378 deletions(-) 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%)