freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [freemarker] 01/01: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Date Sun, 12 Jan 2020 09:52:44 GMT
This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch 2.3
in repository https://gitbox.apache.org/repos/asf/freemarker.git

commit f95cf9cee7ec16c8b16c1132821ac60871d239f5
Merge: 4a817c1 3f7f2d9
Author: ddekany <ddekany@apache.org>
AuthorDate: Sun Jan 12 10:52:25 2020 +0100

    Merge remote-tracking branch 'origin/2.3-gae' into 2.3

 src/main/java/freemarker/ext/beans/BeanModel.java  |   2 +-
 .../java/freemarker/ext/beans/BeansWrapper.java    |  51 ++++++--
 .../freemarker/ext/beans/BeansWrapperBuilder.java  |   9 +-
 .../ext/beans/BlacklistMemberAccessPolicy.java     |   2 +-
 .../ext/beans/ClassBasedModelFactory.java          |  23 ++--
 .../freemarker/ext/beans/MemberAccessPolicy.java   |   5 +
 .../MemberSelectorListMemberAccessPolicy.java      |   2 +-
 .../java/freemarker/ext/beans/StaticModel.java     |  23 ++--
 .../ext/beans/WhitelistMemberAccessPolicy.java     |   2 +-
 src/main/java/freemarker/template/SimpleHash.java  |   4 -
 .../java/freemarker/template/SimpleSequence.java   |   4 -
 src/manual/en_US/book.xml                          |  10 ++
 .../ext/beans/MemberAccessMonitoringTest.java      | 128 +++++++++++++++++++++
 13 files changed, 217 insertions(+), 48 deletions(-)


Mime
View raw message