You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@struts.apache.org by lu...@apache.org on 2019/01/10 07:52:00 UTC

[struts] 01/01: Merge pull request #307 from JCgH4164838Gh792C124B5/localS2_26_PluginFix1

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 7e724a0159586a8c1c22e980b4e9c736ce404e0b
Merge: b315b6e 3eaeed1
Author: Lukasz Lenart <lu...@gmail.com>
AuthorDate: Thu Jan 10 08:51:55 2019 +0100

    Merge pull request #307 from JCgH4164838Gh792C124B5/localS2_26_PluginFix1
    
    Update Embedded JSP Plugin (more current Juli/Jasper versions)

 plugins/embeddedjsp/pom.xml                        |   4 +-
 .../main/java/org/apache/struts2/JSPLoader.java    |  26 ++-
 .../main/java/org/apache/struts2/JSPRuntime.java   |   5 +-
 .../apache/struts2/jasper/compiler/Generator.java  |  35 ++--
 .../struts2/jasper/runtime/AnnotationHelper.java   |  75 -------
 .../struts2/jasper/runtime/InstanceHelper.java     | 191 ++++++++++++++++++
 .../struts2/jasper/runtime/TagHandlerPool.java     |  21 +-
 .../struts2/jasper/servlet/JspCServletContext.java | 141 +++++++++++++
 .../apache/struts2/jasper/servlet/JspServlet.java  |   2 +-
 .../struts2/jasper/servlet/JspServletWrapper.java  |  16 +-
 .../struts2/jasper/tagplugins/jstl/Util.java       |  11 +
 .../org/apache/struts2/EmbeddedJSPResultTest.java  |  63 ++++++
 .../test/resources/org/apache/struts2/complex0.jsp | 221 +++++++++++++++++++++
 pom.xml                                            |  15 +-
 14 files changed, 698 insertions(+), 128 deletions(-)