This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 3 in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 0faa766e619fd757c5712841304d1b0b396735ab Author: ddekany <[email protected]> AuthorDate: Thu Dec 28 22:01:27 2023 +0100 (Fixed typo in RealServletContainerTest test class name.) --- FM3-CHANGE-LOG.txt | 6 +++--- ...alServletContainertTest.java => RealServletContainerTest.java} | 2 +- .../webapps/basic/WEB-INF/expected/attributes-modernModels.txt | 4 ++-- .../servlet/jsp/webapps/basic/WEB-INF/expected/attributes.txt | 4 ++-- .../apache/freemarker/servlet/jsp/webapps/config/WEB-INF/web.xml | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/FM3-CHANGE-LOG.txt b/FM3-CHANGE-LOG.txt index 92b2a028..50b42eba 100644 --- a/FM3-CHANGE-LOG.txt +++ b/FM3-CHANGE-LOG.txt @@ -634,11 +634,11 @@ Core / Miscellaneous better practice is to set the format to "c", if you generate computer language output), but it's hardly a good practice to use. -Things not yet forward-ported from 2.3-gae +Things not yet forward-ported from 2.3-gae ------------------------------------------ - Lambda-like expressions: The way those work in 2.x is limited because of BC restrictions. So it should work differently here. - ?with_args/?with_args_last: Have to implement the better null handling in the template language first - Some of the Gradle build refinements, like signature related and, rebroducible build stuff -- JSP taglib support is broken with Jakarta... but then, we probably don't want to support that on Jakarta. - So it should be removed. +- JSP taglib support is broken with Jakarta, and Jetty 11. See @Ignored-s in RealServletContainerTest. But, we probably don't + want to support JSP taglibs anymore, and the feature should be removed. diff --git a/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java b/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainerTest.java similarity index 99% rename from freemarker-servlet/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java rename to freemarker-servlet/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainerTest.java index 27540e2f..e3027136 100644 --- a/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java +++ b/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainerTest.java @@ -50,7 +50,7 @@ import static org.junit.Assert.*; */ @SuppressWarnings("boxing") @SuppressFBWarnings(value="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification="Hack needed for testing only") -public class RealServletContainertTest extends WebAppTestCase { +public class RealServletContainerTest extends WebAppTestCase { private static final String WEBAPP_BASIC = "basic"; private static final String WEBAPP_TLD_DISCOVERY = "tldDiscovery"; diff --git a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/basic/WEB-INF/expected/attributes-modernModels.txt b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/basic/WEB-INF/expected/attributes-modernModels.txt index f1f2e1f8..24679ae4 100644 --- a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/basic/WEB-INF/expected/attributes-modernModels.txt +++ b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/basic/WEB-INF/expected/attributes-modernModels.txt @@ -66,8 +66,8 @@ Hash: {a=1, b=2, c=3} [org.apache.freemarker.core.model.impl.TemplateHashModelAd Values created in Java: LinkedList: [1, 2, 3] [java.util.LinkedList] ArrayList: [1, 2, 3] [java.util.ArrayList] -MyList: [1, 2, 3] [org.apache.freemarker.servlet.jsp.RealServletContainertTest$MyList] +MyList: [1, 2, 3] [org.apache.freemarker.servlet.jsp.RealServletContainerTest$MyList] LinkedHashMap: {a=1, b=2, c=3} [java.util.LinkedHashMap] TreeMap: {a=1, b=2, c=3} [java.util.TreeMap] -MyMap: {a=1, b=2, c=3} [org.apache.freemarker.servlet.jsp.RealServletContainertTest$MyMap] +MyMap: {a=1, b=2, c=3} [org.apache.freemarker.servlet.jsp.RealServletContainerTest$MyMap] TreeSet: [1, 2, 3] [java.util.TreeSet] \ No newline at end of file diff --git a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/basic/WEB-INF/expected/attributes.txt b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/basic/WEB-INF/expected/attributes.txt index f1f2e1f8..24679ae4 100644 --- a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/basic/WEB-INF/expected/attributes.txt +++ b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/basic/WEB-INF/expected/attributes.txt @@ -66,8 +66,8 @@ Hash: {a=1, b=2, c=3} [org.apache.freemarker.core.model.impl.TemplateHashModelAd Values created in Java: LinkedList: [1, 2, 3] [java.util.LinkedList] ArrayList: [1, 2, 3] [java.util.ArrayList] -MyList: [1, 2, 3] [org.apache.freemarker.servlet.jsp.RealServletContainertTest$MyList] +MyList: [1, 2, 3] [org.apache.freemarker.servlet.jsp.RealServletContainerTest$MyList] LinkedHashMap: {a=1, b=2, c=3} [java.util.LinkedHashMap] TreeMap: {a=1, b=2, c=3} [java.util.TreeMap] -MyMap: {a=1, b=2, c=3} [org.apache.freemarker.servlet.jsp.RealServletContainertTest$MyMap] +MyMap: {a=1, b=2, c=3} [org.apache.freemarker.servlet.jsp.RealServletContainerTest$MyMap] TreeSet: [1, 2, 3] [java.util.TreeSet] \ No newline at end of file diff --git a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/config/WEB-INF/web.xml b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/config/WEB-INF/web.xml index 7a4ad23a..ce87d719 100644 --- a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/config/WEB-INF/web.xml +++ b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/jsp/webapps/config/WEB-INF/web.xml @@ -87,7 +87,7 @@ <servlet> <servlet-name>freemarker-assertDefaultsFreemarkerServlet</servlet-name> - <servlet-class>org.apache.freemarker.servlet.jsp.RealServletContainertTest$AssertDefaultsFreemarkerServlet</servlet-class> + <servlet-class>org.apache.freemarker.servlet.jsp.RealServletContainerTest$AssertDefaultsFreemarkerServlet</servlet-class> <init-param> <param-name>incompatibleImprovements</param-name> <param-value>3.0.0</param-value> @@ -95,15 +95,15 @@ </servlet> <servlet> <servlet-name>freemarker-assertCustomizedDefaultsFreemarkerServlet</servlet-name> - <servlet-class>org.apache.freemarker.servlet.jsp.RealServletContainertTest$AssertCustomizedDefaultsFreemarkerServlet</servlet-class> + <servlet-class>org.apache.freemarker.servlet.jsp.RealServletContainerTest$AssertCustomizedDefaultsFreemarkerServlet</servlet-class> </servlet> <servlet> <servlet-name>freemarker-assertObjectWrapperDefaults1FreemarkerServlet</servlet-name> - <servlet-class>org.apache.freemarker.servlet.jsp.RealServletContainertTest$AssertObjectWrapperDefaults1FreemarkerServlet</servlet-class> + <servlet-class>org.apache.freemarker.servlet.jsp.RealServletContainerTest$AssertObjectWrapperDefaults1FreemarkerServlet</servlet-class> </servlet> <servlet> <servlet-name>freemarker-assertObjectWrapperDefaults2FreemarkerServlet</servlet-name> - <servlet-class>org.apache.freemarker.servlet.jsp.RealServletContainertTest$AssertObjectWrapperDefaults2FreemarkerServlet</servlet-class> + <servlet-class>org.apache.freemarker.servlet.jsp.RealServletContainerTest$AssertObjectWrapperDefaults2FreemarkerServlet</servlet-class> </servlet> </web-app> \ No newline at end of file
