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:51:59 UTC
[struts] branch master updated (b315b6e -> 7e724a0)
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 b315b6e WW-4998 I18nInterceptor's default storage should store locale
add b2b3b55 Update Embedded JSP Plugin to utilize the most current Tomcat Juli/Jasper still compatible with JDK 7. - Replaced AnnotationHelper with InstanceHelper due to removal of AnnotationProcessor in Tomcat 7+. - Tomcat Juli/Jasper Maven artifact ids changed with Tomcat 7+. - Addition of tomcat-api dependency due to changes in Jasper for Tomcat 7+. - Applied changes to embedded plugin modules required due to Jasper API changes. - Additional unit tests for better test coverage.
add 3eaeed1 Update length check in testComplex() to compensate for miscalculation of expected length. - Test jsp is processed into a 218 line String, meaning 218 more characters (crlf vs lf) on Windows vs. Linux/Unix.
new 7e724a0 Merge pull request #307 from JCgH4164838Gh792C124B5/localS2_26_PluginFix1
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:
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(-)
delete mode 100644 plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/AnnotationHelper.java
create mode 100644 plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/InstanceHelper.java
create mode 100644 plugins/embeddedjsp/src/test/resources/org/apache/struts2/complex0.jsp
[struts] 01/01: Merge pull request #307 from
JCgH4164838Gh792C124B5/localS2_26_PluginFix1
Posted by lu...@apache.org.
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(-)