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 2022/12/18 19:25:07 UTC
[freemarker] branch 2.3 updated (05a9c86b -> cf2bf365)
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 05a9c86b Merge remote-tracking branch 'origin/2.3-gae' into 2.3
add 537bf058 Update malformed.tld
add e5360824 Delete malformed.tld
add fd18d8e6 Merge pull request #77 from powercomstar/2.3-gae
add 8b811021 replace String by StringBuilder in ElementModel
add 1ac8b9c1 Merge pull request #82 from GVDV/2.3-gae-fix
add 0684856d Added the description of GitHub PR 82 to version history
add f1ae4950 Add support for bndtools in Eclipse
add 6af3a3b5 Merge pull request #84 from chrisrueger/allow-bnd-workspace-for-bndtools
add 77cc7ed7 Disabled Google Analytics, as per ASF Privacy Policy. Updated footer link section to be similar to what we have in freemarker-site.
add f4a42db1 Refactorings/changed related to computer number format (like ?c): - If incompatible_improvements >= 2.3.32: ?c and number_format "computer" does lossless conversion, and possibly outputs in exponential form. - Added number_format "c" as alias to "computer". - JavaTemplateNumberFormatFactory doesn't deal with "computer"/"c" anymore, so we could get rid of the related cache key workaround too - In Environment, added getCTemplateNumberFormat(), and deprecated getCNumberFormat().
add 50825718 Typo/grammar fixes in messages and comments
add 37e4dff4 (Updated version number in Manual)
add 613b8f2b (Added some tests for ArithmeticEngine.toNumber, and ?number)
add 37b5b161 FREEMARKER-198: To avoid deadlock when class initialization happens on multiple threads (like _TemplateAPI->DefaultObjectWrapper, and DefaultObjectWrapper->_TemplateAPI), factored out static fields from _TemplateAPI into their owns classes.
add 7ebbd5c8 (Refactorings/changed related to computer number format (like ?c): Added some more to version history.)
add f6f5207a FREEMARKER-208: Added ?c_lower_case, and ?c_upper_case, which are the non-localized (computer language) variants of ?lower_case, and ?upper_case. The primary problem people run into with the localized versions is that with Turkish locale the letter i, and I has different conversions as in most languages, which causes problem if the conversion was for computer consumption (for technical purposes), and not for humans.
new cf2bf365 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:
.gitignore | 5 +-
build.xml | 199 ++++++-----
src/main/java/freemarker/cache/TemplateCache.java | 5 +-
.../core/APINotSupportedTemplateException.java | 4 +-
.../java/freemarker/core/AddConcatExpression.java | 6 +-
.../java/freemarker/core/ArithmeticEngine.java | 4 +-
src/main/java/freemarker/core/BuiltIn.java | 6 +-
.../java/freemarker/core/BuiltInsForDates.java | 3 +-
.../freemarker/core/BuiltInsForMultipleTypes.java | 112 ++++---
.../java/freemarker/core/BuiltInsForNodes.java | 4 +-
.../java/freemarker/core/BuiltInsForSequences.java | 6 +-
.../freemarker/core/BuiltInsForStringsBasic.java | 21 +-
.../core/BuiltInsForStringsEncoding.java | 4 +-
.../freemarker/core/BuiltInsForStringsRegexp.java | 4 +-
src/main/java/freemarker/core/BuiltinVariable.java | 4 +-
.../freemarker/core/CTemplateNumberFormat.java | 178 ++++++++++
src/main/java/freemarker/core/Configurable.java | 6 +-
src/main/java/freemarker/core/DynamicKeyName.java | 12 +-
src/main/java/freemarker/core/Environment.java | 69 ++--
src/main/java/freemarker/core/EvalUtil.java | 4 +-
.../freemarker/core/GetOptionalTemplateMethod.java | 4 +-
src/main/java/freemarker/core/HashLiteral.java | 12 +-
src/main/java/freemarker/core/Interpret.java | 4 +-
src/main/java/freemarker/core/JSONParser.java | 10 +-
.../core/JavaTemplateNumberFormatFactory.java | 8 +-
src/main/java/freemarker/core/ListLiteral.java | 6 +-
src/main/java/freemarker/core/Macro.java | 6 +-
src/main/java/freemarker/core/Range.java | 3 +-
src/main/java/freemarker/core/RecurseNode.java | 4 +-
.../freemarker/core/TemplateConfiguration.java | 3 +-
.../java/freemarker/core/TemplateNumberFormat.java | 5 +-
src/main/java/freemarker/core/VisitNode.java | 4 +-
.../java/freemarker/core/_ArrayEnumeration.java | 2 +-
src/main/java/freemarker/core/_ArrayIterator.java | 2 +-
src/main/java/freemarker/core/_CoreAPI.java | 6 +-
src/main/java/freemarker/core/_DelayedAOrAn.java | 2 +-
.../core/_DelayedConversionToString.java | 2 +-
.../core/_DelayedFTLTypeDescription.java | 2 +-
.../freemarker/core/_DelayedGetCanonicalForm.java | 2 +-
.../java/freemarker/core/_DelayedGetMessage.java | 2 +-
.../core/_DelayedGetMessageWithoutStackTop.java | 2 +-
src/main/java/freemarker/core/_DelayedJQuote.java | 2 +-
.../freemarker/core/_DelayedJoinWithComma.java | 2 +-
.../freemarker/core/_ErrorDescriptionBuilder.java | 2 +-
src/main/java/freemarker/core/_Java8.java | 2 +-
src/main/java/freemarker/core/_Java8Impl.java | 2 +-
src/main/java/freemarker/core/_JavaVersions.java | 2 +-
src/main/java/freemarker/core/_MessageUtil.java | 2 +-
.../_ObjectBuilderSettingEvaluationException.java | 2 +-
.../core/_ObjectBuilderSettingEvaluator.java | 4 +-
.../core/_SettingEvaluationEnvironment.java | 2 +-
src/main/java/freemarker/core/_SortedArraySet.java | 2 +-
..._UnexpectedTypeErrorExplainerTemplateModel.java | 2 +-
.../freemarker/core/_UnmodifiableCompositeSet.java | 2 +-
.../java/freemarker/core/_UnmodifiableSet.java | 2 +-
.../java/freemarker/ext/ant/FreemarkerXmlTask.java | 4 +-
.../java/freemarker/ext/beans/BeansWrapper.java | 9 +-
.../ext/beans/BeansWrapperConfiguration.java | 3 +-
.../ext/beans/ClassIntrospectorBuilder.java | 7 +-
src/main/java/freemarker/ext/dom/ElementModel.java | 12 +-
.../java/freemarker/ext/jdom/NodeListModel.java | 4 +-
.../freemarker/ext/jsp/FreeMarkerPageContext.java | 6 +-
.../freemarker/ext/servlet/InitParamParser.java | 6 +-
.../java/freemarker/template/Configuration.java | 22 +-
.../freemarker/template/DefaultObjectWrapper.java | 6 +-
.../DefaultObjectWrapperConfiguration.java | 4 +-
src/main/java/freemarker/template/Template.java | 4 +-
.../java/freemarker/template/_ObjectWrappers.java | 58 ++++
.../java/freemarker/template/_TemplateAPI.java | 53 +--
.../java/freemarker/template/_VersionInts.java | 50 +++
.../freemarker/template/utility/DOMNodeModel.java | 4 +-
.../template/utility/TemplateModelUtils.java | 6 +-
src/main/javacc/FTL.jj | 352 ++++++++++----------
src/manual/en_US/book.xml | 368 +++++++++++++++++----
src/manual/en_US/docgen.cjson | 33 +-
...icEngineTest.java => ArithmeticEngineTest.java} | 31 +-
.../freemarker/core/CTemplateNumberFormatTest.java | 141 ++++++++
src/test/java/freemarker/core/NumberBiTest.java | 61 ++++
.../freemarker/template/ConfigurationTest.java | 2 +-
.../template/DefaultObjectWrapperTest.java | 2 +-
.../test/templatesuite/TemplateTestCase.java | 4 +-
.../test/templatesuite/models/LegacyList.java | 4 +-
.../templatesuite/models/TransformHashWrapper.java | 4 +-
src/test/resources/META-INF/malformed.tld | 31 --
.../test/templatesuite/expected/number-format.txt | 9 +-
.../templatesuite/expected/string-builtins1.txt | 1 +
.../test/templatesuite/templates/number-format.ftl | 18 +-
.../templatesuite/templates/string-builtins1.ftl | 7 +
88 files changed, 1447 insertions(+), 656 deletions(-)
create mode 100644 src/main/java/freemarker/core/CTemplateNumberFormat.java
create mode 100644 src/main/java/freemarker/template/_ObjectWrappers.java
create mode 100644 src/main/java/freemarker/template/_VersionInts.java
rename src/test/java/freemarker/core/{BigDecimalArithmeticEngineTest.java => ArithmeticEngineTest.java} (73%)
create mode 100644 src/test/java/freemarker/core/CTemplateNumberFormatTest.java
create mode 100644 src/test/java/freemarker/core/NumberBiTest.java
delete mode 100644 src/test/resources/META-INF/malformed.tld
[freemarker] 01/01: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Posted by dd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch 2.3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit cf2bf365a84e006fc900de090464152cf3a248e9
Merge: 05a9c86b f6f5207a
Author: ddekany <dd...@apache.org>
AuthorDate: Sun Dec 18 20:23:13 2022 +0100
Merge remote-tracking branch 'origin/2.3-gae' into 2.3
.gitignore | 5 +-
build.xml | 199 ++++++-----
src/main/java/freemarker/cache/TemplateCache.java | 5 +-
.../core/APINotSupportedTemplateException.java | 4 +-
.../java/freemarker/core/AddConcatExpression.java | 6 +-
.../java/freemarker/core/ArithmeticEngine.java | 4 +-
src/main/java/freemarker/core/BuiltIn.java | 6 +-
.../java/freemarker/core/BuiltInsForDates.java | 3 +-
.../freemarker/core/BuiltInsForMultipleTypes.java | 112 ++++---
.../java/freemarker/core/BuiltInsForNodes.java | 4 +-
.../java/freemarker/core/BuiltInsForSequences.java | 6 +-
.../freemarker/core/BuiltInsForStringsBasic.java | 21 +-
.../core/BuiltInsForStringsEncoding.java | 4 +-
.../freemarker/core/BuiltInsForStringsRegexp.java | 4 +-
src/main/java/freemarker/core/BuiltinVariable.java | 4 +-
.../freemarker/core/CTemplateNumberFormat.java | 178 ++++++++++
src/main/java/freemarker/core/Configurable.java | 6 +-
src/main/java/freemarker/core/DynamicKeyName.java | 12 +-
src/main/java/freemarker/core/Environment.java | 69 ++--
src/main/java/freemarker/core/EvalUtil.java | 4 +-
.../freemarker/core/GetOptionalTemplateMethod.java | 4 +-
src/main/java/freemarker/core/HashLiteral.java | 12 +-
src/main/java/freemarker/core/Interpret.java | 4 +-
src/main/java/freemarker/core/JSONParser.java | 10 +-
.../core/JavaTemplateNumberFormatFactory.java | 8 +-
src/main/java/freemarker/core/ListLiteral.java | 6 +-
src/main/java/freemarker/core/Macro.java | 6 +-
src/main/java/freemarker/core/Range.java | 3 +-
src/main/java/freemarker/core/RecurseNode.java | 4 +-
.../freemarker/core/TemplateConfiguration.java | 3 +-
.../java/freemarker/core/TemplateNumberFormat.java | 5 +-
src/main/java/freemarker/core/VisitNode.java | 4 +-
.../java/freemarker/core/_ArrayEnumeration.java | 2 +-
src/main/java/freemarker/core/_ArrayIterator.java | 2 +-
src/main/java/freemarker/core/_CoreAPI.java | 6 +-
src/main/java/freemarker/core/_DelayedAOrAn.java | 2 +-
.../core/_DelayedConversionToString.java | 2 +-
.../core/_DelayedFTLTypeDescription.java | 2 +-
.../freemarker/core/_DelayedGetCanonicalForm.java | 2 +-
.../java/freemarker/core/_DelayedGetMessage.java | 2 +-
.../core/_DelayedGetMessageWithoutStackTop.java | 2 +-
src/main/java/freemarker/core/_DelayedJQuote.java | 2 +-
.../freemarker/core/_DelayedJoinWithComma.java | 2 +-
.../freemarker/core/_ErrorDescriptionBuilder.java | 2 +-
src/main/java/freemarker/core/_Java8.java | 2 +-
src/main/java/freemarker/core/_Java8Impl.java | 2 +-
src/main/java/freemarker/core/_JavaVersions.java | 2 +-
src/main/java/freemarker/core/_MessageUtil.java | 2 +-
.../_ObjectBuilderSettingEvaluationException.java | 2 +-
.../core/_ObjectBuilderSettingEvaluator.java | 4 +-
.../core/_SettingEvaluationEnvironment.java | 2 +-
src/main/java/freemarker/core/_SortedArraySet.java | 2 +-
..._UnexpectedTypeErrorExplainerTemplateModel.java | 2 +-
.../freemarker/core/_UnmodifiableCompositeSet.java | 2 +-
.../java/freemarker/core/_UnmodifiableSet.java | 2 +-
.../java/freemarker/ext/ant/FreemarkerXmlTask.java | 4 +-
.../java/freemarker/ext/beans/BeansWrapper.java | 9 +-
.../ext/beans/BeansWrapperConfiguration.java | 3 +-
.../ext/beans/ClassIntrospectorBuilder.java | 7 +-
src/main/java/freemarker/ext/dom/ElementModel.java | 12 +-
.../java/freemarker/ext/jdom/NodeListModel.java | 4 +-
.../freemarker/ext/jsp/FreeMarkerPageContext.java | 6 +-
.../freemarker/ext/servlet/InitParamParser.java | 6 +-
.../java/freemarker/template/Configuration.java | 22 +-
.../freemarker/template/DefaultObjectWrapper.java | 6 +-
.../DefaultObjectWrapperConfiguration.java | 4 +-
src/main/java/freemarker/template/Template.java | 4 +-
.../java/freemarker/template/_ObjectWrappers.java | 58 ++++
.../java/freemarker/template/_TemplateAPI.java | 53 +--
.../java/freemarker/template/_VersionInts.java | 50 +++
.../freemarker/template/utility/DOMNodeModel.java | 4 +-
.../template/utility/TemplateModelUtils.java | 6 +-
src/main/javacc/FTL.jj | 352 ++++++++++----------
src/manual/en_US/book.xml | 368 +++++++++++++++++----
src/manual/en_US/docgen.cjson | 33 +-
...icEngineTest.java => ArithmeticEngineTest.java} | 31 +-
.../freemarker/core/CTemplateNumberFormatTest.java | 141 ++++++++
src/test/java/freemarker/core/NumberBiTest.java | 61 ++++
.../freemarker/template/ConfigurationTest.java | 2 +-
.../template/DefaultObjectWrapperTest.java | 2 +-
.../test/templatesuite/TemplateTestCase.java | 4 +-
.../test/templatesuite/models/LegacyList.java | 4 +-
.../templatesuite/models/TransformHashWrapper.java | 4 +-
src/test/resources/META-INF/malformed.tld | 31 --
.../test/templatesuite/expected/number-format.txt | 9 +-
.../templatesuite/expected/string-builtins1.txt | 1 +
.../test/templatesuite/templates/number-format.ftl | 18 +-
.../templatesuite/templates/string-builtins1.ftl | 7 +
88 files changed, 1447 insertions(+), 656 deletions(-)
diff --cc build.xml
index 3203983c,c219f480..ef573b95
--- a/build.xml
+++ b/build.xml
@@@ -798,11 -798,12 +798,11 @@@
<groupId>${mavenGroupId}</groupId>
<artifactId>${mavenArtifactId}</artifactId>
<version>${mavenVersion}</version>
-
+
<packaging>jar</packaging>
-
+
<name>Apache FreeMarker</name>
<description>
- Google App Engine compliant variation of FreeMarker.
FreeMarker is a "template engine"; a generic tool to generate text output based on templates.
</description>
<url>https://freemarker.apache.org/</url>