This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch FREEMARKER-35
in repository https://gitbox.apache.org/repos/asf/freemarker.git
from fdda2ffc FREEMARKER-35: Added memory leak (forever growing cache)
protection to Environment-level by-pattern Temporal format cache. Added tests
for format cache flushing, both for this cache, and for the global caches in
format factories.
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.
add f3d9d89e (Javadoc adjustments)
add 782daab2 ?c now works on strings, and it outputs a quoted string
literal that's compatible with JSON, and JavaScript. Added ?cn to format
missing/null values. Added cFormat setting to specify in what language should
?c output the values.
add dc592821 Manual: Adjusted version history, and some typo
add e5fa45f4 Improved StringUtil.jsStringEnc to support both quotation
marks and apostrophe. Added a mode that is both compatible with JSON and
JavaScript, without decreasing safety when used in JavaScript.
add 77adbf2f Added "JavaScript or JSON" CFormat, and made that the
default. Some CFormat-related JavaDoc improvements/fixes.
add 14f651f5 Further javadoc fixes/improvements related to
CFormat-s/?c/?cn.
add 21022a6c CFormat: Further API and javadoc cleanup
add 9e14cb0b CFormat: Replace two Default23*CFormat classes with a single
LegacyCFormat.
add ea1c5eaf Mostly CFormat-related code cleanup (things spotted during
forward porting into FM3)
add 956067cb (Minor typos)
add c4244bcc Deleted long unmaintained Chinese translation of the Manual
add b65c56ef Fixed outdated try.freemarker link.
add f6cd05d9 Manual: Random minor improvements
add 9f120dfe (Missing list of predefined values in output_format JavaDoc)
add 204d76ab Add fine-grained mixed-content support to markup output
formats.
add 836903b6 Merge pull request #83 from nolaviz/nolaviz-devel
add 7aebdda3 Improved documentation for the
MarkupOutputFormat.outputForeign PR (and minor test cleanup).
add 3018a7bd Slightly improved DefaultMemberAccessPolicy-rules (used by
default), and unsafeMethods.properties (long deprecated, not used by default).
add de52b49e Updated version for the coming release
add b08bee6e Minor documentation adjustments
add a10b762a Fixed broken dist classpath check, and the Java 7
compatibility issue that stay hidden because of that, till now.
add 3d96ae8a Manual: Typo fixes
new 50664ebc Merge remote-tracking branch 'origin/2.3-gae' into
FREEMARKER-35. Also, some manual modifications outside conflicts: - Temporal
wrapping is now enabled from Incompatible Improvements 2.3.33, not from 2.3.32
anymore. - Temporal related @since-s were increased to 2.3.33 too. - Java 7
support was removed (again) from build.xml.
new 959330fd FREEMARKER-35: (Avoid ant JUnit test task failing on abstract
test class)
The 2 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 | 179 +-
src/main/java/freemarker/cache/TemplateCache.java | 5 +-
.../core/APINotSupportedTemplateException.java | 4 +-
.../freemarker/core/AbstractJSONLikeFormat.java | 77 +
.../java/freemarker/core/AddConcatExpression.java | 6 +-
.../java/freemarker/core/ArithmeticEngine.java | 6 +-
src/main/java/freemarker/core/BuiltIn.java | 7 +-
.../java/freemarker/core/BuiltInsForDates.java | 3 +-
.../freemarker/core/BuiltInsForMultipleTypes.java | 123 +-
.../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 +-
src/main/java/freemarker/core/CFormat.java | 82 +
.../freemarker/core/CTemplateNumberFormat.java | 198 +
.../core/CombinedMarkupOutputFormat.java | 5 +
.../freemarker/core/CommonMarkupOutputFormat.java | 10 +
src/main/java/freemarker/core/Configurable.java | 287 +-
src/main/java/freemarker/core/DollarVariable.java | 10 +-
src/main/java/freemarker/core/DynamicKeyName.java | 12 +-
src/main/java/freemarker/core/Environment.java | 254 +-
src/main/java/freemarker/core/EvalUtil.java | 6 +-
.../core/ExtendedDecimalFormatParser.java | 4 +-
.../java/freemarker/core/FastLRUKeyValueStore.java | 2 +-
.../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/JSONCFormat.java | 56 +
src/main/java/freemarker/core/JSONParser.java | 10 +-
src/main/java/freemarker/core/JavaCFormat.java | 89 +
.../java/freemarker/core/JavaScriptCFormat.java | 56 +
.../freemarker/core/JavaScriptOrJSONCFormat.java | 64 +
.../freemarker/core/JavaTemplateNumberFormat.java | 2 +-
.../core/JavaTemplateNumberFormatFactory.java | 8 +-
.../core/JavaTemplateTemporalFormat.java | 2 +-
src/main/java/freemarker/core/LegacyCFormat.java | 173 +
src/main/java/freemarker/core/ListLiteral.java | 6 +-
src/main/java/freemarker/core/Macro.java | 6 +-
.../java/freemarker/core/MarkupOutputFormat.java | 22 +-
.../core/MissingTimeZoneParserPolicy.java | 2 +-
src/main/java/freemarker/core/OutputFormat.java | 20 +-
src/main/java/freemarker/core/PropertySetting.java | 32 +-
src/main/java/freemarker/core/Range.java | 3 +-
src/main/java/freemarker/core/RecurseNode.java | 4 +-
.../StandardCFormats.java} | 36 +-
.../freemarker/core/TemplateConfiguration.java | 12 +-
.../java/freemarker/core/TemplateFormatUtil.java | 2 +-
.../freemarker/core/TemplateMarkupOutputModel.java | 4 +-
.../java/freemarker/core/TemplateNumberFormat.java | 3 +-
.../freemarker/core/TemplateTemporalFormat.java | 2 +-
.../core/TemplateTemporalFormatFactory.java | 2 +-
.../core/UnformattableTemporalTypeException.java | 2 +-
src/main/java/freemarker/core/VisitNode.java | 4 +-
src/main/java/freemarker/core/XSCFormat.java | 99 +
.../java/freemarker/core/_ArrayEnumeration.java | 2 +-
src/main/java/freemarker/core/_ArrayIterator.java | 2 +-
src/main/java/freemarker/core/_CoreAPI.java | 6 +-
.../java/freemarker/core/_CoreStringUtils.java | 12 +
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/_MessageUtil.java | 2 +-
.../_ObjectBuilderSettingEvaluationException.java | 2 +-
.../core/_ObjectBuilderSettingEvaluator.java | 4 +-
.../core/_SettingEvaluationEnvironment.java | 2 +-
src/main/java/freemarker/core/_SortedArraySet.java | 2 +-
src/main/java/freemarker/core/_TemporalUtils.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 | 27 +-
.../ext/beans/BeansWrapperConfiguration.java | 11 +-
.../ext/beans/ClassIntrospectorBuilder.java | 7 +-
.../java/freemarker/ext/jdom/NodeListModel.java | 4 +-
.../freemarker/ext/jsp/FreeMarkerPageContext.java | 6 +-
.../java/freemarker/ext/jsp/JspTagModelBase.java | 2 +-
.../freemarker/ext/servlet/InitParamParser.java | 6 +-
.../java/freemarker/template/Configuration.java | 99 +-
.../freemarker/template/DefaultObjectWrapper.java | 6 +-
.../DefaultObjectWrapperConfiguration.java | 4 +-
src/main/java/freemarker/template/Template.java | 4 +-
.../freemarker/template/TemplateTemporalModel.java | 2 +-
.../java/freemarker/template/_ObjectWrappers.java | 58 +
.../java/freemarker/template/_TemplateAPI.java | 60 +-
.../java/freemarker/template/_VersionInts.java | 51 +
.../template/utility/CollectionUtils.java | 2 +
.../freemarker/template/utility/DOMNodeModel.java | 4 +-
.../freemarker/template/utility/StringUtil.java | 271 +-
.../template/utility/TemplateModelUtils.java | 6 +-
src/main/javacc/FTL.jj | 352 +-
.../ext/beans/DefaultMemberAccessPolicy-rules | 2 +-
.../freemarker/ext/beans/unsafeMethods.properties | 5 +-
src/main/resources/freemarker/version.properties | 8 +-
src/manual/en_US/book.xml | 1170 +-
src/manual/en_US/docgen.cjson | 33 +-
src/manual/zh_CN/book.xml | 31353 -------------------
src/manual/zh_CN/docgen-help/README | 2 -
src/manual/zh_CN/docgen-misc/googleAnalytics.html | 14 -
src/manual/zh_CN/docgen-originals/figures/README | 2 -
src/manual/zh_CN/docgen.cjson | 132 -
src/manual/zh_CN/favicon.png | Bin 1291 -> 0 bytes
src/manual/zh_CN/figures/model2sketch.png | Bin 21425 -> 0 bytes
src/manual/zh_CN/figures/overview.png | Bin 11837 -> 0 bytes
src/manual/zh_CN/figures/tree.png | Bin 4699 -> 0 bytes
src/manual/zh_CN/logo.png | Bin 10134 -> 0 bytes
...ralFormatAbstractCachingInEnvironmentTest.java} | 4 +-
.../core/AbstractTemporalFormatTest.java | 6 +-
...icEngineTest.java => ArithmeticEngineTest.java} | 31 +-
.../core/BooleanFormatEnvironmentCachingTest.java | 56 +
.../java/freemarker/core/CAndCnBuiltInTest.java | 156 +
.../java/freemarker/core/CFormatTemplateTest.java | 79 +
.../freemarker/core/CTemplateNumberFormatTest.java | 144 +
src/test/java/freemarker/core/CustomCFormat.java | 83 +
.../core/CustomTemplateTemporalFormatTest.java | 2 +-
.../java/freemarker/core/DummyOutputFormat.java | 18 +-
...ormatCacheMemoryLeakPreventionFlushingTest.java | 2 +-
...{EvalJsonBuiltInTest.java => NumberBiTest.java} | 32 +-
.../java/freemarker/core/NumberFormatTest.java | 7 +-
.../java/freemarker/core/OutputFormatTest.java | 9 +
.../freemarker/core/TemplateConfigurationTest.java | 1 +
...rmatByFormatStringCachingInEnvironmentTest.java | 2 +-
...poralFormatCurrentCachingInEnvironmentTest.java | 2 +-
.../freemarker/core/TemporalErrorMessagesTest.java | 2 +-
.../freemarker/ext/beans/BeansWrapperMiscTest.java | 4 +-
.../freemarker/template/ConfigurationTest.java | 72 +-
.../template/DefaultObjectWrapperTest.java | 9 +-
.../template/utility/StringUtilTest.java | 79 +-
.../test/templatesuite/TemplateTestCase.java | 4 +-
.../test/templatesuite/models/LegacyList.java | 4 +-
.../templatesuite/models/TransformHashWrapper.java | 4 +-
.../test/templatesuite/expected/number-format.txt | 9 +-
.../templatesuite/expected/string-builtins1.txt | 1 +
.../test/templatesuite/templates/number-format.ftl | 48 +-
.../templatesuite/templates/string-builtins1.ftl | 7 +
.../freemarker/test/templatesuite/testcases.xml | 2 +-
145 files changed, 4077 insertions(+), 32638 deletions(-)
create mode 100644 src/main/java/freemarker/core/AbstractJSONLikeFormat.java
create mode 100644 src/main/java/freemarker/core/CFormat.java
create mode 100644 src/main/java/freemarker/core/CTemplateNumberFormat.java
create mode 100644 src/main/java/freemarker/core/JSONCFormat.java
create mode 100644 src/main/java/freemarker/core/JavaCFormat.java
create mode 100644 src/main/java/freemarker/core/JavaScriptCFormat.java
create mode 100644 src/main/java/freemarker/core/JavaScriptOrJSONCFormat.java
create mode 100644 src/main/java/freemarker/core/LegacyCFormat.java
copy src/main/java/freemarker/{template/utility/Collections12.java =>
core/StandardCFormats.java} (52%)
create mode 100644 src/main/java/freemarker/core/XSCFormat.java
create mode 100644 src/main/java/freemarker/template/_ObjectWrappers.java
create mode 100644 src/main/java/freemarker/template/_VersionInts.java
delete mode 100644 src/manual/zh_CN/book.xml
delete mode 100644 src/manual/zh_CN/docgen-help/README
delete mode 100644 src/manual/zh_CN/docgen-misc/googleAnalytics.html
delete mode 100644 src/manual/zh_CN/docgen-originals/figures/README
delete mode 100644 src/manual/zh_CN/docgen.cjson
delete mode 100644 src/manual/zh_CN/favicon.png
delete mode 100644 src/manual/zh_CN/figures/model2sketch.png
delete mode 100644 src/manual/zh_CN/figures/overview.png
delete mode 100644 src/manual/zh_CN/figures/tree.png
delete mode 100644 src/manual/zh_CN/logo.png
rename
src/test/java/freemarker/core/{TemplateTemporalFormatAbstractCachingInEnvironmentTest.java
=> AbstractTemplateTemporalFormatAbstractCachingInEnvironmentTest.java} (95%)
rename src/test/java/freemarker/core/{BigDecimalArithmeticEngineTest.java =>
ArithmeticEngineTest.java} (73%)
create mode 100644
src/test/java/freemarker/core/BooleanFormatEnvironmentCachingTest.java
create mode 100644 src/test/java/freemarker/core/CAndCnBuiltInTest.java
create mode 100644 src/test/java/freemarker/core/CFormatTemplateTest.java
create mode 100644 src/test/java/freemarker/core/CTemplateNumberFormatTest.java
create mode 100644 src/test/java/freemarker/core/CustomCFormat.java
copy src/test/java/freemarker/core/{EvalJsonBuiltInTest.java =>
NumberBiTest.java} (50%)
