freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [50/50] [abbrv] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Date Wed, 01 Mar 2017 14:21:48 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/617ad6fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/617ad6fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/617ad6fc

Branch: refs/heads/2.3
Commit: 617ad6fc005fefc0a0e4cd211c903a6b5a84e5bb
Parents: 402d667 83eac15
Author: ddekany <ddekany@apache.org>
Authored: Wed Mar 1 15:20:22 2017 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Wed Mar 1 15:20:22 2017 +0100

----------------------------------------------------------------------
 LICENSE                                         |   12 +
 NOTICE                                          |   28 +-
 README                                          |   30 +-
 build.xml                                       |   14 +-
 ivy.xml                                         |   12 +-
 src/dist/bin/LICENSE                            |  232 ++++
 src/dist/bin/NOTICE                             |   50 -
 src/dist/bin/documentation/index.html           |    4 +-
 src/dist/jar/META-INF/LICENSE                   |  202 ++++
 src/dist/jar/META-INF/NOTICE                    |   23 -
 src/dist/javadoc/META-INF/LICENSE               |  202 ++++
 src/dist/javadoc/META-INF/NOTICE                |    5 -
 .../Formatter-profile-FreeMarker.xml            |  313 ------
 .../Eclipse/Formatter-profile-FreeMarker.xml    |  313 ++++++
 .../Java-code-style-FreeMarker.xml              |   53 +
 src/main/java/freemarker/cache/AndMatcher.java  |    4 +-
 .../cache/ByteArrayTemplateLoader.java          |   93 +-
 .../java/freemarker/cache/CacheStorage.java     |    4 +-
 .../cache/CacheStorageWithGetSize.java          |    4 +-
 .../freemarker/cache/ClassTemplateLoader.java   |   16 +-
 .../cache/ConcurrentCacheStorage.java           |    4 +-
 ...ConditionalTemplateConfigurationFactory.java |    4 +-
 .../freemarker/cache/FileExtensionMatcher.java  |    4 +-
 .../freemarker/cache/FileNameGlobMatcher.java   |    4 +-
 .../freemarker/cache/FileTemplateLoader.java    |   50 +-
 .../FirstMatchTemplateConfigurationFactory.java |    4 +-
 .../MergingTemplateConfigurationFactory.java    |    4 +-
 .../java/freemarker/cache/MruCacheStorage.java  |    4 +-
 .../freemarker/cache/MultiTemplateLoader.java   |   75 +-
 src/main/java/freemarker/cache/NotMatcher.java  |    4 +-
 .../java/freemarker/cache/NullCacheStorage.java |    4 +-
 src/main/java/freemarker/cache/OrMatcher.java   |    4 +-
 .../java/freemarker/cache/PathGlobMatcher.java  |    4 +-
 .../java/freemarker/cache/PathRegexMatcher.java |    4 +-
 .../java/freemarker/cache/SoftCacheStorage.java |    4 +-
 .../cache/StatefulTemplateLoader.java           |    4 +-
 .../freemarker/cache/StringTemplateLoader.java  |   85 +-
 .../freemarker/cache/StrongCacheStorage.java    |    4 +-
 .../java/freemarker/cache/TemplateCache.java    |   15 +-
 .../cache/TemplateConfigurationFactory.java     |    4 +-
 .../TemplateConfigurationFactoryException.java  |    4 +-
 .../java/freemarker/cache/TemplateLoader.java   |   17 +-
 .../freemarker/cache/TemplateLoaderUtils.java   |    4 +-
 .../freemarker/cache/TemplateLookupContext.java |    9 +-
 .../freemarker/cache/TemplateLookupResult.java  |    4 +-
 .../cache/TemplateLookupStrategy.java           |    4 +-
 .../freemarker/cache/TemplateNameFormat.java    |   58 +-
 .../freemarker/cache/TemplateSourceMatcher.java |    4 +-
 .../freemarker/cache/URLTemplateLoader.java     |   65 +-
 .../freemarker/cache/URLTemplateSource.java     |    7 +-
 .../freemarker/cache/WebappTemplateLoader.java  |   13 +-
 src/main/java/freemarker/cache/_CacheAPI.java   |   12 +-
 src/main/java/freemarker/cache/package.html     |    4 +-
 .../core/APINotSupportedTemplateException.java  |    4 +-
 .../freemarker/core/AddConcatExpression.java    |    4 +-
 ...AliasTargetTemplateValueFormatException.java |    4 +-
 .../core/AliasTemplateDateFormatFactory.java    |    4 +-
 .../core/AliasTemplateNumberFormatFactory.java  |    4 +-
 .../java/freemarker/core/AndExpression.java     |    4 +-
 .../java/freemarker/core/ArithmeticEngine.java  |    4 +-
 .../freemarker/core/ArithmeticExpression.java   |    4 +-
 src/main/java/freemarker/core/Assignment.java   |    4 +-
 .../freemarker/core/AssignmentInstruction.java  |    4 +-
 src/main/java/freemarker/core/AttemptBlock.java |    4 +-
 src/main/java/freemarker/core/AutoEscBlock.java |    4 +-
 .../BackwardCompatibleTemplateNumberFormat.java |    4 +-
 .../java/freemarker/core/BlockAssignment.java   |    4 +-
 .../java/freemarker/core/BodyInstruction.java   |    4 +-
 .../java/freemarker/core/BooleanExpression.java |    4 +-
 .../java/freemarker/core/BooleanLiteral.java    |    4 +-
 .../java/freemarker/core/BoundedRangeModel.java |    4 +-
 .../java/freemarker/core/BreakInstruction.java  |    4 +-
 src/main/java/freemarker/core/BugException.java |    4 +-
 src/main/java/freemarker/core/BuiltIn.java      |   21 +-
 .../core/BuiltInBannedWhenAutoEscaping.java     |    4 +-
 .../java/freemarker/core/BuiltInForDate.java    |    4 +-
 .../java/freemarker/core/BuiltInForHashEx.java  |    4 +-
 .../core/BuiltInForLegacyEscaping.java          |    4 +-
 .../freemarker/core/BuiltInForLoopVariable.java |    4 +-
 .../freemarker/core/BuiltInForMarkupOutput.java |    4 +-
 .../java/freemarker/core/BuiltInForNode.java    |    4 +-
 .../java/freemarker/core/BuiltInForNodeEx.java  |   38 +
 .../java/freemarker/core/BuiltInForNumber.java  |    4 +-
 .../freemarker/core/BuiltInForSequence.java     |    4 +-
 .../java/freemarker/core/BuiltInForString.java  |    4 +-
 .../core/BuiltInWithParseTimeParameters.java    |    4 +-
 .../java/freemarker/core/BuiltInsForDates.java  |    4 +-
 .../core/BuiltInsForExistenceHandling.java      |  132 +++
 .../java/freemarker/core/BuiltInsForHashes.java |    4 +-
 .../core/BuiltInsForLoopVariables.java          |    4 +-
 .../core/BuiltInsForMarkupOutputs.java          |    4 +-
 .../core/BuiltInsForMultipleTypes.java          |    4 +-
 .../java/freemarker/core/BuiltInsForNodes.java  |   24 +-
 .../freemarker/core/BuiltInsForNumbers.java     |    4 +-
 .../core/BuiltInsForOutputFormatRelated.java    |    4 +-
 .../freemarker/core/BuiltInsForSequences.java   |    4 +-
 .../core/BuiltInsForStringsBasic.java           |    4 +-
 .../core/BuiltInsForStringsEncoding.java        |    4 +-
 .../freemarker/core/BuiltInsForStringsMisc.java |    4 +-
 .../core/BuiltInsForStringsRegexp.java          |    4 +-
 .../core/BuiltInsWithParseTimeParameters.java   |    4 +-
 .../java/freemarker/core/BuiltinVariable.java   |    4 +-
 .../java/freemarker/core/CSSOutputFormat.java   |    4 +-
 ...lPlaceCustomDataInitializationException.java |    4 +-
 src/main/java/freemarker/core/Case.java         |    4 +-
 .../freemarker/core/CollectionAndSequence.java  |    4 +-
 .../core/CombinedMarkupOutputFormat.java        |    4 +-
 src/main/java/freemarker/core/CommandLine.java  |    4 +-
 src/main/java/freemarker/core/Comment.java      |    4 +-
 .../core/CommonMarkupOutputFormat.java          |    4 +-
 .../core/CommonTemplateMarkupOutputModel.java   |    4 +-
 .../freemarker/core/ComparisonExpression.java   |    4 +-
 .../java/freemarker/core/CompressedBlock.java   |    4 +-
 .../java/freemarker/core/ConditionalBlock.java  |    4 +-
 src/main/java/freemarker/core/Configurable.java |   10 +-
 .../java/freemarker/core/CustomAttribute.java   |    5 +-
 src/main/java/freemarker/core/DebugBreak.java   |    4 +-
 .../freemarker/core/DefaultToExpression.java    |    4 +-
 .../freemarker/core/DirectiveCallPlace.java     |    4 +-
 .../java/freemarker/core/DollarVariable.java    |    4 +-
 src/main/java/freemarker/core/Dot.java          |    4 +-
 .../java/freemarker/core/DynamicKeyName.java    |    4 +-
 src/main/java/freemarker/core/ElseOfList.java   |    4 +-
 src/main/java/freemarker/core/Environment.java  |   21 +-
 src/main/java/freemarker/core/EscapeBlock.java  |    4 +-
 src/main/java/freemarker/core/EvalUtil.java     |    5 +-
 .../java/freemarker/core/ExistenceBuiltins.java |  132 ---
 .../java/freemarker/core/ExistsExpression.java  |    4 +-
 src/main/java/freemarker/core/Expression.java   |    4 +-
 .../core/ExtendedDecimalFormatParser.java       |    4 +-
 .../freemarker/core/FallbackInstruction.java    |    4 +-
 .../java/freemarker/core/FlushInstruction.java  |    4 +-
 .../java/freemarker/core/FreeMarkerTree.java    |    4 +-
 .../java/freemarker/core/HTMLOutputFormat.java  |    4 +-
 src/main/java/freemarker/core/HashLiteral.java  |    5 +-
 .../java/freemarker/core/ICIChainMember.java    |    4 +-
 .../core/ISOLikeTemplateDateFormat.java         |    4 +-
 .../core/ISOLikeTemplateDateFormatFactory.java  |    4 +-
 .../freemarker/core/ISOTemplateDateFormat.java  |    4 +-
 .../core/ISOTemplateDateFormatFactory.java      |    4 +-
 src/main/java/freemarker/core/Identifier.java   |    4 +-
 src/main/java/freemarker/core/IfBlock.java      |    4 +-
 src/main/java/freemarker/core/Include.java      |    4 +-
 .../java/freemarker/core/Interpolation.java     |    4 +-
 src/main/java/freemarker/core/Interpret.java    |    4 +-
 .../core/InvalidFormatParametersException.java  |    4 +-
 .../core/InvalidFormatStringException.java      |    4 +-
 .../core/InvalidReferenceException.java         |    4 +-
 src/main/java/freemarker/core/Items.java        |    4 +-
 .../java/freemarker/core/IteratorBlock.java     |    5 +-
 .../java/freemarker/core/JSONOutputFormat.java  |    4 +-
 .../freemarker/core/JavaScriptOutputFormat.java |    4 +-
 .../freemarker/core/JavaTemplateDateFormat.java |    4 +-
 .../core/JavaTemplateDateFormatFactory.java     |   14 +-
 .../core/JavaTemplateNumberFormat.java          |    4 +-
 .../core/JavaTemplateNumberFormatFactory.java   |    4 +-
 .../LegacyConstructorParserConfiguration.java   |    4 +-
 src/main/java/freemarker/core/LibraryLoad.java  |    4 +-
 .../java/freemarker/core/ListElseContainer.java |    4 +-
 src/main/java/freemarker/core/ListLiteral.java  |    4 +-
 .../core/ListableRightUnboundedRangeModel.java  |    4 +-
 src/main/java/freemarker/core/LocalContext.java |    4 +-
 .../java/freemarker/core/LocalContextStack.java |    4 +-
 src/main/java/freemarker/core/Macro.java        |    4 +-
 .../freemarker/core/MarkupOutputFormat.java     |   12 +-
 .../core/MarkupOutputFormatBoundBuiltIn.java    |    4 +-
 src/main/java/freemarker/core/MessageUtil.java  |    4 +-
 src/main/java/freemarker/core/MethodCall.java   |    4 +-
 src/main/java/freemarker/core/MiscUtil.java     |    4 +-
 src/main/java/freemarker/core/MixedContent.java |    4 +-
 .../NestedContentNotSupportedException.java     |    4 +-
 src/main/java/freemarker/core/NewBI.java        |    4 +-
 .../java/freemarker/core/NoAutoEscBlock.java    |    4 +-
 .../java/freemarker/core/NoEscapeBlock.java     |    4 +-
 .../freemarker/core/NonBooleanException.java    |    4 +-
 .../java/freemarker/core/NonDateException.java  |    4 +-
 .../core/NonExtendedHashException.java          |    4 +-
 .../core/NonExtendedNodeException.java          |   64 ++
 .../java/freemarker/core/NonHashException.java  |    4 +-
 .../NonListableRightUnboundedRangeModel.java    |    4 +-
 .../core/NonMarkupOutputException.java          |    4 +-
 .../freemarker/core/NonMethodException.java     |    4 +-
 .../freemarker/core/NonNamespaceException.java  |    4 +-
 .../java/freemarker/core/NonNodeException.java  |    4 +-
 .../freemarker/core/NonNumericalException.java  |    4 +-
 .../freemarker/core/NonSequenceException.java   |    4 +-
 .../core/NonSequenceOrCollectionException.java  |    6 +-
 .../freemarker/core/NonStringException.java     |    4 +-
 .../NonStringOrTemplateOutputException.java     |    4 +-
 .../NonUserDefinedDirectiveLikeException.java   |    4 +-
 .../java/freemarker/core/NotExpression.java     |    4 +-
 .../java/freemarker/core/NumberLiteral.java     |    4 +-
 .../java/freemarker/core/NumericalOutput.java   |    4 +-
 .../core/OptInTemplateClassResolver.java        |    4 +-
 src/main/java/freemarker/core/OrExpression.java |    4 +-
 src/main/java/freemarker/core/OutputFormat.java |   18 +-
 .../java/freemarker/core/OutputFormatBlock.java |    4 +-
 .../core/OutputFormatBoundBuiltIn.java          |    4 +-
 .../java/freemarker/core/ParameterRole.java     |    4 +-
 .../core/ParentheticalExpression.java           |    4 +-
 .../java/freemarker/core/ParseException.java    |    4 +-
 .../freemarker/core/ParserConfiguration.java    |    4 +-
 .../core/ParsingNotSupportedException.java      |    4 +-
 .../freemarker/core/PlainTextOutputFormat.java  |    4 +-
 .../java/freemarker/core/PropertySetting.java   |    4 +-
 .../java/freemarker/core/RTFOutputFormat.java   |    4 +-
 src/main/java/freemarker/core/Range.java        |    4 +-
 src/main/java/freemarker/core/RangeModel.java   |    4 +-
 .../java/freemarker/core/RecoveryBlock.java     |    4 +-
 src/main/java/freemarker/core/RecurseNode.java  |    4 +-
 src/main/java/freemarker/core/RegexpHelper.java |    4 +-
 .../java/freemarker/core/ReturnInstruction.java |    4 +-
 .../core/RightUnboundedRangeModel.java          |    4 +-
 src/main/java/freemarker/core/Sep.java          |    4 +-
 .../java/freemarker/core/SpecialBuiltIn.java    |    4 +-
 .../java/freemarker/core/StopException.java     |    4 +-
 .../java/freemarker/core/StopInstruction.java   |    4 +-
 .../freemarker/core/StringArraySequence.java    |    4 +-
 .../java/freemarker/core/StringLiteral.java     |    4 +-
 src/main/java/freemarker/core/SwitchBlock.java  |    4 +-
 .../freemarker/core/TemplateClassResolver.java  |    4 +-
 .../core/TemplateCombinedMarkupOutputModel.java |    4 +-
 .../freemarker/core/TemplateConfiguration.java  |   36 +-
 .../freemarker/core/TemplateDateFormat.java     |    4 +-
 .../core/TemplateDateFormatFactory.java         |    4 +-
 .../java/freemarker/core/TemplateElement.java   |   42 +-
 .../core/TemplateElementArrayBuilder.java       |    4 +-
 .../core/TemplateElementsToVisit.java           |    4 +-
 .../freemarker/core/TemplateFormatUtil.java     |    4 +-
 .../core/TemplateHTMLOutputModel.java           |    4 +-
 .../core/TemplateMarkupOutputModel.java         |    4 +-
 .../freemarker/core/TemplateNumberFormat.java   |    4 +-
 .../core/TemplateNumberFormatFactory.java       |    4 +-
 .../java/freemarker/core/TemplateObject.java    |    4 +-
 .../freemarker/core/TemplatePostProcessor.java  |    4 +-
 .../core/TemplatePostProcessorException.java    |    4 +-
 .../freemarker/core/TemplateRTFOutputModel.java |    4 +-
 .../freemarker/core/TemplateValueFormat.java    |    4 +-
 .../core/TemplateValueFormatException.java      |    4 +-
 .../core/TemplateValueFormatFactory.java        |    4 +-
 .../core/TemplateXHTMLOutputModel.java          |    4 +-
 .../freemarker/core/TemplateXMLOutputModel.java |    4 +-
 src/main/java/freemarker/core/TextBlock.java    |    4 +-
 ...nterruptionSupportTemplatePostProcessor.java |    8 +-
 .../java/freemarker/core/TokenMgrError.java     |    4 +-
 .../java/freemarker/core/TransformBlock.java    |    4 +-
 .../java/freemarker/core/TrimInstruction.java   |   12 +-
 .../core/UnaryPlusMinusExpression.java          |    8 +-
 .../core/UndefinedCustomFormatException.java    |    4 +-
 .../freemarker/core/UndefinedOutputFormat.java  |    4 +-
 .../core/UnexpectedTypeException.java           |    4 +-
 .../core/UnformattableValueException.java       |    4 +-
 src/main/java/freemarker/core/UnifiedCall.java  |    4 +-
 ...nDateTypeFormattingUnsupportedException.java |    4 +-
 ...nownDateTypeParsingUnsupportedException.java |    4 +-
 .../core/UnparsableValueException.java          |    4 +-
 .../core/UnregisteredOutputFormatException.java |    4 +-
 src/main/java/freemarker/core/VisitNode.java    |    4 +-
 .../java/freemarker/core/XHTMLOutputFormat.java |    4 +-
 .../java/freemarker/core/XMLOutputFormat.java   |    4 +-
 .../freemarker/core/XSTemplateDateFormat.java   |    4 +-
 .../core/XSTemplateDateFormatFactory.java       |    4 +-
 .../java/freemarker/core/_ArrayEnumeration.java |    4 +-
 .../java/freemarker/core/_ArrayIterator.java    |    4 +-
 src/main/java/freemarker/core/_CoreAPI.java     |    7 +-
 .../java/freemarker/core/_CoreLocaleUtils.java  |    4 +-
 .../java/freemarker/core/_CoreStringUtils.java  |    4 +-
 .../java/freemarker/core/_DelayedAOrAn.java     |    4 +-
 .../core/_DelayedConversionToString.java        |    4 +-
 .../core/_DelayedFTLTypeDescription.java        |    4 +-
 .../core/_DelayedGetCanonicalForm.java          |    4 +-
 .../freemarker/core/_DelayedGetMessage.java     |    4 +-
 .../core/_DelayedGetMessageWithoutStackTop.java |    4 +-
 .../java/freemarker/core/_DelayedJQuote.java    |    4 +-
 .../freemarker/core/_DelayedJoinWithComma.java  |    4 +-
 .../java/freemarker/core/_DelayedOrdinal.java   |    4 +-
 .../freemarker/core/_DelayedShortClassName.java |    4 +-
 .../java/freemarker/core/_DelayedToString.java  |    4 +-
 .../core/_ErrorDescriptionBuilder.java          |    4 +-
 src/main/java/freemarker/core/_Java6.java       |    4 +-
 src/main/java/freemarker/core/_Java6Impl.java   |    4 +-
 .../java/freemarker/core/_JavaVersions.java     |    4 +-
 .../freemarker/core/_MiscTemplateException.java |    4 +-
 ...ObjectBuilderSettingEvaluationException.java |    4 +-
 .../core/_ObjectBuilderSettingEvaluator.java    |    4 +-
 ..._ParserConfigurationWithInheritedFormat.java |    4 +-
 .../core/_SettingEvaluationEnvironment.java     |    4 +-
 .../java/freemarker/core/_SortedArraySet.java   |    4 +-
 .../core/_TemplateModelException.java           |    4 +-
 .../java/freemarker/core/_TimeZoneBuilder.java  |    4 +-
 ...expectedTypeErrorExplainerTemplateModel.java |    4 +-
 .../core/_UnmodifiableCompositeSet.java         |    4 +-
 .../java/freemarker/core/_UnmodifiableSet.java  |    4 +-
 src/main/java/freemarker/core/package.html      |    4 +-
 src/main/java/freemarker/debug/Breakpoint.java  |    4 +-
 src/main/java/freemarker/debug/DebugModel.java  |    4 +-
 .../freemarker/debug/DebuggedEnvironment.java   |    4 +-
 src/main/java/freemarker/debug/Debugger.java    |    4 +-
 .../java/freemarker/debug/DebuggerClient.java   |    4 +-
 .../java/freemarker/debug/DebuggerListener.java |    4 +-
 .../debug/EnvironmentSuspendedEvent.java        |    4 +-
 .../freemarker/debug/impl/DebuggerServer.java   |    4 +-
 .../freemarker/debug/impl/DebuggerService.java  |    4 +-
 .../debug/impl/RmiDebugModelImpl.java           |    4 +-
 .../debug/impl/RmiDebuggedEnvironmentImpl.java  |    4 +-
 .../freemarker/debug/impl/RmiDebuggerImpl.java  |    4 +-
 .../debug/impl/RmiDebuggerListenerImpl.java     |    4 +-
 .../debug/impl/RmiDebuggerService.java          |    4 +-
 src/main/java/freemarker/debug/package.html     |    4 +-
 .../freemarker/ext/ant/FreemarkerXmlTask.java   |    4 +-
 .../java/freemarker/ext/ant/JythonAntTask.java  |    4 +-
 .../ext/ant/UnlinkedJythonOperations.java       |    4 +-
 .../ext/ant/UnlinkedJythonOperationsImpl.java   |    4 +-
 src/main/java/freemarker/ext/ant/package.html   |    4 +-
 .../java/freemarker/ext/beans/APIModel.java     |    4 +-
 .../freemarker/ext/beans/ArgumentTypes.java     |    4 +-
 .../java/freemarker/ext/beans/ArrayModel.java   |    4 +-
 .../java/freemarker/ext/beans/BeanModel.java    |    4 +-
 .../freemarker/ext/beans/BeansModelCache.java   |    4 +-
 .../java/freemarker/ext/beans/BeansWrapper.java |   56 +-
 .../ext/beans/BeansWrapperBuilder.java          |    4 +-
 .../ext/beans/BeansWrapperConfiguration.java    |    4 +-
 .../ext/beans/BeansWrapperSingletonHolder.java  |    4 +-
 .../java/freemarker/ext/beans/BooleanModel.java |    4 +-
 .../ext/beans/CallableMemberDescriptor.java     |    4 +-
 .../freemarker/ext/beans/CharacterOrString.java |    4 +-
 .../ext/beans/ClassBasedModelFactory.java       |    4 +-
 .../ext/beans/ClassChangeNotifier.java          |    4 +-
 .../freemarker/ext/beans/ClassIntrospector.java |    4 +-
 .../ext/beans/ClassIntrospectorBuilder.java     |    4 +-
 .../freemarker/ext/beans/CollectionAdapter.java |    4 +-
 .../freemarker/ext/beans/CollectionModel.java   |    4 +-
 .../java/freemarker/ext/beans/DateModel.java    |    4 +-
 .../beans/EmptyCallableMemberDescriptor.java    |    4 +-
 .../ext/beans/EmptyMemberAndArguments.java      |    4 +-
 .../freemarker/ext/beans/EnumerationModel.java  |    4 +-
 .../java/freemarker/ext/beans/HashAdapter.java  |    4 +-
 .../ext/beans/InvalidPropertyException.java     |    4 +-
 .../freemarker/ext/beans/IteratorModel.java     |    4 +-
 .../ext/beans/JRebelClassChangeNotifier.java    |    4 +-
 .../java/freemarker/ext/beans/MapModel.java     |    4 +-
 .../MaybeEmptyCallableMemberDescriptor.java     |    4 +-
 .../ext/beans/MaybeEmptyMemberAndArguments.java |    4 +-
 .../ext/beans/MemberAndArguments.java           |    4 +-
 .../ext/beans/MethodAppearanceFineTuner.java    |    4 +-
 .../java/freemarker/ext/beans/MethodSorter.java |    4 +-
 .../NonPrimitiveArrayBackedReadOnlyList.java    |    4 +-
 .../java/freemarker/ext/beans/NumberModel.java  |    4 +-
 .../ext/beans/OverloadedFixArgsMethods.java     |    4 +-
 .../freemarker/ext/beans/OverloadedMethods.java |    4 +-
 .../ext/beans/OverloadedMethodsModel.java       |    4 +-
 .../ext/beans/OverloadedMethodsSubset.java      |    4 +-
 .../ext/beans/OverloadedNumberUtil.java         |    4 +-
 .../ext/beans/OverloadedVarArgsMethods.java     |    4 +-
 .../beans/PrimtiveArrayBackedReadOnlyList.java  |    4 +-
 .../ReflectionCallableMemberDescriptor.java     |    4 +-
 .../ext/beans/ResourceBundleModel.java          |    4 +-
 .../freemarker/ext/beans/SequenceAdapter.java   |    4 +-
 .../java/freemarker/ext/beans/SetAdapter.java   |    4 +-
 .../freemarker/ext/beans/SimpleMapModel.java    |    5 +-
 .../java/freemarker/ext/beans/SimpleMethod.java |    4 +-
 .../freemarker/ext/beans/SimpleMethodModel.java |    4 +-
 .../ext/beans/SingletonCustomizer.java          |    4 +-
 .../java/freemarker/ext/beans/StaticModel.java  |    4 +-
 .../java/freemarker/ext/beans/StaticModels.java |    4 +-
 .../java/freemarker/ext/beans/StringModel.java  |    4 +-
 .../java/freemarker/ext/beans/TypeFlags.java    |    4 +-
 .../freemarker/ext/beans/UnsafeMethods.java     |   55 +-
 .../java/freemarker/ext/beans/_BeansAPI.java    |    4 +-
 .../java/freemarker/ext/beans/_EnumModels.java  |    4 +-
 .../java/freemarker/ext/beans/_MethodUtil.java  |    4 +-
 src/main/java/freemarker/ext/beans/package.html |    9 +-
 src/main/java/freemarker/ext/dom/AtAtKey.java   |   58 +
 .../freemarker/ext/dom/AttributeNodeModel.java  |    4 +-
 .../ext/dom/CharacterDataNodeModel.java         |    4 +-
 .../java/freemarker/ext/dom/DocumentModel.java  |    7 +-
 .../freemarker/ext/dom/DocumentTypeModel.java   |    4 +-
 .../java/freemarker/ext/dom/DomStringUtil.java  |   93 ++
 .../java/freemarker/ext/dom/ElementModel.java   |  124 ++-
 .../freemarker/ext/dom/JaxenXPathSupport.java   |   41 +-
 .../java/freemarker/ext/dom/NodeListModel.java  |   63 +-
 src/main/java/freemarker/ext/dom/NodeModel.java |  366 ++++---
 .../java/freemarker/ext/dom/NodeOutputter.java  |    4 +-
 .../java/freemarker/ext/dom/PINodeModel.java    |    4 +-
 .../ext/dom/SunInternalXalanXPathSupport.java   |   32 +-
 src/main/java/freemarker/ext/dom/Transform.java |    4 +-
 .../java/freemarker/ext/dom/XPathSupport.java   |    7 +-
 .../freemarker/ext/dom/XalanXPathSupport.java   |    4 +-
 .../java/freemarker/ext/dom/_ExtDomApi.java     |   43 +
 src/main/java/freemarker/ext/dom/package.html   |    4 +-
 .../java/freemarker/ext/jdom/NodeListModel.java |    4 +-
 src/main/java/freemarker/ext/jdom/package.html  |    4 +-
 .../ext/jsp/CustomTagAndELFunctionCombiner.java |    6 +-
 .../freemarker/ext/jsp/EventForwarding.java     |    4 +-
 .../jsp/FreeMarkerJspApplicationContext.java    |    4 +-
 .../ext/jsp/FreeMarkerJspFactory.java           |    4 +-
 .../ext/jsp/FreeMarkerJspFactory2.java          |    4 +-
 .../ext/jsp/FreeMarkerJspFactory21.java         |    4 +-
 .../ext/jsp/FreeMarkerPageContext.java          |    4 +-
 .../java/freemarker/ext/jsp/FreemarkerTag.java  |    4 +-
 .../freemarker/ext/jsp/JspContextModel.java     |    4 +-
 .../freemarker/ext/jsp/JspTagModelBase.java     |    4 +-
 .../freemarker/ext/jsp/JspWriterAdapter.java    |    4 +-
 .../freemarker/ext/jsp/PageContextFactory.java  |    4 +-
 .../ext/jsp/SimpleTagDirectiveModel.java        |    4 +-
 .../freemarker/ext/jsp/TagTransformModel.java   |    4 +-
 .../java/freemarker/ext/jsp/TaglibFactory.java  |   46 +-
 .../freemarker/ext/jsp/TaglibMethodUtil.java    |    4 +-
 .../ext/jsp/_FreeMarkerPageContext2.java        |    4 +-
 .../ext/jsp/_FreeMarkerPageContext21.java       |    4 +-
 src/main/java/freemarker/ext/jsp/package.html   |    4 +-
 .../freemarker/ext/jython/JythonHashModel.java  |    4 +-
 .../java/freemarker/ext/jython/JythonModel.java |    4 +-
 .../freemarker/ext/jython/JythonModelCache.java |    4 +-
 .../ext/jython/JythonNumberModel.java           |    4 +-
 .../ext/jython/JythonSequenceModel.java         |    4 +-
 .../ext/jython/JythonVersionAdapter.java        |    4 +-
 .../ext/jython/JythonVersionAdapterHolder.java  |    4 +-
 .../freemarker/ext/jython/JythonWrapper.java    |    4 +-
 .../jython/_Jython20And21VersionAdapter.java    |    4 +-
 .../ext/jython/_Jython22VersionAdapter.java     |    4 +-
 .../ext/jython/_Jython25VersionAdapter.java     |    4 +-
 .../java/freemarker/ext/jython/package.html     |    4 +-
 src/main/java/freemarker/ext/package.html       |    4 +-
 .../ext/rhino/RhinoFunctionModel.java           |    4 +-
 .../ext/rhino/RhinoScriptableModel.java         |    4 +-
 .../java/freemarker/ext/rhino/RhinoWrapper.java |    4 +-
 src/main/java/freemarker/ext/rhino/package.html |    4 +-
 .../ext/servlet/AllHttpScopesHashModel.java     |    4 +-
 .../ext/servlet/FreemarkerServlet.java          |    4 +-
 .../ext/servlet/HttpRequestHashModel.java       |    4 +-
 .../servlet/HttpRequestParametersHashModel.java |    4 +-
 .../ext/servlet/HttpSessionHashModel.java       |    4 +-
 .../freemarker/ext/servlet/IncludePage.java     |    4 +-
 .../freemarker/ext/servlet/InitParamParser.java |    4 +-
 .../ext/servlet/ServletContextHashModel.java    |    4 +-
 .../java/freemarker/ext/servlet/package.html    |    4 +-
 .../freemarker/ext/util/IdentityHashMap.java    |    4 +-
 .../java/freemarker/ext/util/ModelCache.java    |    7 +-
 .../java/freemarker/ext/util/ModelFactory.java  |    4 +-
 .../ext/util/WrapperTemplateModel.java          |    4 +-
 src/main/java/freemarker/ext/util/package.html  |    4 +-
 .../java/freemarker/ext/xml/Namespaces.java     |    4 +-
 src/main/java/freemarker/ext/xml/Navigator.java |    4 +-
 .../java/freemarker/ext/xml/NodeListModel.java  |    4 +-
 .../java/freemarker/ext/xml/NodeOperator.java   |    4 +-
 .../freemarker/ext/xml/_Dom4jNavigator.java     |    4 +-
 .../java/freemarker/ext/xml/_DomNavigator.java  |    4 +-
 .../freemarker/ext/xml/_JaxenNamespaces.java    |    4 +-
 .../java/freemarker/ext/xml/_JdomNavigator.java |    4 +-
 src/main/java/freemarker/ext/xml/package.html   |    4 +-
 .../log/CommonsLoggingLoggerFactory.java        |    4 +-
 src/main/java/freemarker/log/Logger.java        |    4 +-
 src/main/java/freemarker/log/LoggerFactory.java |    4 +-
 .../java/freemarker/log/SLF4JLoggerFactory.java |    4 +-
 .../freemarker/log/_AvalonLoggerFactory.java    |    4 +-
 .../log/_CommonsLoggingLoggerFactory.java       |    4 +-
 .../java/freemarker/log/_JULLoggerFactory.java  |    4 +-
 .../freemarker/log/_Log4jLoggerFactory.java     |    4 +-
 .../freemarker/log/_Log4jOverSLF4JTester.java   |    4 +-
 .../java/freemarker/log/_NullLoggerFactory.java |    4 +-
 .../freemarker/log/_SLF4JLoggerFactory.java     |    4 +-
 src/main/java/freemarker/log/package.html       |    4 +-
 .../template/AdapterTemplateModel.java          |    4 +-
 .../java/freemarker/template/Configuration.java |    9 +-
 .../template/DefaultArrayAdapter.java           |    4 +-
 .../template/DefaultIterableAdapter.java        |    7 +-
 .../template/DefaultIteratorAdapter.java        |    4 +-
 .../freemarker/template/DefaultListAdapter.java |    4 +-
 .../freemarker/template/DefaultMapAdapter.java  |    4 +-
 .../DefaultNonListCollectionAdapter.java        |   15 +-
 .../template/DefaultObjectWrapper.java          |    4 +-
 .../template/DefaultObjectWrapperBuilder.java   |    4 +-
 .../DefaultObjectWrapperConfiguration.java      |    4 +-
 .../DefaultUnassignableIteratorAdapter.java     |    4 +-
 src/main/java/freemarker/template/EmptyMap.java |    4 +-
 .../template/FalseTemplateBooleanModel.java     |    4 +-
 .../template/GeneralPurposeNothing.java         |    4 +-
 .../freemarker/template/LocalizedString.java    |    4 +-
 .../MalformedTemplateNameException.java         |    4 +-
 .../template/MapKeyValuePairIterator.java       |    4 +-
 .../java/freemarker/template/ObjectWrapper.java |    4 +-
 .../template/ObjectWrapperAndUnwrapper.java     |    4 +-
 .../template/ResourceBundleLocalizedString.java |    4 +-
 .../SerializableTemplateBooleanModel.java       |    4 +-
 .../freemarker/template/SimpleCollection.java   |    4 +-
 .../java/freemarker/template/SimpleDate.java    |    4 +-
 .../java/freemarker/template/SimpleHash.java    |    4 +-
 .../java/freemarker/template/SimpleList.java    |    4 +-
 .../java/freemarker/template/SimpleNumber.java  |    4 +-
 .../template/SimpleObjectWrapper.java           |    4 +-
 .../java/freemarker/template/SimpleScalar.java  |    4 +-
 .../freemarker/template/SimpleSequence.java     |    4 +-
 src/main/java/freemarker/template/Template.java |   46 +-
 .../template/TemplateBooleanModel.java          |    4 +-
 .../template/TemplateCollectionModel.java       |    4 +-
 .../template/TemplateCollectionModelEx.java     |   14 +-
 .../freemarker/template/TemplateDateModel.java  |    4 +-
 .../template/TemplateDirectiveBody.java         |    4 +-
 .../template/TemplateDirectiveModel.java        |    4 +-
 .../freemarker/template/TemplateException.java  |    4 +-
 .../template/TemplateExceptionHandler.java      |    4 +-
 .../freemarker/template/TemplateHashModel.java  |    4 +-
 .../template/TemplateHashModelEx.java           |    4 +-
 .../template/TemplateHashModelEx2.java          |    4 +-
 .../template/TemplateMethodModel.java           |    4 +-
 .../template/TemplateMethodModelEx.java         |    4 +-
 .../java/freemarker/template/TemplateModel.java |    4 +-
 .../template/TemplateModelAdapter.java          |    4 +-
 .../template/TemplateModelException.java        |    4 +-
 .../template/TemplateModelIterator.java         |    4 +-
 .../template/TemplateModelListSequence.java     |    4 +-
 .../template/TemplateModelWithAPISupport.java   |    4 +-
 .../freemarker/template/TemplateNodeModel.java  |    4 +-
 .../template/TemplateNodeModelEx.java           |   40 +
 .../template/TemplateNotFoundException.java     |    4 +-
 .../template/TemplateNumberModel.java           |    4 +-
 .../template/TemplateScalarModel.java           |    4 +-
 .../template/TemplateSequenceModel.java         |    4 +-
 .../template/TemplateTransformModel.java        |    4 +-
 .../freemarker/template/TransformControl.java   |    4 +-
 .../template/TrueTemplateBooleanModel.java      |    4 +-
 src/main/java/freemarker/template/Version.java  |    4 +-
 .../template/WrappingTemplateModel.java         |    4 +-
 .../java/freemarker/template/_TemplateAPI.java  |    8 +-
 src/main/java/freemarker/template/package.html  |    4 +-
 .../template/utility/CaptureOutput.java         |    4 +-
 .../freemarker/template/utility/ClassUtil.java  |    9 +-
 .../template/utility/CollectionUtils.java       |    4 +-
 .../template/utility/Collections12.java         |    4 +-
 .../freemarker/template/utility/Constants.java  |    4 +-
 .../template/utility/DOMNodeModel.java          |    4 +-
 .../freemarker/template/utility/DateUtil.java   |    4 +-
 .../freemarker/template/utility/DeepUnwrap.java |    4 +-
 .../freemarker/template/utility/Execute.java    |    4 +-
 .../freemarker/template/utility/HtmlEscape.java |    4 +-
 .../template/utility/JythonRuntime.java         |    4 +-
 .../template/utility/NormalizeNewlines.java     |    4 +-
 .../template/utility/NullArgumentException.java |    4 +-
 .../freemarker/template/utility/NullWriter.java |    4 +-
 .../freemarker/template/utility/NumberUtil.java |    4 +-
 .../template/utility/ObjectConstructor.java     |    4 +-
 .../template/utility/ObjectFactory.java         |    4 +-
 .../utility/ObjectWrapperWithAPISupport.java    |    4 +-
 .../template/utility/OptimizerUtil.java         |    4 +-
 .../template/utility/RichObjectWrapper.java     |    4 +-
 .../template/utility/SecurityUtilities.java     |    4 +-
 .../template/utility/StandardCompress.java      |    4 +-
 .../freemarker/template/utility/StringUtil.java |   49 +-
 .../template/utility/ToCanonical.java           |    4 +-
 .../utility/UndeclaredThrowableException.java   |    4 +-
 .../utility/UnrecognizedTimeZoneException.java  |    4 +-
 .../UnsupportedNumberClassException.java        |    4 +-
 .../template/utility/WriteProtectable.java      |    4 +-
 .../freemarker/template/utility/XmlEscape.java  |    4 +-
 .../freemarker/template/utility/package.html    |    4 +-
 .../adhoc/IdentifierCharGenerator.java          |    4 +-
 src/main/misc/overloadedNumberRules/README.txt  |    4 +-
 src/main/misc/overloadedNumberRules/config.fmpp |    4 +-
 .../misc/overloadedNumberRules/generator.ftl    |    4 +-
 .../ext/beans/unsafeMethods.properties          |    4 +-
 .../freemarker/ext/jsp/web-app_2_2.dtd          |  581 ----------
 .../freemarker/ext/jsp/web-app_2_3.dtd          | 1003 ------------------
 .../ext/jsp/web-jsptaglibrary_1_1.dtd           |  207 ----
 .../ext/jsp/web-jsptaglibrary_1_2.dtd           |  478 ---------
 .../resources/freemarker/version.properties     |    6 +-
 src/manual/en_US/book.xml                       |  964 +++++++++++------
 src/manual/en_US/docgen-help/editors-readme.txt |    4 +-
 .../figures/odg-convert-howto.txt               |    4 +-
 src/manual/en_US/docgen.cjson                   |    1 +
 src/manual/zh_CN/book.xml                       |    4 +-
 .../cache/FileTemplateLoaderTest.java           |    4 +-
 .../cache/MultiTemplateLoaderTest.java          |   22 +-
 .../freemarker/cache/TemplateCacheTest.java     |   36 +-
 .../cache/TemplateConfigurationFactoryTest.java |    4 +-
 .../cache/TemplateNameFormatTest.java           |  140 +--
 .../cache/TemplateSourceMatcherTest.java        |    4 +-
 .../core/ASTBasedErrorMessagesTest.java         |    4 +-
 src/test/java/freemarker/core/ASTPrinter.java   |   26 +-
 src/test/java/freemarker/core/ASTTest.java      |    4 +-
 .../core/AppMetaTemplateDateFormatFactory.java  |    4 +-
 .../core/BaseNTemplateNumberFormatFactory.java  |    4 +-
 .../freemarker/core/BreakPlacementTest.java     |    4 +-
 .../java/freemarker/core/CamelCaseTest.java     |    4 +-
 .../java/freemarker/core/CanonicalFormTest.java |    4 +-
 .../freemarker/core/CoercionToTextualTest.java  |    4 +-
 .../core/CombinedMarkupOutputFormatTest.java    |    4 +-
 .../java/freemarker/core/ConfigurableTest.java  |    4 +-
 .../freemarker/core/CoreLocaleUtilsTest.java    |    4 +-
 .../freemarker/core/CustomHTMLOutputFormat.java |    4 +-
 .../core/CustomTemplateHTMLModel.java           |    4 +-
 .../java/freemarker/core/DateFormatTest.java    |    4 +-
 .../freemarker/core/DirectiveCallPlaceTest.java |    4 +-
 .../java/freemarker/core/DummyOutputFormat.java |    4 +-
 .../freemarker/core/EncodingOverrideTest.java   |    4 +-
 .../core/EnvironmentCustomStateTest.java        |    4 +-
 .../EnvironmentGetTemplateVariantsTest.java     |    4 +-
 ...EpochMillisDivTemplateDateFormatFactory.java |    4 +-
 .../EpochMillisTemplateDateFormatFactory.java   |    4 +-
 .../core/ExtendedDecimalFormatTest.java         |    4 +-
 .../core/HTMLISOTemplateDateFormatFactory.java  |    4 +-
 .../freemarker/core/HTMLOutputFormatTest.java   |    4 +-
 .../java/freemarker/core/HeaderParsingTest.java |    4 +-
 .../core/HexTemplateNumberFormatFactory.java    |    4 +-
 .../IncludeAndImportConfigurableLayersTest.java |    6 +-
 .../freemarker/core/IncludeAndImportTest.java   |    4 +-
 .../core/InterpretAndEvalTemplateNameTest.java  |    4 +-
 .../core/InterpretSettingInheritanceTest.java   |    4 +-
 .../freemarker/core/IteratorIssuesTest.java     |    4 +-
 .../core/LegacyFMParserConstructorsTest.java    |    4 +-
 .../java/freemarker/core/ListErrorsTest.java    |    4 +-
 ...AndTZSensitiveTemplateDateFormatFactory.java |    4 +-
 ...aleSensitiveTemplateNumberFormatFactory.java |    4 +-
 .../freemarker/core/MiscErrorMessagesTest.java  |    4 +-
 .../java/freemarker/core/NumberFormatTest.java  |    4 +-
 .../core/ObjectBuilderSettingsTest.java         |    4 +-
 .../core/OptInTemplateClassResolverTest.java    |    8 +-
 .../java/freemarker/core/OutputFormatTest.java  |    4 +-
 .../ParseTimeParameterBIErrorMessagesTest.java  |    4 +-
 .../core/ParsingErrorMessagesTest.java          |    4 +-
 .../PrintfGTemplateNumberFormatFactory.java     |    4 +-
 .../freemarker/core/RTFOutputFormatTest.java    |    4 +-
 .../java/freemarker/core/SQLTimeZoneTest.java   |    4 +-
 .../core/SeldomEscapedOutputFormat.java         |    4 +-
 .../freemarker/core/SettingDirectiveTest.java   |    4 +-
 .../freemarker/core/SpecialVariableTest.java    |    4 +-
 .../core/StringLiteralInterpolationTest.java    |    4 +-
 src/test/java/freemarker/core/TabSizeTest.java  |    4 +-
 .../core/TagSyntaxVariationsTest.java           |    6 +-
 .../freemarker/core/TemplatGetEncodingTest.java |    4 +-
 .../core/TemplateConfigurationTest.java         |    5 +-
 ...plateConfigurationWithTemplateCacheTest.java |    4 +-
 .../core/TemplateDummyOutputModel.java          |    4 +-
 .../freemarker/core/TemplateLevelSettings.java  |    4 +-
 .../core/TemplateNameSpecialVariablesTest.java  |    4 +-
 .../core/TemplateSeldomEscapedOutputModel.java  |    4 +-
 .../core/TheadInterruptingSupportTest.java      |    4 +-
 .../freemarker/core/TypeErrorMessagesTest.java  |    4 +-
 .../freemarker/core/UnclosedCommentTest.java    |    4 +-
 .../core/WhitespaceStrippingTest.java           |    4 +-
 .../freemarker/core/XHTMLOutputFormatTest.java  |    4 +-
 .../freemarker/core/XMLOutputFormatTest.java    |    4 +-
 .../core/subpkg/PackageVisibleAll.java          |    4 +-
 .../subpkg/PackageVisibleAllWithBuilder.java    |    4 +-
 .../PackageVisibleAllWithBuilderBuilder.java    |    4 +-
 .../PackageVisibleWithPublicConstructor.java    |    4 +-
 .../java/freemarker/core/subpkg/PublicAll.java  |    4 +-
 .../subpkg/PublicWithMixedConstructors.java     |    4 +-
 .../PublicWithPackageVisibleConstructor.java    |    4 +-
 .../AbstractParallelIntrospectionTest.java      |    6 +-
 .../ext/beans/AlphabeticalMethodSorter.java     |    4 +-
 .../ext/beans/BeansAPINewInstanceTest.java      |    6 +-
 .../ext/beans/BeansWrapperBasics.java           |    4 +-
 .../ext/beans/BeansWrapperCachesTest.java       |    4 +-
 .../ext/beans/BeansWrapperDesc2003020.java      |    4 +-
 .../ext/beans/BeansWrapperDesc2003021.java      |    4 +-
 .../ext/beans/BeansWrapperInc2003020.java       |    4 +-
 .../ext/beans/BeansWrapperInc2003021.java       |    4 +-
 .../ext/beans/BeansWrapperMiscTest.java         |    4 +-
 .../ext/beans/BeansWrapperReadOnlyTest.java     |    6 +-
 .../ext/beans/BeansWrapperSingletonsTest.java   |    4 +-
 .../beans/BeansWrapperWithShortedMethods.java   |    4 +-
 .../CommonSupertypeForUnwrappingHintTest.java   |    6 +-
 .../beans/DefaultObjectWrapperDesc2003020.java  |    4 +-
 .../beans/DefaultObjectWrapperDesc2003021.java  |    4 +-
 .../beans/DefaultObjectWrapperDesc2003022.java  |    4 +-
 .../beans/DefaultObjectWrapperInc2003020.java   |    4 +-
 .../beans/DefaultObjectWrapperInc2003021.java   |    4 +-
 .../beans/DefaultObjectWrapperInc2003022.java   |    4 +-
 .../DefaultObjectWrapperWithSortedMethods.java  |    4 +-
 .../freemarker/ext/beans/EnumModelsTest.java    |    4 +-
 .../freemarker/ext/beans/ErrorMessagesTest.java |    4 +-
 .../ext/beans/FineTuneMethodAppearanceTest.java |    4 +-
 .../GetlessMethodsAsPropertyGettersRule.java    |    4 +-
 .../freemarker/ext/beans/IsApplicableTest.java  |    4 +-
 .../beans/IsMoreSpecificParameterTypeTest.java  |    4 +-
 .../ext/beans/Java7MembersOnlyBeansWrapper.java |    4 +-
 .../beans/ManyObjectsOfDifferentClasses.java    |    4 +-
 .../beans/ManyStaticsOfDifferentClasses.java    |    4 +-
 .../ext/beans/MiscNumericalOperationsTest.java  |    7 +-
 .../freemarker/ext/beans/ModelCacheTest.java    |    4 +-
 .../ext/beans/OverloadedNumberUtilTest.java     |    4 +-
 .../beans/ParameterListPreferabilityTest.java   |   10 +-
 .../beans/PrallelObjectIntrospectionTest.java   |    4 +-
 .../beans/PrallelStaticIntrospectionTest.java   |    4 +-
 .../freemarker/ext/beans/RationalNumber.java    |    4 +-
 .../freemarker/ext/beans/StaticModelsTest.java  |    4 +-
 .../freemarker/ext/beans/TypeFlagsTest.java     |    6 +-
 .../ext/dom/DOMConvenienceStaticsTest.java      |  215 ++++
 .../java/freemarker/ext/dom/DOMSiblingTest.java |   99 ++
 src/test/java/freemarker/ext/dom/DOMTest.java   |   53 +-
 .../ext/jsp/JspTestFreemarkerServlet.java       |    4 +-
 ...estFreemarkerServletWithDefaultOverride.java |    4 +-
 .../ext/jsp/RealServletContainertTest.java      |    4 +-
 .../java/freemarker/ext/jsp/TLDParsingTest.java |    4 +-
 .../ext/jsp/TaglibMethodUtilTest.java           |    4 +-
 .../jsp/taglibmembers/AttributeAccessorTag.java |    4 +-
 .../ext/jsp/taglibmembers/AttributeInfoTag.java |    4 +-
 .../ext/jsp/taglibmembers/EnclosingClass.java   |    4 +-
 .../ext/jsp/taglibmembers/GetAndSetTag.java     |    4 +-
 .../ext/jsp/taglibmembers/TestFunctions.java    |    4 +-
 .../ext/jsp/taglibmembers/TestSimpleTag.java    |    4 +-
 .../ext/jsp/taglibmembers/TestSimpleTag2.java   |    4 +-
 .../ext/jsp/taglibmembers/TestSimpleTag3.java   |    4 +-
 .../ext/jsp/taglibmembers/TestTag.java          |    4 +-
 .../ext/jsp/taglibmembers/TestTag2.java         |    4 +-
 .../ext/jsp/taglibmembers/TestTag3.java         |    4 +-
 .../config/WebappLocalFreemarkerServlet.java    |    4 +-
 .../ext/servlet/FreemarkerServletTest.java      |    4 +-
 .../ext/servlet/InitParamParserTest.java        |    4 +-
 .../freemarker/manual/AutoEscapingExample.java  |    4 +-
 .../manual/ConfigureOutputFormatExamples.java   |    4 +-
 .../freemarker/manual/CustomFormatsExample.java |    4 +-
 .../java/freemarker/manual/ExamplesTest.java    |    4 +-
 .../manual/GettingStartedExample.java           |    4 +-
 src/test/java/freemarker/manual/Product.java    |    4 +-
 .../manual/TemplateConfigurationExamples.java   |    4 +-
 .../UnitAwareTemplateNumberFormatFactory.java   |    4 +-
 .../manual/UnitAwareTemplateNumberModel.java    |    4 +-
 .../template/ActualNamingConvetionTest.java     |    4 +-
 .../template/ActualTagSyntaxTest.java           |    4 +-
 .../freemarker/template/ConfigurationTest.java  |   26 +-
 .../template/CustomAttributeTest.java           |    4 +-
 .../template/DefaultObjectWrapperTest.java      |    5 +-
 .../java/freemarker/template/ExceptionTest.java |    6 +-
 .../java/freemarker/template/GetSourceTest.java |    6 +-
 .../template/IncudeFromNamelessTest.java        |    6 +-
 .../template/JavaCCExceptionAsEOFFixTest.java   |    4 +-
 .../MistakenlyPublicImportAPIsTest.java         |    4 +-
 .../template/MistakenlyPublicMacroAPIsTest.java |    4 +-
 .../freemarker/template/MockServletContext.java |    4 +-
 .../template/NullConfigurationTest.java         |    4 +-
 .../template/SimpleObjetWrapperTest.java        |    4 +-
 .../template/StaticObjectWrappersTest.java      |    4 +-
 .../template/TemplateConstructorsTest.java      |    4 +-
 .../template/TemplateLanguageVersionTest.java   |    4 +-
 .../template/TemplateLookupStrategyTest.java    |  122 +--
 .../template/TemplateNotFoundMessageTest.java   |    4 +-
 .../java/freemarker/template/VersionTest.java   |    4 +-
 .../template/utility/DateUtilTest.java          |    6 +-
 .../template/utility/NumberUtilTest.java        |    8 +-
 .../template/utility/StringUtilTest.java        |    4 +-
 .../CopyrightCommentRemoverTemplateLoader.java  |    9 +-
 .../test/MonitoredTemplateLoader.java           |  230 +++-
 .../freemarker/test/ResourcesExtractor.java     |    4 +-
 src/test/java/freemarker/test/TemplateTest.java |    4 +-
 src/test/java/freemarker/test/TreeView.java     |    4 +-
 .../java/freemarker/test/hamcerst/Matchers.java |    4 +-
 .../hamcerst/StringContainsIgnoringCase.java    |    4 +-
 src/test/java/freemarker/test/package.html      |    4 +-
 .../test/servlet/DefaultModel2TesterAction.java |    4 +-
 .../freemarker/test/servlet/Model2Action.java   |    4 +-
 .../test/servlet/Model2TesterServlet.java       |    9 +-
 .../freemarker/test/servlet/WebAppTestCase.java |    4 +-
 src/test/java/freemarker/test/servlet/web.xml   |    4 +-
 .../test/templatesuite/TemplateTestCase.java    |    4 +-
 .../test/templatesuite/TemplateTestSuite.java   |    7 +-
 .../templatesuite/models/AllTemplateModels.java |    4 +-
 .../templatesuite/models/BeanTestClass.java     |    4 +-
 .../templatesuite/models/BeanTestInterface.java |    4 +-
 .../models/BeanTestSuperclass.java              |    4 +-
 .../models/BooleanAndScalarModel.java           |    4 +-
 .../models/BooleanAndStringTemplateModel.java   |    4 +-
 .../test/templatesuite/models/BooleanHash1.java |    4 +-
 .../test/templatesuite/models/BooleanHash2.java |    4 +-
 .../test/templatesuite/models/BooleanList1.java |    4 +-
 .../test/templatesuite/models/BooleanList2.java |    4 +-
 .../models/BooleanVsStringMethods.java          |    4 +-
 .../templatesuite/models/EnumTestClass.java     |    4 +-
 .../templatesuite/models/ExceptionModel.java    |    4 +-
 .../models/HashAndScalarModel.java              |    4 +-
 .../templatesuite/models/JavaObjectInfo.java    |    4 +-
 .../test/templatesuite/models/LegacyList.java   |    4 +-
 .../test/templatesuite/models/Listables.java    |   16 +-
 .../test/templatesuite/models/MultiModel1.java  |    4 +-
 .../test/templatesuite/models/MultiModel2.java  |    4 +-
 .../test/templatesuite/models/MultiModel3.java  |    4 +-
 .../test/templatesuite/models/MultiModel4.java  |    4 +-
 .../test/templatesuite/models/MultiModel5.java  |    4 +-
 .../test/templatesuite/models/NewTestModel.java |    4 +-
 .../templatesuite/models/NewTestModel2.java     |    4 +-
 .../models/NumberAndStringModel.java            |    4 +-
 .../models/OverloadedConstructor.java           |    4 +-
 .../templatesuite/models/OverloadedMethods.java |    4 +-
 .../models/OverloadedMethods2.java              |    6 +-
 .../templatesuite/models/SimpleTestMethod.java  |    4 +-
 .../models/TransformHashWrapper.java            |    4 +-
 .../models/TransformMethodWrapper1.java         |    6 +-
 .../models/TransformMethodWrapper2.java         |    4 +-
 .../templatesuite/models/TransformModel1.java   |    4 +-
 .../templatesuite/models/VarArgTestModel.java   |    4 +-
 .../freemarker/test/templatesuite/package.html  |    4 +-
 .../test/utility/AssertDirective.java           |    4 +-
 .../test/utility/AssertEqualsDirective.java     |    4 +-
 .../test/utility/AssertFailsDirective.java      |    4 +-
 .../AssertationFailedInTemplateException.java   |    4 +-
 .../test/utility/BadParameterTypeException.java |    4 +-
 .../freemarker/test/utility/FileTestCase.java   |    4 +-
 .../MissingRequiredParameterException.java      |    4 +-
 .../test/utility/NoOutputDirective.java         |    4 +-
 .../test/utility/ParameterException.java        |    4 +-
 .../java/freemarker/test/utility/TestUtil.java  |    4 +-
 .../utility/UnsupportedParameterException.java  |    4 +-
 src/test/resources/META-INF/malformed.tld       |    4 +-
 .../tldDiscovery MetaInfTldSources-1.tld        |    4 +-
 src/test/resources/freemarker/cache/test.ftl    |    4 +-
 src/test/resources/freemarker/core/ast-1.ast    |    4 +-
 src/test/resources/freemarker/core/ast-1.ftl    |    4 +-
 .../freemarker/core/ast-assignments.ast         |    4 +-
 .../freemarker/core/ast-assignments.ftl         |    4 +-
 .../resources/freemarker/core/ast-builtins.ast  |    4 +-
 .../resources/freemarker/core/ast-builtins.ftl  |    4 +-
 .../resources/freemarker/core/ast-locations.ast |    4 +-
 .../resources/freemarker/core/ast-locations.ftl |    4 +-
 .../core/ast-mixedcontentsimplifications.ast    |    4 +-
 .../core/ast-mixedcontentsimplifications.ftl    |    4 +-
 .../core/ast-multipleignoredchildren.ast        |    4 +-
 .../core/ast-multipleignoredchildren.ftl        |    4 +-
 .../core/ast-nestedignoredchildren.ast          |    4 +-
 .../core/ast-nestedignoredchildren.ftl          |    4 +-
 .../resources/freemarker/core/ast-range.ast     |    4 +-
 .../resources/freemarker/core/ast-range.ftl     |    4 +-
 .../freemarker/core/ast-strlitinterpolation.ast |    4 +-
 .../freemarker/core/ast-strlitinterpolation.ftl |    4 +-
 .../freemarker/core/ast-whitespacestripping.ast |    4 +-
 .../freemarker/core/ast-whitespacestripping.ftl |    4 +-
 .../freemarker/core/cano-assignments.ftl        |    4 +-
 .../freemarker/core/cano-assignments.ftl.out    |    4 +-
 .../resources/freemarker/core/cano-builtins.ftl |    4 +-
 .../freemarker/core/cano-builtins.ftl.out       |    4 +-
 .../core/cano-identifier-escaping.ftl           |    4 +-
 .../core/cano-identifier-escaping.ftl.out       |    4 +-
 .../resources/freemarker/core/cano-macros.ftl   |    4 +-
 .../freemarker/core/cano-macros.ftl.out         |    4 +-
 .../core/cano-strlitinterpolation.ftl           |    4 +-
 .../core/cano-strlitinterpolation.ftl.out       |    4 +-
 .../core/encodingOverride-ISO-8859-1.ftl        |    4 +-
 .../freemarker/core/encodingOverride-UTF-8.ftl  |    4 +-
 .../freemarker/ext/dom/DOMSiblingTest.xml       |   31 +
 .../freemarker/ext/jsp/TLDParsingTest.tld       |    4 +-
 .../ext/jsp/templates/classpath-test.ftl        |    4 +-
 .../ext/jsp/tldDiscovery-ClassPathTlds-1.tld    |    4 +-
 .../ext/jsp/tldDiscovery-ClassPathTlds-2.tld    |    4 +-
 .../ext/jsp/webapps/basic/CONTENTS.txt          |    4 +-
 .../WEB-INF/el-function-tag-name-clash.tld      |    4 +-
 .../jsp/webapps/basic/WEB-INF/el-functions.tld  |    4 +-
 .../basic/WEB-INF/expected/attributes-2.3.0.txt |    4 +-
 .../expected/attributes-2.3.22-future.txt       |    4 +-
 .../basic/WEB-INF/expected/attributes.txt       |    4 +-
 .../basic/WEB-INF/expected/customTags1.txt      |    4 +-
 .../ext/jsp/webapps/basic/WEB-INF/test.tld      |    4 +-
 .../ext/jsp/webapps/basic/WEB-INF/web.xml       |    4 +-
 .../ext/jsp/webapps/basic/attributes.ftl        |    4 +-
 .../jsp/webapps/basic/customELFunctions1.ftl    |    4 +-
 .../jsp/webapps/basic/customELFunctions1.jsp    |    4 +-
 .../ext/jsp/webapps/basic/customTags1.ftl       |    4 +-
 .../webapps/basic/elFunctionsTagNameClash.ftl   |    4 +-
 .../webapps/basic/elFunctionsTagNameClash.jsp   |    4 +-
 .../jsp/webapps/basic/trivial-jstl-@Ignore.ftl  |    4 +-
 .../ext/jsp/webapps/basic/trivial.ftl           |    4 +-
 .../ext/jsp/webapps/basic/trivial.jsp           |    4 +-
 .../ext/jsp/webapps/config/CONTENTS.txt         |    4 +-
 .../webapps/config/WEB-INF/classes/sub/test.ftl |    4 +-
 .../jsp/webapps/config/WEB-INF/classes/test.ftl |    4 +-
 .../WEB-INF/lib/templates.jar/sub/test2.ftl     |    4 +-
 .../webapps/config/WEB-INF/templates/test.ftl   |    4 +-
 .../ext/jsp/webapps/config/WEB-INF/web.xml      |    4 +-
 .../freemarker/ext/jsp/webapps/config/test.ftl  |    4 +-
 .../ext/jsp/webapps/errors/CONTENTS.txt         |    4 +-
 .../ext/jsp/webapps/errors/WEB-INF/web.xml      |    4 +-
 .../jsp/webapps/errors/failing-parsetime.jsp    |    4 +-
 .../ext/jsp/webapps/errors/failing-runtime.ftl  |    4 +-
 .../ext/jsp/webapps/errors/failing-runtime.jsp  |    4 +-
 .../ext/jsp/webapps/errors/not-failing.ftl      |    4 +-
 .../jsp/webapps/multipleLoaders/CONTENTS.txt    |    4 +-
 .../multipleLoaders/WEB-INF/templates/test.ftl  |    4 +-
 .../jsp/webapps/multipleLoaders/WEB-INF/web.xml |    4 +-
 .../ext/jsp/webapps/tldDiscovery/CONTENTS.txt   |    4 +-
 .../WEB-INF/expected/subdir/test-rel.txt        |    4 +-
 .../WEB-INF/expected/test-noClasspath.txt       |    4 +-
 .../tldDiscovery/WEB-INF/expected/test1.txt     |    4 +-
 .../tldDiscovery/WEB-INF/fmtesttag 2.tld        |    4 +-
 .../webapps/tldDiscovery/WEB-INF/fmtesttag4.tld |    4 +-
 .../lib/taglib-foo.jar/META-INF/foo bar.tld     |    4 +-
 .../WEB-INF/subdir-with-tld/fmtesttag3.tld      |    4 +-
 .../WEB-INF/taglib 2.jar/META-INF/taglib.tld    |    4 +-
 .../jsp/webapps/tldDiscovery/WEB-INF/web.xml    |    4 +-
 .../tldDiscovery/not-auto-scanned/fmtesttag.tld |    4 +-
 .../webapps/tldDiscovery/subdir/test-rel.ftl    |    4 +-
 .../webapps/tldDiscovery/test-noClasspath.ftl   |    4 +-
 .../ext/jsp/webapps/tldDiscovery/test1.ftl      |    4 +-
 .../manual/AutoEscapingExample-capture.ftlh     |    4 +-
 .../manual/AutoEscapingExample-capture.ftlh.out |    4 +-
 .../manual/AutoEscapingExample-convert.ftlh     |    4 +-
 .../manual/AutoEscapingExample-convert.ftlh.out |    4 +-
 .../manual/AutoEscapingExample-convert2.ftl     |    4 +-
 .../manual/AutoEscapingExample-convert2.ftl.out |    4 +-
 .../manual/AutoEscapingExample-infoBox.ftlh     |    4 +-
 .../manual/AutoEscapingExample-infoBox.ftlh.out |    4 +-
 .../manual/AutoEscapingExample-markup.ftlh      |    4 +-
 .../manual/AutoEscapingExample-markup.ftlh.out  |    4 +-
 .../AutoEscapingExample-stringConcat.ftlh       |    4 +-
 .../AutoEscapingExample-stringConcat.ftlh.out   |    4 +-
 .../AutoEscapingExample-stringLiteral.ftlh      |    4 +-
 .../AutoEscapingExample-stringLiteral.ftlh.out  |    4 +-
 .../AutoEscapingExample-stringLiteral2.ftlh     |    4 +-
 .../AutoEscapingExample-stringLiteral2.ftlh.out |    4 +-
 .../ConfigureOutputFormatExamples1.properties   |    4 +-
 .../ConfigureOutputFormatExamples2.properties   |    4 +-
 .../manual/CustomFormatsExample-alias1.ftlh     |    4 +-
 .../manual/CustomFormatsExample-alias1.ftlh.out |    4 +-
 .../manual/CustomFormatsExample-alias2.ftlh     |    4 +-
 .../manual/CustomFormatsExample-alias2.ftlh.out |    4 +-
 .../manual/CustomFormatsExample-modelAware.ftlh |    4 +-
 .../CustomFormatsExample-modelAware.ftlh.out    |    4 +-
 .../TemplateConfigurationExamples1.properties   |    4 +-
 .../TemplateConfigurationExamples2.properties   |    4 +-
 .../TemplateConfigurationExamples3.properties   |    4 +-
 src/test/resources/freemarker/manual/test.ftlh  |    4 +-
 .../template/SimpleObjectWrapperTest.java       |    4 +-
 .../resources/freemarker/template/toCache1.ftl  |    4 +-
 .../resources/freemarker/template/toCache2.ftl  |    4 +-
 .../test/templatesuite/expected/arithmetic.txt  |    4 +-
 .../test/templatesuite/expected/bean-maps.txt   |    4 +-
 .../test/templatesuite/expected/beans.txt       |    4 +-
 .../expected/boolean-formatting.txt             |    4 +-
 .../test/templatesuite/expected/boolean.txt     |    4 +-
 .../expected/charset-in-header.txt              |    4 +-
 .../expected/classic-compatible.txt             |    4 +-
 .../test/templatesuite/expected/comment.txt     |    4 +-
 .../test/templatesuite/expected/comparisons.txt |    4 +-
 .../test/templatesuite/expected/compress.txt    |    4 +-
 .../templatesuite/expected/dateformat-java.txt  |    4 +-
 .../templatesuite/expected/default-xmlns.txt    |    4 +-
 .../test/templatesuite/expected/default.txt     |    4 +-
 .../expected/encoding-builtins-ici-2.3.20.txt   |    4 +-
 .../expected/encoding-builtins.txt              |    4 +-
 .../test/templatesuite/expected/escapes.txt     |    4 +-
 .../test/templatesuite/expected/exception.txt   |    4 +-
 .../test/templatesuite/expected/exception2.txt  |    4 +-
 .../test/templatesuite/expected/exception3.txt  |    4 +-
 .../test/templatesuite/expected/exthash.txt     |    4 +-
 .../test/templatesuite/expected/hashconcat.txt  |    4 +-
 .../test/templatesuite/expected/hashliteral.txt |    4 +-
 .../test/templatesuite/expected/helloworld.txt  |    4 +-
 .../expected/identifier-escaping.txt            |    4 +-
 .../expected/identifier-non-ascii.txt           |    4 +-
 .../test/templatesuite/expected/if.txt          |    4 +-
 .../test/templatesuite/expected/import.txt      |    4 +-
 .../test/templatesuite/expected/include.txt     |    4 +-
 .../test/templatesuite/expected/include2.txt    |    4 +-
 .../test/templatesuite/expected/interpret.txt   |    4 +-
 .../test/templatesuite/expected/iterators.txt   |    4 +-
 .../templatesuite/expected/lastcharacter.txt    |    4 +-
 .../test/templatesuite/expected/list-bis.txt    |    4 +-
 .../test/templatesuite/expected/list.txt        |    4 +-
 .../test/templatesuite/expected/list2.txt       |    4 +-
 .../test/templatesuite/expected/list3.txt       |    4 +-
 .../test/templatesuite/expected/listhash.txt    |    4 +-
 .../expected/listhashliteral-ici-2.3.20.txt     |    4 +-
 .../expected/listhashliteral-ici-2.3.21.txt     |    4 +-
 .../test/templatesuite/expected/listliteral.txt |    4 +-
 .../templatesuite/expected/localization.txt     |    4 +-
 .../test/templatesuite/expected/logging.txt     |    4 +-
 .../templatesuite/expected/loopvariable.txt     |    4 +-
 .../templatesuite/expected/macros-return.txt    |    4 +-
 .../test/templatesuite/expected/macros.txt      |    4 +-
 .../test/templatesuite/expected/macros2.txt     |    4 +-
 .../test/templatesuite/expected/multimodels.txt |    4 +-
 .../test/templatesuite/expected/nested.txt      |    4 +-
 .../expected/new-allowsnothing.txt              |    4 +-
 .../expected/new-defaultresolver.txt            |    4 +-
 .../test/templatesuite/expected/new-optin.txt   |    4 +-
 .../test/templatesuite/expected/new-safer.txt   |    4 +-
 .../templatesuite/expected/new-unrestricted.txt |    4 +-
 .../test/templatesuite/expected/newlines1.txt   |    4 +-
 .../test/templatesuite/expected/newlines2.txt   |    4 +-
 .../expected/non-strict-syntax.txt              |    4 +-
 .../test/templatesuite/expected/noparse.txt     |    4 +-
 .../templatesuite/expected/number-format.txt    |    4 +-
 .../templatesuite/expected/number-literal.txt   |    4 +-
 .../templatesuite/expected/number-to-date.txt   |    4 +-
 .../templatesuite/expected/numerical-cast.txt   |    4 +-
 .../templatesuite/expected/output-encoding1.txt |    4 +-
 .../templatesuite/expected/output-encoding2.txt |  Bin 1976 -> 1972 bytes
 .../templatesuite/expected/output-encoding3.txt |    4 +-
 .../test/templatesuite/expected/precedence.txt  |    4 +-
 .../test/templatesuite/expected/recover.txt     |    4 +-
 .../test/templatesuite/expected/root.txt        |    4 +-
 .../expected/sequence-builtins.txt              |    4 +-
 .../test/templatesuite/expected/specialvars.txt |    4 +-
 .../templatesuite/expected/strictinheader.txt   |    4 +-
 .../string-builtins-regexps-matches.txt         |    4 +-
 .../expected/string-builtins-regexps.txt        |    4 +-
 .../templatesuite/expected/string-builtins1.txt |    4 +-
 .../templatesuite/expected/string-builtins2.txt |    4 +-
 .../templatesuite/expected/stringbimethods.txt  |    4 +-
 .../templatesuite/expected/stringliteral.txt    |  Bin 1552 -> 1550 bytes
 .../test/templatesuite/expected/switch.txt      |    4 +-
 .../test/templatesuite/expected/transforms.txt  |    4 +-
 .../expected/type-builtins-ici-2.3.21.txt       |    4 +-
 .../expected/type-builtins-ici-2.3.24.txt       |    4 +-
 .../templatesuite/expected/type-builtins.txt    |    4 +-
 .../test/templatesuite/expected/var-layers.txt  |    4 +-
 .../test/templatesuite/expected/varargs.txt     |    4 +-
 .../test/templatesuite/expected/variables.txt   |    4 +-
 .../templatesuite/expected/whitespace-trim.txt  |    4 +-
 .../templatesuite/expected/wstrip-in-header.txt |    4 +-
 .../test/templatesuite/expected/wstripping.txt  |    4 +-
 .../templatesuite/expected/xml-fragment.txt     |    4 +-
 .../expected/xml-ns_prefix-scope.txt            |    4 +-
 .../test/templatesuite/expected/xml.txt         |    4 +-
 .../test/templatesuite/expected/xmlns1.txt      |    4 +-
 .../test/templatesuite/expected/xmlns3.txt      |    4 +-
 .../test/templatesuite/expected/xmlns4.txt      |    4 +-
 .../test/templatesuite/expected/xmlns5.txt      |    4 +-
 .../models/BeansTestResources.properties        |    4 +-
 .../test/templatesuite/models/defaultxmlns1.xml |    4 +-
 .../models/xml-ns_prefix-scope.xml              |    4 +-
 .../test/templatesuite/models/xml.xml           |    4 +-
 .../test/templatesuite/models/xmlfragment.xml   |    4 +-
 .../test/templatesuite/models/xmlns.xml         |    4 +-
 .../test/templatesuite/models/xmlns2.xml        |    4 +-
 .../test/templatesuite/models/xmlns3.xml        |    4 +-
 .../templatesuite/templates/api-builtins.ftl    |    4 +-
 .../test/templatesuite/templates/arithmetic.ftl |    4 +-
 .../templatesuite/templates/assignments.ftl     |    4 +-
 .../test/templatesuite/templates/bean-maps.ftl  |    4 +-
 .../test/templatesuite/templates/beans.ftl      |    4 +-
 .../templates/boolean-formatting.ftl            |    4 +-
 .../test/templatesuite/templates/boolean.ftl    |    4 +-
 .../templates/charset-in-header.ftl             |    4 +-
 .../templates/charset-in-header_inc1.ftl        |    4 +-
 .../templates/charset-in-header_inc2.ftl        |    4 +-
 .../templates/classic-compatible-mode2.ftl      |    4 +-
 .../templates/classic-compatible.ftl            |    4 +-
 .../test/templatesuite/templates/comment.ftl    |    4 +-
 .../templatesuite/templates/comparisons.ftl     |    4 +-
 .../test/templatesuite/templates/compress.ftl   |    4 +-
 .../templates/date-type-builtins.ftl            |    4 +-
 .../templates/dateformat-iso-bi-common.ftl      |    4 +-
 .../templates/dateformat-iso-bi-ici-2.3.21.ftl  |    4 +-
 .../templates/dateformat-iso-bi.ftl             |    4 +-
 .../templates/dateformat-iso-like.ftl           |    4 +-
 .../templatesuite/templates/dateformat-java.ftl |    4 +-
 .../templatesuite/templates/dateparsing.ftl     |    4 +-
 .../templatesuite/templates/default-xmlns.ftl   |    4 +-
 .../test/templatesuite/templates/default.ftl    |    4 +-
 .../templates/encoding-builtins.ftl             |    4 +-
 .../test/templatesuite/templates/escapes.ftl    |    4 +-
 .../test/templatesuite/templates/exception.ftl  |    4 +-
 .../test/templatesuite/templates/exception2.ftl |    4 +-
 .../test/templatesuite/templates/exception3.ftl |    4 +-
 .../templates/existence-operators.ftl           |    4 +-
 .../test/templatesuite/templates/exthash.ftl    |    4 +-
 .../test/templatesuite/templates/hashconcat.ftl |    4 +-
 .../templatesuite/templates/hashliteral.ftl     |    4 +-
 .../test/templatesuite/templates/helloworld.ftl |    4 +-
 .../templates/identifier-escaping.ftl           |    4 +-
 .../templates/identifier-non-ascii.ftl          |    4 +-
 .../test/templatesuite/templates/if.ftl         |    4 +-
 .../test/templatesuite/templates/import.ftl     |    4 +-
 .../test/templatesuite/templates/import_lib.ftl |    4 +-
 .../test/templatesuite/templates/include.ftl    |    4 +-
 .../templates/include2-included-encoding.ftl    |    4 +-
 .../templates/include2-included.ftl             |    4 +-
 .../test/templatesuite/templates/include2.ftl   |    4 +-
 .../test/templatesuite/templates/included.ftl   |    4 +-
 .../test/templatesuite/templates/interpret.ftl  |    4 +-
 .../test/templatesuite/templates/iterators.ftl  |    4 +-
 .../templatesuite/templates/lastcharacter.ftl   |    4 +-
 .../test/templatesuite/templates/list-bis.ftl   |    4 +-
 .../test/templatesuite/templates/list.ftl       |    4 +-
 .../test/templatesuite/templates/list2.ftl      |    4 +-
 .../test/templatesuite/templates/list3.ftl      |    4 +-
 .../test/templatesuite/templates/listhash.ftl   |    4 +-
 .../templatesuite/templates/listhashliteral.ftl |    4 +-
 .../templatesuite/templates/listliteral.ftl     |    4 +-
 .../templatesuite/templates/localization.ftl    |    4 +-
 .../templatesuite/templates/localization_en.ftl |    4 +-
 .../templates/localization_en_AU.ftl            |    4 +-
 .../test/templatesuite/templates/logging.ftl    |    4 +-
 .../templatesuite/templates/loopvariable.ftl    |    4 +-
 .../templatesuite/templates/macros-return.ftl   |    4 +-
 .../test/templatesuite/templates/macros.ftl     |    4 +-
 .../test/templatesuite/templates/macros2.ftl    |    4 +-
 .../templatesuite/templates/multimodels.ftl     |    4 +-
 .../test/templatesuite/templates/nested.ftl     |    4 +-
 .../templatesuite/templates/nestedinclude.ftl   |    4 +-
 .../templates/new-allowsnothing.ftl             |    4 +-
 .../templates/new-defaultresolver.ftl           |    4 +-
 .../test/templatesuite/templates/new-optin.ftl  |    4 +-
 .../test/templatesuite/templates/new-safer.ftl  |    4 +-
 .../templates/new-unrestricted.ftl              |    4 +-
 .../test/templatesuite/templates/newlines1.ftl  |    4 +-
 .../test/templatesuite/templates/newlines2.ftl  |    4 +-
 .../templates/non-strict-syntax.ftl             |    4 +-
 .../test/templatesuite/templates/noparse.ftl    |    4 +-
 .../templatesuite/templates/number-format.ftl   |    4 +-
 .../templatesuite/templates/number-literal.ftl  |    4 +-
 .../templates/number-math-builtins.ftl          |    4 +-
 .../templatesuite/templates/number-to-date.ftl  |    4 +-
 .../templatesuite/templates/numerical-cast.ftl  |    4 +-
 .../templates/output-encoding1.ftl              |    4 +-
 .../templates/output-encoding2.ftl              |    4 +-
 .../templates/output-encoding3.ftl              |    4 +-
 .../overloaded-methods-2-bwici-2.3.20.ftl       |    4 +-
 .../overloaded-methods-2-bwici-2.3.21.ftl       |    4 +-
 .../templates/overloaded-methods-2-common.ftl   |    4 +-
 .../overloaded-methods-2-desc-bwici-2.3.20.ftl  |    4 +-
 .../overloaded-methods-2-inc-bwici-2.3.20.ftl   |    4 +-
 .../templates/overloaded-methods-23bc.ftl       |    4 +-
 .../test/templatesuite/templates/precedence.ftl |    4 +-
 .../templatesuite/templates/range-common.ftl    |    4 +-
 .../templates/range-ici-2.3.20.ftl              |    4 +-
 .../templates/range-ici-2.3.21.ftl              |    4 +-
 .../test/templatesuite/templates/recover.ftl    |    4 +-
 .../test/templatesuite/templates/root.ftl       |    4 +-
 .../templates/sequence-builtins.ftl             |    4 +-
 .../test/templatesuite/templates/setting.ftl    |    4 +-
 .../templates/simplehash-char-key.ftl           |    4 +-
 .../templatesuite/templates/specialvars.ftl     |    4 +-
 .../templatesuite/templates/strictinheader.ftl  |    4 +-
 .../templates/strictinheader_inc1.ftl           |    4 +-
 .../templates/strictinheader_inc2.ftl           |    4 +-
 .../templates/string-builtin-coercion.ftl       |    4 +-
 .../templates/string-builtins-ici-2.3.19.ftl    |    4 +-
 .../templates/string-builtins-ici-2.3.20.ftl    |    4 +-
 .../string-builtins-regexps-matches.ftl         |    4 +-
 .../templates/string-builtins-regexps.ftl       |    4 +-
 .../templates/string-builtins1.ftl              |    4 +-
 .../templates/string-builtins2.ftl              |    4 +-
 .../templates/string-builtins3.ftl              |    4 +-
 .../templatesuite/templates/stringbimethods.ftl |    4 +-
 .../templatesuite/templates/stringliteral.ftl   |    4 +-
 .../templates/subdir/include-subdir.ftl         |    4 +-
 .../templates/subdir/include-subdir2.ftl        |    4 +-
 .../templates/subdir/new-optin-2.ftl            |    4 +-
 .../templates/subdir/new-optin.ftl              |    4 +-
 .../templates/subdir/subsub/new-optin.ftl       |    4 +-
 .../templatesuite/templates/switch-builtin.ftl  |    4 +-
 .../test/templatesuite/templates/switch.ftl     |    4 +-
 .../templatesuite/templates/then-builtin.ftl    |    4 +-
 .../test/templatesuite/templates/transforms.ftl |    4 +-
 .../templatesuite/templates/type-builtins.ftl   |    4 +-
 .../test/templatesuite/templates/undefined.ftl  |    4 +-
 .../test/templatesuite/templates/url.ftl        |    4 +-
 .../test/templatesuite/templates/var-layers.ftl |    4 +-
 .../test/templatesuite/templates/varargs.ftl    |    4 +-
 .../test/templatesuite/templates/variables.ftl  |    4 +-
 .../templatesuite/templates/varlayers_lib.ftl   |    4 +-
 .../templatesuite/templates/whitespace-trim.ftl |    4 +-
 .../templates/wsstripinheader_inc.ftl           |    4 +-
 .../templates/wstrip-in-header.ftl              |    4 +-
 .../templatesuite/templates/xml-fragment.ftl    |    4 +-
 .../templates/xml-ns_prefix-scope-lib.ftl       |    4 +-
 .../templates/xml-ns_prefix-scope-main.ftl      |    4 +-
 .../test/templatesuite/templates/xml.ftl        |    4 +-
 .../test/templatesuite/templates/xmlns1.ftl     |    4 +-
 .../test/templatesuite/templates/xmlns3.ftl     |    4 +-
 .../test/templatesuite/templates/xmlns4.ftl     |    4 +-
 .../test/templatesuite/templates/xmlns5.ftl     |    4 +-
 .../freemarker/test/templatesuite/testcases.xml |    4 +-
 src/test/resources/logback-test.xml             |    4 +-
 1164 files changed, 6061 insertions(+), 6369 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/617ad6fc/src/main/java/freemarker/core/FreeMarkerTree.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/617ad6fc/src/main/java/freemarker/core/TemplateElement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/617ad6fc/src/main/java/freemarker/template/Template.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/617ad6fc/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/617ad6fc/src/test/java/freemarker/test/TreeView.java
----------------------------------------------------------------------


Mime
View raw message