freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [8/8] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Date Sat, 19 Dec 2015 16:51:21 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/ad73f5f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/ad73f5f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/ad73f5f4

Branch: refs/heads/2.3
Commit: ad73f5f4a1fa72ca63aeace0db4f01c8865c5a8b
Parents: 5203c73 41b6f83
Author: ddekany <ddekany@apache.org>
Authored: Sat Dec 19 17:46:38 2015 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sat Dec 19 17:46:38 2015 +0100

----------------------------------------------------------------------
 ...ConditionalTemplateConfigurationFactory.java |  76 ++
 .../ConditionalTemplateConfigurerFactory.java   |  75 --
 .../FirstMatchTemplateConfigurationFactory.java | 118 +++
 .../FirstMatchTemplateConfigurerFactory.java    | 118 ---
 .../MergingTemplateConfigurationFactory.java    |  78 ++
 .../cache/MergingTemplateConfigurerFactory.java |  78 --
 .../java/freemarker/cache/TemplateCache.java    |  28 +-
 .../cache/TemplateConfigurationFactory.java     |  91 ++
 .../TemplateConfigurationFactoryException.java  |  36 +
 .../cache/TemplateConfigurerFactory.java        |  91 --
 .../TemplateConfigurerFactoryException.java     |  36 -
 src/main/java/freemarker/core/Configurable.java |  16 +-
 .../java/freemarker/core/CustomAttribute.java   |  12 +-
 src/main/java/freemarker/core/Items.java        |   2 +-
 src/main/java/freemarker/core/Sep.java          |   2 +-
 .../freemarker/core/TemplateConfiguration.java  | 578 +++++++++++++
 .../freemarker/core/TemplateConfigurer.java     | 580 -------------
 .../freemarker/core/UndefinedOutputFormat.java  |   6 +-
 .../core/_ObjectBuilderSettingEvaluator.java    |  14 +-
 .../ext/servlet/FreemarkerServlet.java          |   2 +-
 .../java/freemarker/template/Configuration.java | 102 +--
 src/main/java/freemarker/template/Template.java |  30 +-
 src/manual/book.xml                             | 199 ++---
 src/manual/docgen.cjson                         |   8 +-
 .../cache/TemplateConfigurationFactoryTest.java | 230 +++++
 .../cache/TemplateConfigurerFactoryTest.java    | 230 -----
 .../java/freemarker/core/DateFormatTest.java    |   6 +-
 .../java/freemarker/core/NumberFormatTest.java  |   6 +-
 .../java/freemarker/core/OutputFormatTest.java  |  42 +-
 .../core/TemplateConfigurationTest.java         | 846 +++++++++++++++++++
 ...plateConfigurationWithTemplateCacheTest.java | 325 +++++++
 .../freemarker/core/TemplateConfigurerTest.java | 846 -------------------
 ...TemplateConfigurerWithTemplateCacheTest.java | 325 -------
 .../ext/servlet/FreemarkerServletTest.java      |  20 +-
 .../manual/ConfigureOutputFormatExamples.java   |  32 +-
 .../manual/TemplateConfigurationExamples.java   | 186 ++++
 .../manual/TemplateConfigurerExamples.java      | 186 ----
 .../freemarker/template/ConfigurationTest.java  |  41 +-
 .../ConfigureOutputFormatExamples1.properties   |   6 +-
 .../ConfigureOutputFormatExamples2.properties   |  16 +-
 .../TemplateConfigurationExamples1.properties   |   8 +
 .../TemplateConfigurationExamples2.properties   |  15 +
 .../TemplateConfigurationExamples3.properties   |  30 +
 .../TemplateConfigurerExamples1.properties      |   8 -
 .../TemplateConfigurerExamples2.properties      |  15 -
 .../TemplateConfigurerExamples3.properties      |  30 -
 46 files changed, 2914 insertions(+), 2911 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ad73f5f4/src/main/java/freemarker/template/Template.java
----------------------------------------------------------------------


Mime
View raw message