freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [02/16] incubator-freemarker git commit: Merge branch '3' into feature/FREEMARKER-55
Date Tue, 04 Jul 2017 07:44:13 GMT
Merge branch '3' into feature/FREEMARKER-55


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

Branch: refs/heads/3
Commit: ec2d37c6dbf19ec4aca839b9bea737e0881e0f02
Parents: 584b46b 2548f5c
Author: Woonsan Ko <woonsan@apache.org>
Authored: Wed Jun 28 16:19:19 2017 -0400
Committer: Woonsan Ko <woonsan@apache.org>
Committed: Wed Jun 28 16:19:19 2017 -0400

----------------------------------------------------------------------
 FM3-CHANGE-LOG.txt                              |   6 +-
 .../freemarker/core/AttemptLoggingTest.java     | 100 +++++++++++++++++++
 .../freemarker/core/ConfigurationTest.java      |  32 +++++-
 .../core/TemplateConfigurationTest.java         |   1 +
 .../core/templatesuite/templates/boolean.ftl    |   4 +
 .../core/AttemptExceptionReporter.java          |  45 +++++++++
 .../apache/freemarker/core/Configuration.java   |  21 ++++
 .../org/apache/freemarker/core/Environment.java |  35 ++++---
 .../core/LoggingAttemptExceptionReporter.java   |  43 ++++++++
 .../core/MutableProcessingConfiguration.java    |  87 +++++++++++++++-
 .../core/ProcessingConfiguration.java           |  26 ++++-
 .../org/apache/freemarker/core/Template.java    |  14 ++-
 .../freemarker/core/TemplateConfiguration.java  |  27 ++++-
 freemarker-core/src/main/javacc/FTL.jj          |   2 +-
 14 files changed, 415 insertions(+), 28 deletions(-)
----------------------------------------------------------------------



Mime
View raw message