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 Sat, 11 Jan 2020 18:34:24 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 4a817c1116365e9177a1439428bbc2bdd3eaaad4
Merge: 3f0fce6 7a6e6c5
Author: ddekany <ddekany@apache.org>
AuthorDate: Sat Jan 11 19:34:00 2020 +0100

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

 .../java/freemarker/core/AddConcatExpression.java  |   5 +-
 .../java/freemarker/core/BuiltInsForNodes.java     |   4 +-
 .../java/freemarker/core/BuiltInsForSequences.java |   9 +-
 .../freemarker/core/BuiltInsForStringsBasic.java   |   3 +-
 .../freemarker/core/BuiltInsForStringsRegexp.java  |   5 +-
 src/main/java/freemarker/core/Configurable.java    |   5 +
 src/main/java/freemarker/core/DynamicKeyName.java  |  13 +-
 src/main/java/freemarker/core/Environment.java     |   9 +-
 .../freemarker/core/GetOptionalTemplateMethod.java |   3 +-
 src/main/java/freemarker/core/HashLiteral.java     |  14 +-
 src/main/java/freemarker/core/ListLiteral.java     |  11 +-
 src/main/java/freemarker/core/Macro.java           |   6 +-
 src/main/java/freemarker/core/RecurseNode.java     |   3 +-
 src/main/java/freemarker/core/TemplateElement.java |   3 +-
 src/main/java/freemarker/core/VisitNode.java       |   3 +-
 .../java/freemarker/ext/ant/FreemarkerXmlTask.java |   3 +-
 .../java/freemarker/ext/beans/BeansWrapper.java    |   4 +-
 .../ext/beans/BeansWrapperConfiguration.java       |   1 +
 .../ext/beans/BlacklistMemberAccessPolicy.java     |  50 ++
 .../freemarker/ext/beans/ConstructorMatcher.java   |   5 +
 .../ext/beans/DefaultMemberAccessPolicy.java       | 209 +++++---
 .../java/freemarker/ext/beans/FieldMatcher.java    |   5 +
 ...y.java => LegacyDefaultMemberAccessPolicy.java} |  52 +-
 .../freemarker/ext/beans/MemberAccessPolicy.java   |  23 +-
 .../java/freemarker/ext/beans/MemberMatcher.java   |  14 +-
 ...a => MemberSelectorListMemberAccessPolicy.java} | 123 +++--
 .../java/freemarker/ext/beans/MethodMatcher.java   |   5 +
 .../ext/beans/WhitelistMemberAccessPolicy.java     | 387 +-------------
 .../java/freemarker/ext/jdom/NodeListModel.java    |   3 +-
 .../ext/servlet/AllHttpScopesHashModel.java        |   8 +-
 .../freemarker/template/DefaultObjectWrapper.java  |   9 +-
 src/main/java/freemarker/template/SimpleHash.java  |   4 +
 src/main/java/freemarker/template/SimpleList.java  |   2 +-
 .../java/freemarker/template/SimpleSequence.java   |  14 +-
 .../java/freemarker/template/_TemplateAPI.java     |  27 +
 .../freemarker/template/utility/DOMNodeModel.java  |   3 +-
 .../template/utility/TemplateModelUtils.java       |   5 +-
 .../ext/beans/DefaultMemberAccessPolicy-rules      | 582 +++++++++++++++++++++
 .../freemarker/ext/beans/unsafeMethods.properties  |   8 +
 src/manual/en_US/book.xml                          |  37 +-
 .../ext/beans/DefaultMemberAccessPolicyTest.java   | 143 +++++
 ...DefaultObjectWrapperMemberAccessPolicyTest.java |  72 +--
 .../beans/LegacyDefaultMemberAccessPolicyTest.java |  73 +++
 ...ava => MemberSelectorListAccessPolicyTest.java} | 114 +++-
 .../freemarker/template/ConfigurationTest.java     |  38 ++
 .../test/templatesuite/models/LegacyList.java      |   5 +
 .../test/templatesuite/models/MultiModel1.java     |  13 +-
 .../templatesuite/models/TransformHashWrapper.java |   3 +-
 48 files changed, 1479 insertions(+), 661 deletions(-)

diff --cc src/main/java/freemarker/core/TemplateElement.java
index 0a9519b,6cb9b54..b34568e
--- a/src/main/java/freemarker/core/TemplateElement.java
+++ b/src/main/java/freemarker/core/TemplateElement.java
@@@ -22,10 -22,7 +22,9 @@@ package freemarker.core
  import java.io.IOException;
  import java.util.Collections;
  import java.util.Enumeration;
- import java.util.Map;
  
 +import javax.swing.tree.TreeNode;
 +
  import freemarker.template.SimpleSequence;
  import freemarker.template.TemplateException;
  import freemarker.template.TemplateNodeModel;


Mime
View raw message