freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [12/12] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Date Thu, 24 Sep 2015 20:21:45 GMT
Merge remote-tracking branch 'origin/2.3-gae' into 2.3


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a0eaf3da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a0eaf3da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a0eaf3da

Branch: refs/heads/2.3
Commit: a0eaf3da9724a063bf04ccc5e5968c843e914b02
Parents: 53bf6b3 f32a506
Author: ddekany <ddekany@apache.org>
Authored: Thu Sep 24 22:20:22 2015 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Thu Sep 24 22:20:22 2015 +0200

----------------------------------------------------------------------
 build.xml                                       |  17 +-
 ivy.xml                                         |   5 -
 .../freemarker/core/AddConcatExpression.java    |  56 +-
 src/main/java/freemarker/core/Assignment.java   |   9 +-
 .../BackwardCompatibleTemplateNumberFormat.java |   2 +-
 .../core/BuiltInForLegacyEscaping.java          |  11 +-
 .../core/BuiltInsForMultipleTypes.java          |  55 +-
 .../core/BuiltInsForOutputFormatRelated.java    |  21 +-
 .../core/BuiltInsForStringsEncoding.java        |  25 +
 src/main/java/freemarker/core/Configurable.java |  71 ++-
 .../java/freemarker/core/DollarVariable.java    |  33 +-
 src/main/java/freemarker/core/Environment.java  |  88 +--
 src/main/java/freemarker/core/EvalUtil.java     |  66 ++-
 src/main/java/freemarker/core/Expression.java   |   4 -
 .../core/ISOLikeTemplateDateFormat.java         |  36 +-
 .../freemarker/core/JavaTemplateDateFormat.java |  19 +-
 .../core/JavaTemplateNumberFormat.java          |  12 +-
 src/main/java/freemarker/core/MessageUtil.java  |  31 +-
 .../java/freemarker/core/NumberLiteral.java     |   2 +-
 .../core/ParsingNotSupportedException.java      |  37 ++
 .../freemarker/core/TemplateDateFormat.java     |  74 +--
 .../freemarker/core/TemplateFormatUtil.java     |  15 +-
 .../freemarker/core/TemplateNumberFormat.java   |  66 +--
 .../core/TemplateXHTMLOutputModel.java          |  40 ++
 .../core/UnformattableDateException.java        |  41 --
 .../core/UnformattableNumberException.java      |  41 --
 .../core/UnformattableValueException.java       |  41 ++
 ...nDateTypeFormattingUnsupportedException.java |   2 +-
 ...nownDateTypeParsingUnsupportedException.java |  36 ++
 .../core/UnparsableValueException.java          |  38 ++
 .../java/freemarker/core/XHTMLOutputFormat.java |  73 +++
 .../freemarker/ext/jsp/PageContextFactory.java  |   3 +-
 .../ext/jsp/_FreeMarkerPageContext1.java        |  37 --
 .../java/freemarker/template/Configuration.java |  14 +-
 src/main/javacc/FTL.jj                          |  15 +-
 src/manual/book.xml                             | 578 ++++++++++++++++---
 .../core/AppMetaTemplateDateFormatFactory.java  | 121 ++++
 .../core/BaseNTemplateNumberFormatFactory.java  |  12 +-
 .../java/freemarker/core/DateFormatTest.java    | 112 +++-
 ...EpochMillisDivTemplateDateFormatFactory.java |  17 +-
 .../EpochMillisTemplateDateFormatFactory.java   |  17 +-
 .../core/HexTemplateNumberFormatFactory.java    |  12 +-
 ...AndTZSensitiveTemplateDateFormatFactory.java |  19 +-
 ...aleSensitiveTemplateNumberFormatFactory.java |  12 +-
 .../java/freemarker/core/NumberFormatTest.java  |  73 ++-
 .../PrintfGTemplateNumberFormatFactory.java     | 134 +++++
 .../freemarker/core/XHTMLOutputFormatTest.java  |  60 ++
 .../freemarker/template/ConfigurationTest.java  |  65 +++
 48 files changed, 1736 insertions(+), 632 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0eaf3da/build.xml
----------------------------------------------------------------------


Mime
View raw message