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 2017/03/15 12:31:50 UTC

[08/10] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

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/e98aa75d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e98aa75d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e98aa75d

Branch: refs/heads/2.3
Commit: e98aa75d44c391f0418eb9e28fde745947c15b96
Parents: 0254eca ca52e2d
Author: ddekany <dd...@apache.org>
Authored: Wed Mar 15 13:20:12 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Mar 15 13:20:12 2017 +0100

----------------------------------------------------------------------
 .gitattributes                                  |  17 ++
 .gitignore                                      |  17 ++
 README                                          |   3 +
 .../freemarker/core/BuiltInsForSequences.java   |   2 +-
 src/main/java/freemarker/core/Configurable.java |  16 +-
 .../java/freemarker/template/Configuration.java | 109 ++++++++-
 .../template/DefaultEnumerationAdapter.java     |   5 -
 .../java/freemarker/template/_TemplateAPI.java  |  10 +
 src/manual/en_US/book.xml                       |  70 +++++-
 .../core/ExtendedDecimalFormatTest.java         |  27 ++-
 .../java/freemarker/core/SQLTimeZoneTest.java   |   2 +
 .../beans/BeansWrapperBridgeMethodsTest.java    |  65 -----
 .../ext/beans/BeansWrapperJava8Test.java        | 239 -------------------
 .../BridgeMethodsWithDefaultMethodBean.java     |  29 ---
 .../BridgeMethodsWithDefaultMethodBean2.java    |  23 --
 .../BridgeMethodsWithDefaultMethodBeanBase.java |  31 ---
 ...BridgeMethodsWithDefaultMethodBeanBase2.java |  28 ---
 .../Java8BeansWrapperBridgeMethodsTest.java     |  65 +++++
 .../ext/beans/Java8BeansWrapperTest.java        | 239 +++++++++++++++++++
 ...Java8BridgeMethodsWithDefaultMethodBean.java |  29 +++
 ...ava8BridgeMethodsWithDefaultMethodBean2.java |  23 ++
 ...8BridgeMethodsWithDefaultMethodBeanBase.java |  31 +++
 ...BridgeMethodsWithDefaultMethodBeanBase2.java |  28 +++
 .../freemarker/template/ConfigurationTest.java  |  63 +++++
 src/test/java/freemarker/test/TemplateTest.java |  19 ++
 25 files changed, 738 insertions(+), 452 deletions(-)
----------------------------------------------------------------------