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 2019/01/27 18:50:04 UTC
[freemarker] branch 2.3 updated (ea6fcf9 -> 5c3cb46)
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 ea6fcf9 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
new 0bdc181 (Manual and JavaDoc typos and small improvements)
new 43d0658 Added EU Cookie Consent bar to the online Manual
new b2ff815 Type: changed newDesciptionBuilder to newDescriptionBuilder
new a03a147 Merge commit 'refs/pull/46/head' of https://github.com/apache/freemarker into 2.3-gae
new c2c64f7 Change typo "valeu" to "value"
new a40f7bb Merge commit 'refs/pull/48/head' of https://github.com/apache/freemarker into 2.3-gae
new 6a6214a (JavaDoc addition)
new 564ec70 Added test that logs the Java and OS details
new 2c3d9ae Added dummy methods to the test MockServletContext class up to Servlet 3.1, so that the suite can be ran on later Jetty versions.
new f2602ce Revert "Added dummy methods to the test MockServletContext class up to Servlet 3.1, so that the suite can be ran on later Jetty versions."
new fec7bb7 Fix typo in package description
new ed2ab64 Merge commit 'refs/pull/49/head' of https://github.com/apache/freemarker into 2.3-gae
new c97fffb (Small JavaDoc addition)
new 764007c (Some comment typos and minor code cleanup)
new e8ef993 Added TemplateModelUtils.wrapAsHashUnion(ObjectWrapper, List<?>) and wrapAsHashUnion(ObjectWrapper, Object...), which meant to be used when you want to compose a data-model from multiple objects in a way so that their entries (Map key-value pairs, bean properties, etc.) appear together on the top level of the data-model.
new daf859e (Fixed some wrong @since versions)
new 3d29eef (Compilation error that's not an error for Eclipse)
new b1f0956 (More JavaDoc and some cleanup for wrapAsHashUnion)
new 5442e2d Fixed a typo in an old Configuration method name
new 390fe65 (Minor code cleanup)
new 1bd7316 (Fixed oversight in recent setSharedVaribles commit)
new 25361d7 Avoid logging NullPointerException when no XPath implementation was found.
new 4534050 (Removed .java file from src/test/resources, merged it into the similar test in src/test/java)
new 683a0ab Added IntelliJ IDE setup instructions
new 3d2f2b2 (Improved IntelliJ IDE setup instructions)
new c4f8478 Minor code cleanup in ext.dom
new 4ce3e63 FREEMARKER-104: In log and error messages due to no XPath implementation available, recommend adding Apache Xalan or Jaxen as dependency.
new 4245088 Better JavaDoc for getLastModified
new db4cb24 IntelliJ IDE setting improvements
new 022714a FREEMARKER-109: In JSP TLD-s, line breaks inside a function parameter lists have caused IllegalArgumentException Invalid function signature.
new 7b7217c (Git ignore addition)
new 2f6d0d3 (Typo in Manual)
new 62f9f43 (Git ignore addition)
new 9fedabc When configuring FreeMarker with string values (like with a .properties file), in the settings that support the object builder syntax, now you can create a TemplateMarkupOutputModel value with the new markup function, like markup(HTMLOutputFormat(), "<p>Example</p>").
new 6e1b282 (Typo fix in non-public member name)
new 1d5323b Better toString() for the commonly used TemplateMarkupOutputModel-s.
new 821820f (Internal JavaDoc addition)
new c948b81 HTMLOutputFormat, XMLOutputFormat, XHTMLOutputFormat aren't final classes anymore, furthermore XHTMLOutputFormat now extends XMLOutputFormat. Same applies to the respective TemplateOutputModel-s (TemplateHTMLOutputModel is not final anymore, etc.). This allows defining new custom markup output format classes that will work with program logic that's only prepared for the standard markup output formats, because instanceof SomeStandardOutputFromat will return true for them.
new c99ab91 Added getOptNumberMethodArg utility method (non-public) to BuiltIn.
new 7c5ef10 Added ?truncate built-ins and related setting
new 5b717ed (Typo fix)
new 81a6b2d TemplateModelWithAPISupport is not experimental anymore.
new 5931fb0 Improved FAQ about allowing users to upload templates
new bca98d4 Un-deprecated aBoolean?string(whenTrue, whenFalse) in the Manual, as for mere boolean formatting ?string expresses the intent better. Some minor Manual improvements around boolean formatting.
new 2d968a2 (Manual typos)
new 3c8f10b Extended big decimal format parameter "multiplier" was incorrectly written as "multipier". Now both words are recognized.
new a643276 (Other places where "multipier" was written instead of "multiplier"... these are just internal things though.)
new becf252 The "boolean_format" configuration setting now can be set to "c". Then ${aBoolean} will behave as ${aBoolean?c}. This should be only used if you are generating output for non-human (computer) consumption only. If your output has pieces for human audience too, it's still recommended to use ${aBoolean?c} where true/false is needed, and either not set the "boolean_format" at all, or set it to something that's appropriate for everyday uses (like "yes,no").
new e59e768 Indicated "multipier" VS "multiplier" issue more clearly in extended decimal format table
new 5c3cb46 Merge branch '2.3-gae' into 2.3
The 2305 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:
.gitignore | 3 +
README.md | 105 ++-
.../Editor-Inspections-FreeMarker.xml | 33 +
.../IntelliJ-IDEA/Java-code-style-FreeMarker.xml | 84 ++-
src/main/java/freemarker/cache/TemplateLoader.java | 9 +-
.../java/freemarker/core/AddConcatExpression.java | 12 +-
src/main/java/freemarker/core/BuiltIn.java | 16 +-
.../freemarker/core/BuiltInsForStringsBasic.java | 135 ++++
.../freemarker/core/CommonMarkupOutputFormat.java | 2 +-
.../core/CommonTemplateMarkupOutputModel.java | 23 +-
src/main/java/freemarker/core/Configurable.java | 168 ++++-
.../core/DefaultTruncateBuiltinAlgorithm.java | 769 +++++++++++++++++++++
.../core/ExtendedDecimalFormatParser.java | 15 +-
.../java/freemarker/core/HTMLOutputFormat.java | 13 +-
src/main/java/freemarker/core/MiscUtil.java | 2 +-
src/main/java/freemarker/core/RTFOutputFormat.java | 13 +-
.../freemarker/core/TemplateConfiguration.java | 7 +
.../freemarker/core/TemplateHTMLOutputModel.java | 9 +-
.../freemarker/core/TemplateRTFOutputModel.java | 9 +-
.../freemarker/core/TemplateXHTMLOutputModel.java | 7 +-
.../freemarker/core/TemplateXMLOutputModel.java | 9 +-
.../freemarker/core/TruncateBuiltinAlgorithm.java | 143 ++++
.../freemarker/core/UnexpectedTypeException.java | 10 +-
.../java/freemarker/core/XHTMLOutputFormat.java | 19 +-
src/main/java/freemarker/core/XMLOutputFormat.java | 11 +-
.../{_TimeZoneBuilder.java => _MarkupBuilder.java} | 25 +-
src/main/java/freemarker/core/_MessageUtil.java | 7 +-
.../core/_ObjectBuilderSettingEvaluator.java | 5 +-
.../java/freemarker/core/_TimeZoneBuilder.java | 1 +
.../ext/beans/ClassBasedModelFactory.java | 2 +-
.../java/freemarker/ext/dom/NodeListModel.java | 11 +-
src/main/java/freemarker/ext/dom/NodeModel.java | 15 +-
.../ext/dom/SunInternalXalanXPathSupport.java | 71 +-
.../java/freemarker/ext/dom/XalanXPathSupport.java | 68 +-
.../java/freemarker/ext/jsp/TaglibFactory.java | 2 +-
.../java/freemarker/ext/jsp/TaglibMethodUtil.java | 11 +-
.../java/freemarker/template/Configuration.java | 42 +-
src/main/java/freemarker/template/Template.java | 1 -
.../template/TemplateModelWithAPISupport.java | 8 +-
src/main/java/freemarker/template/package.html | 2 +-
.../template/utility/TemplateModelUtils.java | 196 ++++++
src/main/misc/overloadedNumberRules/README.txt | 2 +-
src/manual/en_US/book.xml | 519 ++++++++++++--
src/manual/en_US/docgen.cjson | 1 +
src/manual/zh_CN/docgen.cjson | 1 +
.../freemarker/core/CustomHTMLOutputFormat.java | 9 +-
.../freemarker/core/CustomTemplateHTMLModel.java | 2 +-
.../core/DefaultTruncateBuiltinAlgorithmTest.java | 669 ++++++++++++++++++
.../freemarker/core/ExtendedDecimalFormatTest.java | 4 +-
.../freemarker/core/TemplateConfigurationTest.java | 1 +
.../java/freemarker/core/TruncateBuiltInTest.java | 153 ++++
.../java/freemarker/ext/jsp/TLDParsingTest.java | 52 +-
.../freemarker/template/ConfigurationTest.java | 81 ++-
...apperTest.java => SimpleObjectWrapperTest.java} | 43 +-
.../template/utility/TemplateModelUtilTest.java | 154 ++++-
.../RuntimeEnvironmentReporterTest.java} | 32 +-
.../freemarker/ext/jsp/TLDParsingTest.tld | 12 +
.../template/SimpleObjectWrapperTest.java | 72 --
.../templatesuite/templates/boolean-formatting.ftl | 9 +-
.../templatesuite/templates/sequence-builtins.ftl | 39 +-
.../templates/string-builtins-regexps.ftl | 55 +-
.../templatesuite/templates/string-builtins2.ftl | 23 +-
62 files changed, 3498 insertions(+), 528 deletions(-)
create mode 100644 src/ide-settings/IntelliJ-IDEA/Editor-Inspections-FreeMarker.xml
create mode 100644 src/main/java/freemarker/core/DefaultTruncateBuiltinAlgorithm.java
create mode 100644 src/main/java/freemarker/core/TruncateBuiltinAlgorithm.java
copy src/main/java/freemarker/core/{_TimeZoneBuilder.java => _MarkupBuilder.java} (60%)
create mode 100644 src/test/java/freemarker/core/DefaultTruncateBuiltinAlgorithmTest.java
create mode 100644 src/test/java/freemarker/core/TruncateBuiltInTest.java
rename src/test/java/freemarker/template/{SimpleObjetWrapperTest.java => SimpleObjectWrapperTest.java} (67%)
copy src/test/java/freemarker/{core/TemplateDummyOutputModel.java => test/RuntimeEnvironmentReporterTest.java} (55%)
delete mode 100644 src/test/resources/freemarker/template/SimpleObjectWrapperTest.java