This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 2.3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
from 3aa196d2 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
add 82453625 README: Gradle must run on at least Java 16, or else it
couldn't find the JDK 16 toolchain.
add 4ca00e77 Build: Include gradlew related files in the source distro,
except the jar. Mention this in the README.
add 6334550b FREEMARKER-219: The truncate family of built-ins, as in
maybeLong?truncate(10, ''), if the terminator string is set to 0 length, now it
will not add a space before the terminator string when the cut happened exactly
after the end of a word. Also, improved truncate-related documentation.
add 1c465db5 Build: Map camel case configuration names to dashed directory
names. (So when we will have "javaxServlet", that will be mapped to
"freemarker-javax-servlet", rather than to "freemarker-javaxServlet".)
add 65159867 Dropped support for very old Servlet and JSP versions, and
now requiring at least Servlet 3.0 and JSP 2.2. This way, we only need to
support a single javax Servlet/JSP version, and could remove the complications
from supporting multiple old versions. Also, with this, the "jsp20" and "jsp21"
Gradle configurations were unified as "javaxServlet" (because later we want to
have "jakartaServlet" too).
add 1fe9cce3 Actually updated dependencies to Servlet 3.0 and JSP 2.2.
(Also, some minor code cleanup.)
new 0b7e37bf Merge remote-tracking branch 'origin/2.3-gae' into 2.3
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:
README.md | 12 +-
build.gradle.kts | 51 +++---
.../freemarker/build/FreemarkerRootExtension.kt | 4 +-
...Extensions.kt => FreemarkerStringExtensions.kt} | 7 +-
.../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 | 27 ++--
.../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/[email protected] | 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/FreeMarkerJspFactory2.java | 30 ----
.../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 ++++++++++--
119 files changed, 331 insertions(+), 507 deletions(-)
copy buildSrc/src/main/kotlin/freemarker/build/{FreemarkerPathExtensions.kt =>
FreemarkerStringExtensions.kt} (82%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/cache/WebappTemplateLoader.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/jsp/CustomTagAndELFunctionCombiner.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/jsp/EventForwarding.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/jsp/FreeMarkerJspApplicationContext.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory.java
(68%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/jsp/FreeMarkerPageContext.java
(76%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/jsp/FreemarkerTag.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/jsp/JspContextModel.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/jsp/JspTagModelBase.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/jsp/JspWriterAdapter.java
(100%)
copy
freemarker-core/src/main/java/freemarker/core/BuiltInsForMarkupOutputs.java =>
freemarker-javax-servlet/src/main/java/freemarker/ext/jsp/PageContextFactory.java
(58%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/jsp/SimpleTagDirectiveModel.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/jsp/TagTransformModel.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/jsp/TaglibFactory.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/jsp/TaglibMethodUtil.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/jsp/package.html (100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/servlet/AllHttpScopesHashModel.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/servlet/HttpRequestHashModel.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/servlet/HttpRequestParametersHashModel.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/servlet/HttpSessionHashModel.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/servlet/IncludePage.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/servlet/InitParamParser.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/servlet/ServletContextHashModel.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/servlet/SuppressFBWarnings.java
(100%)
rename {freemarker-jsp20 =>
freemarker-javax-servlet}/src/main/java/freemarker/ext/servlet/package.html
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/JspTestFreemarkerServlet.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/JspTestFreemarkerServletWithDefaultOverride.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/RealServletContainertTest.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/TLDParsingTest.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/TaglibMethodUtilTest.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/taglibmembers/AttributeAccessorTag.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/taglibmembers/AttributeInfoTag.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/taglibmembers/EnclosingClass.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/taglibmembers/GetAndSetTag.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/taglibmembers/TestFunctions.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag2.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/taglibmembers/TestSimpleTag3.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag2.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/taglibmembers/TestTag3.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/jsp/webapps/config/WebappLocalFreemarkerServlet.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/servlet/FreemarkerServletTest.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/ext/servlet/InitParamParserTest.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/template/MockServletContext.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/template/TemplateNotFoundMessageTest.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/test/servlet/DefaultModel2TesterAction.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/test/servlet/Model2Action.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/test/servlet/Model2TesterServlet.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/java/freemarker/test/servlet/WebAppTestCase.java
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/META-INF/tldDiscovery
MetaInfTldSources-1.tld (100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/TLDParsingTest.tld
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/templates/classpath-test.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/CONTENTS.txt
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-function-tag-name-clash.tld
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.0.txt
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.22-future.txt
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes.txt
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/customTags1.txt
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/attributes.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/customTags1.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.jsp
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/[email protected]
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/config/CONTENTS.txt
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/sub/test.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/test.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar/sub/test2.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/templates/test.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/config/test.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/errors/CONTENTS.txt
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.ftlnv
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/errors/not-failing.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/CONTENTS.txt
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/templates/test.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/CONTENTS.txt
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/subdir/test-rel.txt
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test-noClasspath.txt
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test1.txt
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag
2.tld (100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar/META-INF/foo
bar.tld (100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib
2.jar/META-INF/taglib.tld (100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/subdir/test-rel.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test-noClasspath.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/test1.ftl
(100%)
rename {freemarker-jsp21 =>
freemarker-javax-servlet}/src/test/resources/freemarker/test/servlet/web.xml
(100%)
delete mode 100644
freemarker-jsp20/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory2.java
delete mode 100644
freemarker-jsp20/src/main/java/freemarker/ext/jsp/PageContextFactory.java
delete mode 100644
freemarker-jsp20/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext2.java
delete mode 100644
freemarker-jsp21/src/main/java/freemarker/ext/jsp/FreeMarkerJspFactory21.java
delete mode 100644
freemarker-jsp21/src/main/java/freemarker/ext/jsp/_FreeMarkerPageContext21.java
