You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2023/12/25 20:04:30 UTC
(freemarker) 02/02: Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch FREEMARKER-35
in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit fc7fd5fc63f8fa94ca6aa852450c8aaa2c306a1b
Merge: b3e70825 1fe9cce3
Author: ddekany <dd...@apache.org>
AuthorDate: Mon Dec 25 20:59:14 2023 +0100
Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35
README.md | 12 +-
build.gradle.kts | 51 +++---
.../freemarker/build/FreemarkerRootExtension.kt | 4 +-
.../freemarker/build/FreemarkerStringExtensions.kt | 13 +-
.../main/java/freemarker/core/Configurable.java | 6 +-
.../core/DefaultTruncateBuiltinAlgorithm.java | 33 ++--
.../java/freemarker/core/TruncateBuiltInTest.java | 21 ++-
.../freemarker/cache/WebappTemplateLoader.java | 0
.../ext/jsp/CustomTagAndELFunctionCombiner.java | 0
.../java/freemarker/ext/jsp/EventForwarding.java | 0
.../ext/jsp/FreeMarkerJspApplicationContext.java | 0
.../freemarker/ext/jsp/FreeMarkerJspFactory.java | 32 +++-
.../freemarker/ext/jsp/FreeMarkerPageContext.java | 174 +++++++++++++++------
.../java/freemarker/ext/jsp/FreemarkerTag.java | 0
.../java/freemarker/ext/jsp/JspContextModel.java | 0
.../java/freemarker/ext/jsp/JspTagModelBase.java | 0
.../java/freemarker/ext/jsp/JspWriterAdapter.java | 0
.../freemarker/ext/jsp/PageContextFactory.java | 23 ++-
.../ext/jsp/SimpleTagDirectiveModel.java | 0
.../java/freemarker/ext/jsp/TagTransformModel.java | 0
.../java/freemarker/ext/jsp/TaglibFactory.java | 0
.../java/freemarker/ext/jsp/TaglibMethodUtil.java | 0
.../src/main/java/freemarker/ext/jsp/package.html | 0
.../ext/servlet/AllHttpScopesHashModel.java | 0
.../freemarker/ext/servlet/FreemarkerServlet.java | 0
.../ext/servlet/HttpRequestHashModel.java | 0
.../servlet/HttpRequestParametersHashModel.java | 0
.../ext/servlet/HttpSessionHashModel.java | 0
.../java/freemarker/ext/servlet/IncludePage.java | 0
.../freemarker/ext/servlet/InitParamParser.java | 0
.../ext/servlet/ServletContextHashModel.java | 0
.../freemarker/ext/servlet/SuppressFBWarnings.java | 0
.../main/java/freemarker/ext/servlet/package.html | 0
.../ext/jsp/JspTestFreemarkerServlet.java | 0
...spTestFreemarkerServletWithDefaultOverride.java | 0
.../ext/jsp/RealServletContainertTest.java | 0
.../java/freemarker/ext/jsp/TLDParsingTest.java | 0
.../freemarker/ext/jsp/TaglibMethodUtilTest.java | 0
.../jsp/taglibmembers/AttributeAccessorTag.java | 0
.../ext/jsp/taglibmembers/AttributeInfoTag.java | 0
.../ext/jsp/taglibmembers/EnclosingClass.java | 0
.../ext/jsp/taglibmembers/GetAndSetTag.java | 0
.../ext/jsp/taglibmembers/TestFunctions.java | 0
.../ext/jsp/taglibmembers/TestSimpleTag.java | 0
.../ext/jsp/taglibmembers/TestSimpleTag2.java | 0
.../ext/jsp/taglibmembers/TestSimpleTag3.java | 0
.../freemarker/ext/jsp/taglibmembers/TestTag.java | 0
.../freemarker/ext/jsp/taglibmembers/TestTag2.java | 0
.../freemarker/ext/jsp/taglibmembers/TestTag3.java | 0
.../config/WebappLocalFreemarkerServlet.java | 0
.../ext/servlet/FreemarkerServletTest.java | 0
.../ext/servlet/InitParamParserTest.java | 0
.../freemarker/template/MockServletContext.java | 0
.../template/TemplateNotFoundMessageTest.java | 0
.../test/servlet/DefaultModel2TesterAction.java | 0
.../java/freemarker/test/servlet/Model2Action.java | 0
.../test/servlet/Model2TesterServlet.java | 0
.../freemarker/test/servlet/WebAppTestCase.java | 0
.../META-INF/tldDiscovery MetaInfTldSources-1.tld | 0
.../freemarker/ext/jsp/TLDParsingTest.tld | 0
.../ext/jsp/templates/classpath-test.ftl | 0
.../ext/jsp/tldDiscovery-ClassPathTlds-1.tld | 0
.../ext/jsp/tldDiscovery-ClassPathTlds-2.tld | 0
.../freemarker/ext/jsp/webapps/basic/CONTENTS.txt | 0
.../basic/WEB-INF/el-function-tag-name-clash.tld | 0
.../ext/jsp/webapps/basic/WEB-INF/el-functions.tld | 0
.../basic/WEB-INF/expected/attributes-2.3.0.txt | 0
.../WEB-INF/expected/attributes-2.3.22-future.txt | 0
.../webapps/basic/WEB-INF/expected/attributes.txt | 0
.../webapps/basic/WEB-INF/expected/customTags1.txt | 0
.../ext/jsp/webapps/basic/WEB-INF/test.tld | 0
.../ext/jsp/webapps/basic/WEB-INF/web.xml | 0
.../ext/jsp/webapps/basic/attributes.ftl | 0
.../ext/jsp/webapps/basic/customELFunctions1.ftl | 0
.../ext/jsp/webapps/basic/customELFunctions1.jsp | 0
.../ext/jsp/webapps/basic/customTags1.ftl | 0
.../jsp/webapps/basic/elFunctionsTagNameClash.ftl | 0
.../jsp/webapps/basic/elFunctionsTagNameClash.jsp | 0
.../ext/jsp/webapps/basic/trivial-jstl-@Ignore.ftl | 0
.../freemarker/ext/jsp/webapps/basic/trivial.ftl | 0
.../freemarker/ext/jsp/webapps/basic/trivial.jsp | 0
.../freemarker/ext/jsp/webapps/config/CONTENTS.txt | 0
.../webapps/config/WEB-INF/classes/sub/test.ftl | 0
.../jsp/webapps/config/WEB-INF/classes/test.ftl | 0
.../config/WEB-INF/lib/templates.jar/sub/test2.ftl | 0
.../jsp/webapps/config/WEB-INF/templates/test.ftl | 0
.../ext/jsp/webapps/config/WEB-INF/web.xml | 0
.../freemarker/ext/jsp/webapps/config/test.ftl | 0
.../freemarker/ext/jsp/webapps/errors/CONTENTS.txt | 0
.../ext/jsp/webapps/errors/WEB-INF/web.xml | 0
.../ext/jsp/webapps/errors/failing-parsetime.ftlnv | 0
.../ext/jsp/webapps/errors/failing-parsetime.jsp | 0
.../ext/jsp/webapps/errors/failing-runtime.ftl | 0
.../ext/jsp/webapps/errors/failing-runtime.jsp | 0
.../ext/jsp/webapps/errors/not-failing.ftl | 0
.../ext/jsp/webapps/multipleLoaders/CONTENTS.txt | 0
.../multipleLoaders/WEB-INF/templates/test.ftl | 0
.../jsp/webapps/multipleLoaders/WEB-INF/web.xml | 0
.../ext/jsp/webapps/tldDiscovery/CONTENTS.txt | 0
.../WEB-INF/expected/subdir/test-rel.txt | 0
.../WEB-INF/expected/test-noClasspath.txt | 0
.../tldDiscovery/WEB-INF/expected/test1.txt | 0
.../webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld | 0
.../webapps/tldDiscovery/WEB-INF/fmtesttag4.tld | 0
.../lib/taglib-foo.jar/META-INF/foo bar.tld | 0
.../WEB-INF/subdir-with-tld/fmtesttag3.tld | 0
.../WEB-INF/taglib 2.jar/META-INF/taglib.tld | 0
.../ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml | 0
.../tldDiscovery/not-auto-scanned/fmtesttag.tld | 0
.../jsp/webapps/tldDiscovery/subdir/test-rel.ftl | 0
.../jsp/webapps/tldDiscovery/test-noClasspath.ftl | 0
.../ext/jsp/webapps/tldDiscovery/test1.ftl | 0
.../test/resources/freemarker/test/servlet/web.xml | 0
.../freemarker/ext/jsp/PageContextFactory.java | 71 ---------
.../ext/jsp/_FreeMarkerPageContext2.java | 97 ------------
.../freemarker/ext/jsp/FreeMarkerJspFactory21.java | 51 ------
.../ext/jsp/_FreeMarkerPageContext21.java | 121 --------------
freemarker-manual/src/main/docgen/en_US/book.xml | 101 ++++++++++--
118 files changed, 335 insertions(+), 475 deletions(-)