This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git.
from c178512 Forward ported from 2.3-gae: MemberAccessPolicy now also
covers the special case when toString() is called to convert and object to
string in a template. This was added as toString() might shows information that
you don't want to be exposed.
new 7e27324 Forward ported from 2.3-gae: Java 7 language cleanup
new c4145e3 Forward ported from 2.3-gae: Added missing @Overrides (Java 6
language cleanup)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../core/FM2ASTToFM3SourceConverter.java | 11 ++++-------
.../freemarker/converter/GenericConverterTest.java | 1 +
.../org/apache/freemarker/core/ASTPrinter.java | 12 +++--------
.../apache/freemarker/core/AttemptLoggingTest.java | 6 ++++--
.../freemarker/core/ConcatenatedHashTest.java | 12 +++++------
.../apache/freemarker/core/ConfigurationTest.java | 12 +++++------
.../org/apache/freemarker/core/DateFormatTest.java | 2 +-
.../freemarker/core/NullTransparencyTest.java | 8 +++-----
.../apache/freemarker/core/OutputFormatTest.java | 8 ++++----
.../core/model/impl/AlphabeticalMethodSorter.java | 1 +
...DefaultObjectWrapperMemberAccessPolicyTest.java | 4 ++++
.../core/model/impl/DefaultObjectWrapperTest.java | 4 ++--
.../Java8BridgeMethodsWithDefaultMethodBean.java | 1 +
.../model/impl/MemberAccessMonitoringTest.java | 2 +-
.../MemberSelectorListMemberAccessPolicyTest.java | 4 ++++
.../core/model/impl/MethodMatcherTest.java | 4 ++++
.../model/impl/TemplateHashModelAdapterTest.java | 6 +++---
.../impl/DefaultTruncateBuiltinAlgorithmTest.java | 3 +++
.../freemarker/core/util/DeepUnwrapTest.java | 2 +-
.../core/util/TemplateModelUtilsTest.java | 12 +++++------
.../core/valueformat/NumberFormatTest.java | 8 ++++----
.../org/apache/freemarker/core/ASTDirSetting.java | 2 +-
.../org/apache/freemarker/core/ASTElement.java | 2 +-
.../freemarker/core/BuiltInsForStringsBasic.java | 12 +++++++++++
.../org/apache/freemarker/core/Configuration.java | 2 +-
.../core/LoggingAttemptExceptionReporter.java | 1 +
.../core/MutableProcessingConfiguration.java | 2 +-
.../java/org/apache/freemarker/core/Template.java | 2 +-
.../freemarker/core/TemplateElementsToVisit.java | 2 +-
.../freemarker/core/debug/DebuggerClient.java | 9 +++------
.../core/model/impl/ClassIntrospector.java | 18 ++++++++---------
.../core/model/impl/DefaultMemberAccessPolicy.java | 4 ++--
.../impl/MemberSelectorListMemberAccessPolicy.java | 6 +++++-
.../core/model/impl/ResourceBundleModel.java | 2 +-
.../model/impl/TemplateCollectionModelAdapter.java | 2 +-
.../model/impl/TemplateIterableModelAdapter.java | 2 +-
.../model/impl/TemplateSequenceModelAdapter.java | 2 +-
.../apache/freemarker/core/util/DeepUnwrap.java | 2 +-
.../core/util/TemplateLanguageUtils.java | 2 +-
.../freemarker/core/util/TemplateModelUtils.java | 2 +-
.../freemarker/core/util/_ArrayAdapterList.java | 4 ++--
.../apache/freemarker/core/util/_ClassUtils.java | 4 +---
.../freemarker/core/util/_CollectionUtils.java | 8 ++++----
.../impl/ISOLikeTemplateDateFormatFactory.java | 4 ++--
.../apache/freemarker/dom/JaxenXPathSupport.java | 2 +-
.../java/org/apache/freemarker/dom/NodeModel.java | 4 +---
.../freemarker/servlet/FreemarkerServlet.java | 6 ++----
.../servlet/jsp/FreeMarkerPageContext.java | 2 +-
.../freemarker/servlet/jsp/TaglibFactory.java | 23 ++++++----------------
.../servlet/jsp/RealServletContainertTest.java | 6 +++---
.../freemarker/servlet/test/WebAppTestCase.java | 5 +----
.../freemarker/spring/model/UrlFunction.java | 2 +-
.../AbstractHtmlElementTemplateDirectiveModel.java | 3 ++-
.../model/form/ButtonTemplateDirectiveModel.java | 1 +
.../model/form/ErrorsTemplateDirectiveModel.java | 2 +-
.../model/form/FormTemplateDirectiveModel.java | 3 ++-
.../model/form/SelectableValueComparisonUtils.java | 2 +-
.../freemarker/spring/model/form/TagOutputter.java | 2 +-
.../spring/web/view/PageContextServletConfig.java | 2 +-
.../apache/freemarker/spring/web/view/EchoTag.java | 2 ++
.../web/view/FreeMarkerViewResolverTest.java | 2 +-
.../spring/web/view/FreeMarkerViewTest.java | 6 +++---
.../freemarker/test/MonitoredTemplateLoader.java | 2 +-
.../apache/freemarker/test/ResourcesExtractor.java | 15 +++-----------
.../test/templateutil/AssertFailsDirective.java | 1 +
65 files changed, 156 insertions(+), 156 deletions(-)
