freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [25/25] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Date Mon, 13 Mar 2017 10:43:41 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/0254eca3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/0254eca3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/0254eca3

Branch: refs/heads/2.3
Commit: 0254eca3f288149d32fb87672a1db4d359ab650a
Parents: 617ad6f edc0e41
Author: ddekany <ddekany@apache.org>
Authored: Mon Mar 13 11:43:03 2017 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Mon Mar 13 11:43:03 2017 +0100

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 README                                          |   8 +-
 build.properties.sample                         |   1 +
 build.xml                                       |  33 +-
 src/main/java/freemarker/core/Interpret.java    |   4 +-
 .../freemarker/core/TemplateConfiguration.java  |   4 +-
 src/main/java/freemarker/core/_Java6Impl.java   |   2 +
 src/main/java/freemarker/core/_Java8.java       |  34 ++
 src/main/java/freemarker/core/_Java8Impl.java   |  41 ++
 .../java/freemarker/core/_JavaVersions.java     |  45 +++
 .../java/freemarker/ext/beans/BeansWrapper.java |  77 +++-
 .../ext/beans/BeansWrapperConfiguration.java    |  37 +-
 .../freemarker/ext/beans/ClassIntrospector.java | 400 ++++++++++++++++---
 .../ext/beans/ClassIntrospectorBuilder.java     |  15 +
 .../java/freemarker/ext/beans/MethodSorter.java |   6 +-
 .../java/freemarker/ext/beans/_MethodUtil.java  |  26 ++
 .../java/freemarker/ext/dom/NodeListModel.java  |  10 +-
 .../java/freemarker/template/Configuration.java |   8 +
 .../template/DefaultEnumerationAdapter.java     | 119 ++++++
 .../template/DefaultIteratorAdapter.java        |   7 +-
 .../DefaultNonListCollectionAdapter.java        |   2 +-
 .../template/DefaultObjectWrapper.java          |  16 +
 .../freemarker/template/SimpleCollection.java   |  10 +-
 .../template/TemplateCollectionModelEx.java     |   8 -
 src/main/javacc/FTL.jj                          |   5 -
 src/manual/en_US/book.xml                       | 119 +++++-
 .../core/InterpretAndEvalTemplateNameTest.java  |  17 +-
 .../ext/beans/AlphabeticalMethodSorter.java     |   9 +-
 .../beans/BeansWrapperBridgeMethodsTest.java    |  65 +++
 .../ext/beans/BeansWrapperJava8Test.java        | 239 +++++++++++
 .../ext/beans/BeansWrapperSingletonsTest.java   | 141 +++----
 .../freemarker/ext/beans/BridgeMethodsBean.java |  30 ++
 .../ext/beans/BridgeMethodsBeanBase.java        |  29 ++
 .../BridgeMethodsWithDefaultMethodBean.java     |  29 ++
 .../BridgeMethodsWithDefaultMethodBean2.java    |  23 ++
 .../BridgeMethodsWithDefaultMethodBeanBase.java |  31 ++
 ...BridgeMethodsWithDefaultMethodBeanBase2.java |  28 ++
 ...GetPropertyNameFromReaderMethodNameTest.java |  61 +++
 .../ext/beans/Java8DefaultMethodsBean.java      |  83 ++++
 .../ext/beans/Java8DefaultMethodsBeanBase.java  |  90 +++++
 .../freemarker/template/ConfigurationTest.java  |   5 +
 .../template/DefaultObjectWrapperTest.java      |  76 +++-
 .../test/templatesuite/templates/exthash.ftl    |  48 ---
 43 files changed, 1766 insertions(+), 276 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message