freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [51/51] [partial] incubator-freemarker git commit: Migrated from Ant to Gradle, and modularized the project. This is an incomplete migration; there are some TODO-s in the build scripts, and release related tasks are still missing. What works: Building th
Date Sun, 14 May 2017 10:53:34 GMT
Migrated from Ant to Gradle, and modularized the project. This is an incomplete migration; there are some TODO-s in the build scripts, and release related tasks are still missing. What works: Building the jar-s (with OSGi support, legal files, etc.), generating and installing Maven artifacts, running the tests, generating JavaDoc.


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/3fd56062
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/3fd56062
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/3fd56062

Branch: refs/heads/3
Commit: 3fd5606295396ce2bea03bf2a11772f690e3cc6f
Parents: d373a34
Author: ddekany <ddekany@apache.org>
Authored: Fri May 12 20:09:46 2017 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Sun May 14 12:50:43 2017 +0200

----------------------------------------------------------------------
 .gitignore                                      |   16 +-
 .travis.yml                                     |    5 -
 LICENSE                                         |   13 +-
 README-gradle.md                                |   13 -
 README.md                                       |   77 +-
 build.gradle                                    |  348 +-
 build.properties.sample                         |   23 -
 build.xml                                       | 1093 -----
 freemarker-core-java8-test/build.gradle         |   19 +
 .../src/main/resources/META-INF/DISCLAIMER      |    8 +
 .../src/main/resources/META-INF/LICENSE         |  202 +
 .../core/model/impl/BridgeMethodsBean.java      |   30 +
 .../core/model/impl/BridgeMethodsBeanBase.java  |   29 +
 ...Java8BridgeMethodsWithDefaultMethodBean.java |   29 +
 ...ava8BridgeMethodsWithDefaultMethodBean2.java |   23 +
 ...8BridgeMethodsWithDefaultMethodBeanBase.java |   31 +
 ...BridgeMethodsWithDefaultMethodBeanBase2.java |   28 +
 .../model/impl/Java8DefaultMethodsBean.java     |   84 +
 .../model/impl/Java8DefaultMethodsBeanBase.java |   97 +
 ...a8DefaultObjectWrapperBridgeMethodsTest.java |   65 +
 .../impl/Java8DefaultObjectWrapperTest.java     |  160 +
 freemarker-core/build.gradle                    |  155 +
 freemarker-core/src/dist/bin/LICENSE            |  232 +
 .../src/dist/bin/documentation/index.html       |   67 +
 .../src/dist/javadoc/META-INF/LICENSE           |  202 +
 .../Eclipse/Formatter-profile-FreeMarker.xml    |  313 ++
 .../Editor-Inspections-FreeMarker.xml           |   33 +
 .../Java-code-style-FreeMarker.xml              |   66 +
 .../core/APINotSupportedTemplateException.java  |   49 +
 .../org/apache/freemarker/core/ASTComment.java  |   87 +
 .../apache/freemarker/core/ASTDebugBreak.java   |   89 +
 .../freemarker/core/ASTDirAssignment.java       |  279 ++
 .../core/ASTDirAssignmentsContainer.java        |  115 +
 .../core/ASTDirAttemptRecoverContainer.java     |   88 +
 .../apache/freemarker/core/ASTDirAutoEsc.java   |   77 +
 .../org/apache/freemarker/core/ASTDirBreak.java |   70 +
 .../core/ASTDirCapturingAssignment.java         |  184 +
 .../org/apache/freemarker/core/ASTDirCase.java  |   91 +
 .../apache/freemarker/core/ASTDirCompress.java  |   87 +
 .../freemarker/core/ASTDirElseOfList.java       |   75 +
 .../apache/freemarker/core/ASTDirEscape.java    |  111 +
 .../apache/freemarker/core/ASTDirFallback.java  |   70 +
 .../org/apache/freemarker/core/ASTDirFlush.java |   65 +
 .../core/ASTDirIfElseIfElseContainer.java       |  107 +
 .../freemarker/core/ASTDirIfOrElseOrElseIf.java |  114 +
 .../apache/freemarker/core/ASTDirImport.java    |  125 +
 .../apache/freemarker/core/ASTDirInclude.java   |  174 +
 .../org/apache/freemarker/core/ASTDirItems.java |  120 +
 .../org/apache/freemarker/core/ASTDirList.java  |  462 ++
 .../core/ASTDirListElseContainer.java           |   88 +
 .../org/apache/freemarker/core/ASTDirMacro.java |  325 ++
 .../apache/freemarker/core/ASTDirNested.java    |  159 +
 .../apache/freemarker/core/ASTDirNoAutoEsc.java |   77 +
 .../apache/freemarker/core/ASTDirNoEscape.java  |   78 +
 .../freemarker/core/ASTDirOutputFormat.java     |   85 +
 .../apache/freemarker/core/ASTDirRecover.java   |   75 +
 .../apache/freemarker/core/ASTDirRecurse.java   |  130 +
 .../apache/freemarker/core/ASTDirReturn.java    |   91 +
 .../org/apache/freemarker/core/ASTDirSep.java   |   89 +
 .../apache/freemarker/core/ASTDirSetting.java   |  172 +
 .../org/apache/freemarker/core/ASTDirStop.java  |   81 +
 .../apache/freemarker/core/ASTDirSwitch.java    |  129 +
 .../apache/freemarker/core/ASTDirTOrTrOrTl.java |  109 +
 .../freemarker/core/ASTDirUserDefined.java      |  343 ++
 .../org/apache/freemarker/core/ASTDirVisit.java |  126 +
 .../apache/freemarker/core/ASTDirective.java    |   98 +
 .../freemarker/core/ASTDollarInterpolation.java |  151 +
 .../org/apache/freemarker/core/ASTElement.java  |  445 ++
 .../freemarker/core/ASTExpAddOrConcat.java      |  313 ++
 .../org/apache/freemarker/core/ASTExpAnd.java   |   82 +
 .../apache/freemarker/core/ASTExpBoolean.java   |   34 +
 .../freemarker/core/ASTExpBooleanLiteral.java   |   91 +
 .../apache/freemarker/core/ASTExpBuiltIn.java   |  485 ++
 .../freemarker/core/ASTExpBuiltInVariable.java  |  298 ++
 .../freemarker/core/ASTExpComparison.java       |  104 +
 .../apache/freemarker/core/ASTExpDefault.java   |  142 +
 .../org/apache/freemarker/core/ASTExpDot.java   |   92 +
 .../freemarker/core/ASTExpDynamicKeyName.java   |  284 ++
 .../apache/freemarker/core/ASTExpExists.java    |   91 +
 .../freemarker/core/ASTExpHashLiteral.java      |  220 +
 .../freemarker/core/ASTExpListLiteral.java      |  195 +
 .../freemarker/core/ASTExpMethodCall.java       |  147 +
 .../freemarker/core/ASTExpNegateOrPlus.java     |  110 +
 .../org/apache/freemarker/core/ASTExpNot.java   |   76 +
 .../freemarker/core/ASTExpNumberLiteral.java    |   92 +
 .../org/apache/freemarker/core/ASTExpOr.java    |   82 +
 .../freemarker/core/ASTExpParenthesis.java      |   88 +
 .../org/apache/freemarker/core/ASTExpRange.java |  119 +
 .../freemarker/core/ASTExpStringLiteral.java    |  211 +
 .../apache/freemarker/core/ASTExpVariable.java  |  105 +
 .../apache/freemarker/core/ASTExpression.java   |  208 +
 .../freemarker/core/ASTHashInterpolation.java   |  172 +
 .../freemarker/core/ASTImplicitParent.java      |  101 +
 .../freemarker/core/ASTInterpolation.java       |   51 +
 .../org/apache/freemarker/core/ASTNode.java     |  233 +
 .../apache/freemarker/core/ASTStaticText.java   |  408 ++
 .../freemarker/core/ArithmeticExpression.java   |  129 +
 .../freemarker/core/BoundedRangeModel.java      |   70 +
 .../core/BuiltInBannedWhenAutoEscaping.java     |   27 +
 .../apache/freemarker/core/BuiltInForDate.java  |   56 +
 .../freemarker/core/BuiltInForHashEx.java       |   55 +
 .../core/BuiltInForLegacyEscaping.java          |   48 +
 .../freemarker/core/BuiltInForLoopVariable.java |   48 +
 .../freemarker/core/BuiltInForMarkupOutput.java |   40 +
 .../apache/freemarker/core/BuiltInForNode.java  |   39 +
 .../freemarker/core/BuiltInForNodeEx.java       |   37 +
 .../freemarker/core/BuiltInForNumber.java       |   35 +
 .../freemarker/core/BuiltInForSequence.java     |   38 +
 .../freemarker/core/BuiltInForString.java       |   36 +
 .../core/BuiltInWithParseTimeParameters.java    |  109 +
 .../freemarker/core/BuiltInsForDates.java       |  212 +
 .../core/BuiltInsForExistenceHandling.java      |  133 +
 .../freemarker/core/BuiltInsForHashes.java      |   59 +
 .../core/BuiltInsForLoopVariables.java          |  156 +
 .../core/BuiltInsForMarkupOutputs.java          |   41 +
 .../core/BuiltInsForMultipleTypes.java          |  717 +++
 .../freemarker/core/BuiltInsForNodes.java       |  154 +
 .../freemarker/core/BuiltInsForNumbers.java     |  319 ++
 .../core/BuiltInsForOutputFormatRelated.java    |   84 +
 .../freemarker/core/BuiltInsForSequences.java   |  871 ++++
 .../core/BuiltInsForStringsBasic.java           |  697 +++
 .../core/BuiltInsForStringsEncoding.java        |  195 +
 .../freemarker/core/BuiltInsForStringsMisc.java |  305 ++
 .../core/BuiltInsForStringsRegexp.java          |  322 ++
 .../core/BuiltInsWithParseTimeParameters.java   |  157 +
 ...lPlaceCustomDataInitializationException.java |   33 +
 .../apache/freemarker/core/Configuration.java   | 2616 +++++++++++
 .../freemarker/core/ConfigurationException.java |   37 +
 .../ConfigurationSettingValueException.java     |   86 +
 .../apache/freemarker/core/CustomStateKey.java  |   60 +
 .../freemarker/core/CustomStateScope.java       |   34 +
 .../freemarker/core/DirectiveCallPlace.java     |  137 +
 .../org/apache/freemarker/core/Environment.java | 3213 ++++++++++++++
 .../core/InvalidReferenceException.java         |  167 +
 .../core/ListableRightUnboundedRangeModel.java  |   97 +
 .../apache/freemarker/core/LocalContext.java    |   36 +
 .../freemarker/core/LocalContextStack.java      |   57 +
 .../core/MarkupOutputFormatBoundBuiltIn.java    |   46 +
 .../org/apache/freemarker/core/MessageUtil.java |  341 ++
 .../org/apache/freemarker/core/MiscUtil.java    |   69 +
 ...utableParsingAndProcessingConfiguration.java |  475 ++
 .../core/MutableProcessingConfiguration.java    | 2418 ++++++++++
 .../freemarker/core/NativeCollectionEx.java     |   73 +
 .../apache/freemarker/core/NativeHashEx2.java   |  106 +
 .../apache/freemarker/core/NativeSequence.java  |   74 +
 .../core/NativeStringArraySequence.java         |   53 +
 .../NativeStringCollectionCollectionEx.java     |   79 +
 .../core/NativeStringListSequence.java          |   56 +
 .../NestedContentNotSupportedException.java     |   67 +
 .../freemarker/core/NonBooleanException.java    |   62 +
 .../freemarker/core/NonDateException.java       |   58 +
 .../core/NonExtendedHashException.java          |   62 +
 .../core/NonExtendedNodeException.java          |   64 +
 .../freemarker/core/NonHashException.java       |   64 +
 .../core/NonMarkupOutputException.java          |   64 +
 .../freemarker/core/NonMethodException.java     |   64 +
 .../freemarker/core/NonNamespaceException.java  |   63 +
 .../freemarker/core/NonNodeException.java       |   64 +
 .../freemarker/core/NonNumericalException.java  |   74 +
 .../freemarker/core/NonSequenceException.java   |   64 +
 .../core/NonSequenceOrCollectionException.java  |   92 +
 .../freemarker/core/NonStringException.java     |   74 +
 .../NonStringOrTemplateOutputException.java     |   78 +
 .../NonUserDefinedDirectiveLikeException.java   |   67 +
 .../core/OutputFormatBoundBuiltIn.java          |   48 +
 .../apache/freemarker/core/ParameterRole.java   |   91 +
 .../apache/freemarker/core/ParseException.java  |  518 +++
 .../core/ParsingAndProcessingConfiguration.java |   29 +
 .../freemarker/core/ParsingConfiguration.java   |  299 ++
 .../core/ProcessingConfiguration.java           |  704 +++
 .../org/apache/freemarker/core/RangeModel.java  |   59 +
 .../apache/freemarker/core/RegexpHelper.java    |  207 +
 .../core/RightUnboundedRangeModel.java          |   48 +
 .../core/SettingValueNotSetException.java       |   33 +
 .../apache/freemarker/core/SpecialBuiltIn.java  |   27 +
 .../apache/freemarker/core/StopException.java   |   64 +
 .../org/apache/freemarker/core/Template.java    | 1341 ++++++
 .../freemarker/core/TemplateBooleanFormat.java  |   91 +
 .../freemarker/core/TemplateClassResolver.java  |   82 +
 .../freemarker/core/TemplateConfiguration.java  |  991 +++++
 .../core/TemplateElementArrayBuilder.java       |  102 +
 .../core/TemplateElementsToVisit.java           |   48 +
 .../freemarker/core/TemplateException.java      |  655 +++
 .../core/TemplateExceptionHandler.java          |  156 +
 .../freemarker/core/TemplateLanguage.java       |  111 +
 .../core/TemplateNotFoundException.java         |   64 +
 ...emplateParsingConfigurationWithFallback.java |  146 +
 .../freemarker/core/TemplatePostProcessor.java  |   31 +
 .../core/TemplatePostProcessorException.java    |   35 +
 ...nterruptionSupportTemplatePostProcessor.java |  140 +
 .../apache/freemarker/core/TokenMgrError.java   |  249 ++
 .../freemarker/core/TopLevelConfiguration.java  |  194 +
 .../core/UnexpectedTypeException.java           |  109 +
 .../UnknownConfigurationSettingException.java   |   40 +
 .../org/apache/freemarker/core/Version.java     |  297 ++
 .../core/WrongTemplateCharsetException.java     |   63 +
 .../apache/freemarker/core/_CharsetBuilder.java |   41 +
 .../org/apache/freemarker/core/_CoreAPI.java    |   88 +
 .../org/apache/freemarker/core/_CoreLogs.java   |   46 +
 .../java/org/apache/freemarker/core/_Debug.java |  122 +
 .../apache/freemarker/core/_DelayedAOrAn.java   |   35 +
 .../core/_DelayedConversionToString.java        |   52 +
 .../core/_DelayedFTLTypeDescription.java        |   37 +
 .../core/_DelayedGetCanonicalForm.java          |   39 +
 .../freemarker/core/_DelayedGetMessage.java     |   35 +
 .../core/_DelayedGetMessageWithoutStackTop.java |   34 +
 .../apache/freemarker/core/_DelayedJQuote.java  |   36 +
 .../freemarker/core/_DelayedJoinWithComma.java  |   48 +
 .../apache/freemarker/core/_DelayedOrdinal.java |   47 +
 .../freemarker/core/_DelayedShortClassName.java |   35 +
 .../freemarker/core/_DelayedToString.java       |   37 +
 .../core/_ErrorDescriptionBuilder.java          |  356 ++
 .../org/apache/freemarker/core/_EvalUtil.java   |  545 +++
 .../java/org/apache/freemarker/core/_Java8.java |   34 +
 .../org/apache/freemarker/core/_Java8Impl.java  |   54 +
 .../freemarker/core/_MiscTemplateException.java |  124 +
 ...ObjectBuilderSettingEvaluationException.java |   46 +
 .../core/_ObjectBuilderSettingEvaluator.java    | 1068 +++++
 .../core/_SettingEvaluationEnvironment.java     |   61 +
 .../core/_TemplateModelException.java           |  133 +
 .../freemarker/core/_TimeZoneBuilder.java       |   43 +
 ...expectedTypeErrorExplainerTemplateModel.java |   36 +
 .../core/arithmetic/ArithmeticEngine.java       |   92 +
 .../impl/BigDecimalArithmeticEngine.java        |  107 +
 .../impl/ConservativeArithmeticEngine.java      |  381 ++
 .../core/arithmetic/impl/package.html           |   26 +
 .../freemarker/core/arithmetic/package.html     |   25 +
 .../freemarker/core/debug/Breakpoint.java       |   83 +
 .../freemarker/core/debug/DebugModel.java       |  105 +
 .../core/debug/DebuggedEnvironment.java         |   58 +
 .../apache/freemarker/core/debug/Debugger.java  |   95 +
 .../freemarker/core/debug/DebuggerClient.java   |  149 +
 .../freemarker/core/debug/DebuggerListener.java |   36 +
 .../freemarker/core/debug/DebuggerServer.java   |  131 +
 .../core/debug/EnvironmentSuspendedEvent.java   |   67 +
 .../core/debug/RmiDebugModelImpl.java           |  164 +
 .../core/debug/RmiDebuggedEnvironmentImpl.java  |  340 ++
 .../freemarker/core/debug/RmiDebuggerImpl.java  |   86 +
 .../core/debug/RmiDebuggerListenerImpl.java     |   67 +
 .../core/debug/RmiDebuggerService.java          |  307 ++
 .../apache/freemarker/core/debug/SoftCache.java |   89 +
 .../freemarker/core/debug/_DebuggerService.java |   93 +
 .../apache/freemarker/core/debug/package.html   |   27 +
 .../core/model/AdapterTemplateModel.java        |   49 +
 .../apache/freemarker/core/model/Constants.java |  133 +
 .../core/model/FalseTemplateBooleanModel.java   |   36 +
 .../core/model/GeneralPurposeNothing.java       |   83 +
 .../freemarker/core/model/ObjectWrapper.java    |   59 +
 .../core/model/ObjectWrapperAndUnwrapper.java   |   90 +
 .../core/model/ObjectWrapperWithAPISupport.java |   46 +
 .../core/model/RichObjectWrapper.java           |   34 +
 .../model/SerializableTemplateBooleanModel.java |   24 +
 .../core/model/TemplateBooleanModel.java        |   48 +
 .../core/model/TemplateCollectionModel.java     |   48 +
 .../core/model/TemplateCollectionModelEx.java   |   45 +
 .../core/model/TemplateDateModel.java           |   73 +
 .../core/model/TemplateDirectiveBody.java       |   45 +
 .../core/model/TemplateDirectiveModel.java      |   69 +
 .../core/model/TemplateHashModel.java           |   41 +
 .../core/model/TemplateHashModelEx.java         |   51 +
 .../core/model/TemplateHashModelEx2.java        |   80 +
 .../core/model/TemplateMarkupOutputModel.java   |   52 +
 .../core/model/TemplateMethodModel.java         |   60 +
 .../core/model/TemplateMethodModelEx.java       |   54 +
 .../freemarker/core/model/TemplateModel.java    |   55 +
 .../core/model/TemplateModelAdapter.java        |   34 +
 .../core/model/TemplateModelException.java      |  111 +
 .../core/model/TemplateModelIterator.java       |   39 +
 .../core/model/TemplateModelWithAPISupport.java |   39 +
 .../core/model/TemplateNodeModel.java           |   78 +
 .../core/model/TemplateNodeModelEx.java         |   40 +
 .../core/model/TemplateNumberModel.java         |   42 +
 .../core/model/TemplateScalarModel.java         |   45 +
 .../core/model/TemplateSequenceModel.java       |   48 +
 .../core/model/TemplateTransformModel.java      |   54 +
 .../freemarker/core/model/TransformControl.java |  101 +
 .../core/model/TrueTemplateBooleanModel.java    |   36 +
 .../core/model/WrapperTemplateModel.java        |   33 +
 .../core/model/WrappingTemplateModel.java       |   62 +
 .../freemarker/core/model/impl/APIModel.java    |   45 +
 .../core/model/impl/ArgumentTypes.java          |  647 +++
 .../core/model/impl/BeanAndStringModel.java     |   53 +
 .../freemarker/core/model/impl/BeanModel.java   |  339 ++
 .../model/impl/CallableMemberDescriptor.java    |   56 +
 .../core/model/impl/CharacterOrString.java      |   45 +
 .../core/model/impl/ClassBasedModelFactory.java |  148 +
 .../core/model/impl/ClassChangeNotifier.java    |   32 +
 .../core/model/impl/ClassIntrospector.java      | 1263 ++++++
 .../core/model/impl/CollectionAdapter.java      |   88 +
 .../core/model/impl/CollectionAndSequence.java  |  111 +
 .../core/model/impl/DefaultArrayAdapter.java    |  378 ++
 .../model/impl/DefaultEnumerationAdapter.java   |  128 +
 .../core/model/impl/DefaultIterableAdapter.java |   94 +
 .../core/model/impl/DefaultIteratorAdapter.java |  138 +
 .../core/model/impl/DefaultListAdapter.java     |  123 +
 .../core/model/impl/DefaultMapAdapter.java      |  171 +
 .../impl/DefaultNonListCollectionAdapter.java   |  103 +
 .../core/model/impl/DefaultObjectWrapper.java   | 1773 ++++++++
 .../DefaultObjectWrapperTCCLSingletonUtil.java  |  129 +
 .../DefaultUnassignableIteratorAdapter.java     |   59 +
 .../impl/EmptyCallableMemberDescriptor.java     |   35 +
 .../model/impl/EmptyMemberAndArguments.java     |   93 +
 .../freemarker/core/model/impl/EnumModels.java  |   50 +
 .../freemarker/core/model/impl/HashAdapter.java |  181 +
 .../model/impl/InvalidPropertyException.java    |   34 +
 .../model/impl/JRebelClassChangeNotifier.java   |   58 +
 .../core/model/impl/JavaMethodModel.java        |  105 +
 .../model/impl/MapKeyValuePairIterator.java     |   77 +
 .../MaybeEmptyCallableMemberDescriptor.java     |   25 +
 .../impl/MaybeEmptyMemberAndArguments.java      |   22 +
 .../core/model/impl/MemberAndArguments.java     |   64 +
 .../model/impl/MethodAppearanceFineTuner.java   |  156 +
 .../core/model/impl/MethodSorter.java           |   36 +
 .../NonPrimitiveArrayBackedReadOnlyList.java    |   42 +
 .../model/impl/OverloadedFixArgsMethods.java    |   99 +
 .../core/model/impl/OverloadedMethods.java      |  271 ++
 .../core/model/impl/OverloadedMethodsModel.java |   65 +
 .../model/impl/OverloadedMethodsSubset.java     |  402 ++
 .../core/model/impl/OverloadedNumberUtil.java   | 1289 ++++++
 .../model/impl/OverloadedVarArgsMethods.java    |  245 ++
 .../impl/PrimtiveArrayBackedReadOnlyList.java   |   47 +
 .../ReflectionCallableMemberDescriptor.java     |   95 +
 .../core/model/impl/ResourceBundleModel.java    |  181 +
 .../model/impl/RestrictedObjectWrapper.java     |   98 +
 .../core/model/impl/SequenceAdapter.java        |   68 +
 .../freemarker/core/model/impl/SetAdapter.java  |   32 +
 .../core/model/impl/SimpleCollection.java       |  138 +
 .../freemarker/core/model/impl/SimpleDate.java  |   85 +
 .../freemarker/core/model/impl/SimpleHash.java  |  296 ++
 .../core/model/impl/SimpleMethod.java           |  174 +
 .../core/model/impl/SimpleNumber.java           |   77 +
 .../core/model/impl/SimpleScalar.java           |   73 +
 .../core/model/impl/SimpleSequence.java         |  162 +
 .../core/model/impl/SingletonCustomizer.java    |   51 +
 .../freemarker/core/model/impl/StaticModel.java |  177 +
 .../core/model/impl/StaticModels.java           |   43 +
 .../model/impl/TemplateModelListSequence.java   |   58 +
 .../freemarker/core/model/impl/TypeFlags.java   |  130 +
 .../core/model/impl/UnsafeMethods.java          |  112 +
 .../freemarker/core/model/impl/_MethodUtil.java |  319 ++
 .../freemarker/core/model/impl/_ModelAPI.java   |  122 +
 .../freemarker/core/model/impl/package.html     |   26 +
 .../apache/freemarker/core/model/package.html   |   25 +
 .../outputformat/CommonMarkupOutputFormat.java  |  124 +
 .../CommonTemplateMarkupOutputModel.java        |   69 +
 .../core/outputformat/MarkupOutputFormat.java   |  135 +
 .../core/outputformat/OutputFormat.java         |   86 +
 .../UnregisteredOutputFormatException.java      |   39 +
 .../core/outputformat/impl/CSSOutputFormat.java |   54 +
 .../impl/CombinedMarkupOutputFormat.java        |  108 +
 .../outputformat/impl/HTMLOutputFormat.java     |   77 +
 .../outputformat/impl/JSONOutputFormat.java     |   54 +
 .../impl/JavaScriptOutputFormat.java            |   55 +
 .../impl/PlainTextOutputFormat.java             |   58 +
 .../core/outputformat/impl/RTFOutputFormat.java |   77 +
 .../impl/TemplateCombinedMarkupOutputModel.java |   52 +
 .../impl/TemplateHTMLOutputModel.java           |   42 +
 .../impl/TemplateRTFOutputModel.java            |   42 +
 .../impl/TemplateXHTMLOutputModel.java          |   42 +
 .../impl/TemplateXMLOutputModel.java            |   42 +
 .../impl/UndefinedOutputFormat.java             |   58 +
 .../outputformat/impl/XHTMLOutputFormat.java    |   77 +
 .../core/outputformat/impl/XMLOutputFormat.java |   77 +
 .../core/outputformat/impl/package.html         |   26 +
 .../freemarker/core/outputformat/package.html   |   25 +
 .../org/apache/freemarker/core/package.html     |   27 +
 .../core/templateresolver/AndMatcher.java       |   45 +
 .../core/templateresolver/CacheStorage.java     |   37 +
 .../CacheStorageWithGetSize.java                |   36 +
 ...ConditionalTemplateConfigurationFactory.java |   65 +
 .../templateresolver/FileExtensionMatcher.java  |   85 +
 .../templateresolver/FileNameGlobMatcher.java   |   86 +
 .../FirstMatchTemplateConfigurationFactory.java |  110 +
 .../templateresolver/GetTemplateResult.java     |   89 +
 .../MalformedTemplateNameException.java         |   60 +
 .../MergingTemplateConfigurationFactory.java    |   63 +
 .../core/templateresolver/NotMatcher.java       |   41 +
 .../core/templateresolver/OrMatcher.java        |   45 +
 .../core/templateresolver/PathGlobMatcher.java  |  100 +
 .../core/templateresolver/PathRegexMatcher.java |   54 +
 .../TemplateConfigurationFactory.java           |   54 +
 .../TemplateConfigurationFactoryException.java  |   36 +
 .../core/templateresolver/TemplateLoader.java   |  104 +
 .../templateresolver/TemplateLoaderSession.java |   76 +
 .../templateresolver/TemplateLoadingResult.java |  208 +
 .../TemplateLoadingResultStatus.java            |   49 +
 .../templateresolver/TemplateLoadingSource.java |   69 +
 .../templateresolver/TemplateLookupContext.java |  112 +
 .../templateresolver/TemplateLookupResult.java  |   54 +
 .../TemplateLookupStrategy.java                 |   78 +
 .../templateresolver/TemplateNameFormat.java    |   53 +
 .../core/templateresolver/TemplateResolver.java |  166 +
 .../templateresolver/TemplateSourceMatcher.java |   30 +
 .../core/templateresolver/_CacheAPI.java        |   43 +
 .../impl/ByteArrayTemplateLoader.java           |  199 +
 .../impl/ClassTemplateLoader.java               |  184 +
 .../impl/DefaultTemplateLookupStrategy.java     |   61 +
 .../impl/DefaultTemplateNameFormat.java         |  309 ++
 .../impl/DefaultTemplateNameFormatFM2.java      |  105 +
 .../impl/DefaultTemplateResolver.java           |  904 ++++
 .../impl/FileTemplateLoader.java                |  383 ++
 .../templateresolver/impl/MruCacheStorage.java  |  330 ++
 .../impl/MultiTemplateLoader.java               |  172 +
 .../templateresolver/impl/NullCacheStorage.java |   71 +
 .../templateresolver/impl/SoftCacheStorage.java |  112 +
 .../impl/StringTemplateLoader.java              |  199 +
 .../impl/StrongCacheStorage.java                |   70 +
 ...emplateLoaderBasedTemplateLookupContext.java |   66 +
 ...TemplateLoaderBasedTemplateLookupResult.java |  124 +
 .../impl/URLTemplateLoader.java                 |  229 +
 .../impl/URLTemplateLoadingSource.java          |   58 +
 .../impl/_TemplateLoaderUtils.java              |   43 +
 .../core/templateresolver/impl/package.html     |   26 +
 .../core/templateresolver/package.html          |   25 +
 .../freemarker/core/util/BugException.java      |   52 +
 .../freemarker/core/util/CaptureOutput.java     |  147 +
 .../freemarker/core/util/CommonBuilder.java     |   35 +
 .../apache/freemarker/core/util/DeepUnwrap.java |  153 +
 .../apache/freemarker/core/util/FTLUtil.java    |  805 ++++
 .../core/util/GenericParseException.java        |   40 +
 .../apache/freemarker/core/util/HtmlEscape.java |  109 +
 .../freemarker/core/util/NormalizeNewlines.java |  115 +
 .../freemarker/core/util/ObjectFactory.java     |   31 +
 .../core/util/OptInTemplateClassResolver.java   |  160 +
 .../core/util/ProductWrappingBuilder.java       |   38 +
 .../freemarker/core/util/StandardCompress.java  |  239 +
 .../core/util/UndeclaredThrowableException.java |   43 +
 .../util/UnrecognizedTimeZoneException.java     |   38 +
 .../util/UnsupportedNumberClassException.java   |   38 +
 .../apache/freemarker/core/util/XmlEscape.java  |   92 +
 .../freemarker/core/util/_ArrayEnumeration.java |   51 +
 .../freemarker/core/util/_ArrayIterator.java    |   54 +
 .../apache/freemarker/core/util/_ClassUtil.java |  182 +
 .../freemarker/core/util/_CollectionUtil.java   |   36 +
 .../apache/freemarker/core/util/_DateUtil.java  |  914 ++++
 .../freemarker/core/util/_JavaVersions.java     |   80 +
 .../freemarker/core/util/_KeyValuePair.java     |   61 +
 .../freemarker/core/util/_LocaleUtil.java       |   43 +
 .../core/util/_NullArgumentException.java       |   59 +
 .../freemarker/core/util/_NullWriter.java       |   90 +
 .../freemarker/core/util/_NumberUtil.java       |  228 +
 .../freemarker/core/util/_ObjectHolder.java     |   55 +
 .../freemarker/core/util/_SecurityUtil.java     |   87 +
 .../freemarker/core/util/_SortedArraySet.java   |   80 +
 .../freemarker/core/util/_StringUtil.java       | 1675 +++++++
 .../core/util/_UnmodifiableCompositeSet.java    |   98 +
 .../freemarker/core/util/_UnmodifiableSet.java  |   47 +
 .../apache/freemarker/core/util/package.html    |   25 +
 .../InvalidFormatParametersException.java       |   37 +
 .../InvalidFormatStringException.java           |   37 +
 .../ParsingNotSupportedException.java           |   37 +
 .../core/valueformat/TemplateDateFormat.java    |  110 +
 .../valueformat/TemplateDateFormatFactory.java  |   95 +
 .../core/valueformat/TemplateFormatUtil.java    |   77 +
 .../core/valueformat/TemplateNumberFormat.java  |   93 +
 .../TemplateNumberFormatFactory.java            |   67 +
 .../core/valueformat/TemplateValueFormat.java   |   42 +
 .../TemplateValueFormatException.java           |   37 +
 .../valueformat/TemplateValueFormatFactory.java |   28 +
 .../UndefinedCustomFormatException.java         |   34 +
 .../UnformattableValueException.java            |   41 +
 ...nDateTypeFormattingUnsupportedException.java |   36 +
 ...nownDateTypeParsingUnsupportedException.java |   37 +
 .../valueformat/UnparsableValueException.java   |   38 +
 ...AliasTargetTemplateValueFormatException.java |   38 +
 .../impl/AliasTemplateDateFormatFactory.java    |   97 +
 .../impl/AliasTemplateNumberFormatFactory.java  |   96 +
 .../impl/ExtendedDecimalFormatParser.java       |  530 +++
 .../impl/ISOLikeTemplateDateFormat.java         |  270 ++
 .../impl/ISOLikeTemplateDateFormatFactory.java  |   57 +
 .../valueformat/impl/ISOTemplateDateFormat.java |   90 +
 .../impl/ISOTemplateDateFormatFactory.java      |   56 +
 .../impl/JavaTemplateDateFormat.java            |   75 +
 .../impl/JavaTemplateDateFormatFactory.java     |  187 +
 .../impl/JavaTemplateNumberFormat.java          |   64 +
 .../impl/JavaTemplateNumberFormatFactory.java   |  133 +
 .../valueformat/impl/XSTemplateDateFormat.java  |   94 +
 .../impl/XSTemplateDateFormatFactory.java       |   51 +
 .../core/valueformat/impl/package.html          |   26 +
 .../freemarker/core/valueformat/package.html    |   25 +
 .../java/org/apache/freemarker/dom/AtAtKey.java |   58 +
 .../freemarker/dom/AttributeNodeModel.java      |   69 +
 .../freemarker/dom/CharacterDataNodeModel.java  |   46 +
 .../apache/freemarker/dom/DocumentModel.java    |   76 +
 .../freemarker/dom/DocumentTypeModel.java       |   56 +
 .../java/org/apache/freemarker/dom/DomLog.java  |   32 +
 .../apache/freemarker/dom/DomStringUtil.java    |   67 +
 .../org/apache/freemarker/dom/ElementModel.java |  234 +
 .../freemarker/dom/JaxenXPathSupport.java       |  243 +
 .../apache/freemarker/dom/NodeListModel.java    |  219 +
 .../org/apache/freemarker/dom/NodeModel.java    |  613 +++
 .../apache/freemarker/dom/NodeOutputter.java    |  258 ++
 .../dom/NodeQueryResultItemObjectWrapper.java   |   92 +
 .../org/apache/freemarker/dom/PINodeModel.java  |   45 +
 .../dom/SunInternalXalanXPathSupport.java       |  163 +
 .../org/apache/freemarker/dom/XPathSupport.java |   30 +
 .../freemarker/dom/XalanXPathSupport.java       |  163 +
 .../java/org/apache/freemarker/dom/package.html |   30 +
 freemarker-core/src/main/javacc/FTL.jj          | 4132 ++++++++++++++++++
 .../adhoc/IdentifierCharGenerator.java          |  546 +++
 .../main/misc/overloadedNumberRules/README.txt  |   34 +
 .../main/misc/overloadedNumberRules/config.fmpp |   73 +
 .../misc/overloadedNumberRules/generator.ftl    |   80 +
 .../main/misc/overloadedNumberRules/prices.ods  |  Bin 0 -> 17855 bytes
 .../src/main/resources/META-INF/DISCLAIMER      |    8 +
 .../src/main/resources/META-INF/LICENSE         |  202 +
 .../core/model/impl/unsafeMethods.properties    |   98 +
 .../apache/freemarker/core/version.properties   |  100 +
 .../src/manual/en_US/FM3-CHANGE-LOG.txt         |  226 +
 freemarker-core/src/manual/en_US/book.xml       |   82 +
 .../manual/en_US/docgen-help/editors-readme.txt |  130 +
 .../en_US/docgen-misc/copyrightComment.txt      |   16 +
 .../en_US/docgen-misc/googleAnalytics.html      |   14 +
 .../figures/model2sketch_with_alpha.png         |  Bin 0 -> 61463 bytes
 .../figures/odg-convert-howto.txt               |   43 +
 .../en_US/docgen-originals/figures/overview.odg |  Bin 0 -> 11939 bytes
 .../figures/tree_with_alpha.png                 |  Bin 0 -> 10304 bytes
 freemarker-core/src/manual/en_US/docgen.cjson   |  132 +
 freemarker-core/src/manual/en_US/favicon.png    |  Bin 0 -> 1291 bytes
 .../src/manual/en_US/figures/model2sketch.png   |  Bin 0 -> 21425 bytes
 .../src/manual/en_US/figures/overview.png       |  Bin 0 -> 11837 bytes
 .../src/manual/en_US/figures/tree.png           |  Bin 0 -> 4699 bytes
 freemarker-core/src/manual/en_US/logo.png       |  Bin 0 -> 10134 bytes
 freemarker-core/src/manual/zh_CN/book.xml       |   82 +
 .../src/manual/zh_CN/docgen-help/README         |    2 +
 .../zh_CN/docgen-misc/googleAnalytics.html      |   14 +
 .../zh_CN/docgen-originals/figures/README       |    2 +
 freemarker-core/src/manual/zh_CN/docgen.cjson   |  130 +
 freemarker-core/src/manual/zh_CN/favicon.png    |  Bin 0 -> 1291 bytes
 .../src/manual/zh_CN/figures/model2sketch.png   |  Bin 0 -> 21425 bytes
 .../src/manual/zh_CN/figures/overview.png       |  Bin 0 -> 11837 bytes
 .../src/manual/zh_CN/figures/tree.png           |  Bin 0 -> 4699 bytes
 freemarker-core/src/manual/zh_CN/logo.png       |  Bin 0 -> 10134 bytes
 .../core/ASTBasedErrorMessagesTest.java         |   74 +
 .../org/apache/freemarker/core/ASTPrinter.java  |  438 ++
 .../org/apache/freemarker/core/ASTTest.java     |  103 +
 .../core/ActualNamingConvetionTest.java         |   66 +
 .../freemarker/core/ActualTagSyntaxTest.java    |   68 +
 .../freemarker/core/BreakPlacementTest.java     |   56 +
 .../apache/freemarker/core/CamelCaseTest.java   |  486 ++
 .../freemarker/core/CanonicalFormTest.java      |   68 +
 .../freemarker/core/CoercionToTextualTest.java  |  149 +
 .../freemarker/core/ConfigurableTest.java       |  176 +
 .../freemarker/core/ConfigurationTest.java      | 1486 +++++++
 .../freemarker/core/CoreLocaleUtilsTest.java    |   73 +
 .../freemarker/core/CustomAttributeTest.java    |  163 +
 .../apache/freemarker/core/DateFormatTest.java  |  464 ++
 .../freemarker/core/DirectiveCallPlaceTest.java |  249 ++
 .../freemarker/core/EncodingOverrideTest.java   |   62 +
 .../EnvironmentGetTemplateVariantsTest.java     |  214 +
 .../apache/freemarker/core/ExceptionTest.java   |  115 +
 .../apache/freemarker/core/GetSourceTest.java   |   52 +
 .../freemarker/core/HeaderParsingTest.java      |   60 +
 .../IncludeAndImportConfigurableLayersTest.java |  354 ++
 .../freemarker/core/IncludeAndImportTest.java   |  270 ++
 .../freemarker/core/IncudeFromNamelessTest.java |   58 +
 .../core/InterpretAndEvalTemplateNameTest.java  |   70 +
 .../core/InterpretSettingInheritanceTest.java   |  104 +
 .../freemarker/core/IteratorIssuesTest.java     |   64 +
 .../core/JavaCCExceptionAsEOFFixTest.java       |  126 +
 .../apache/freemarker/core/ListErrorsTest.java  |  130 +
 .../freemarker/core/MiscErrorMessagesTest.java  |   48 +
 .../core/MistakenlyPublicImportAPIsTest.java    |  104 +
 .../core/MistakenlyPublicMacroAPIsTest.java     |   88 +
 .../core/NewBiObjectWrapperRestrictionTest.java |   50 +
 .../core/ObjectBuilderSettingsTest.java         | 1499 +++++++
 .../core/OptInTemplateClassResolverTest.java    |  230 +
 .../freemarker/core/OutputFormatTest.java       | 1068 +++++
 .../ParseTimeParameterBIErrorMessagesTest.java  |   46 +
 .../core/ParsingErrorMessagesTest.java          |  116 +
 .../core/RestrictedObjectWrapperTest.java       |   72 +
 .../core/RestrictedObjetWrapperTest.java        |  112 +
 .../apache/freemarker/core/SQLTimeZoneTest.java |  371 ++
 .../freemarker/core/SettingDirectiveTest.java   |   40 +
 .../freemarker/core/SpecialVariableTest.java    |  114 +
 .../core/StringLiteralInterpolationTest.java    |  135 +
 .../org/apache/freemarker/core/TabSizeTest.java |   91 +
 .../core/TagSyntaxVariationsTest.java           |  186 +
 .../core/TemplateConfigurationTest.java         |  909 ++++
 ...gurationWithDefaultTemplateResolverTest.java |  267 ++
 .../core/TemplateConstructorsTest.java          |  113 +
 .../core/TemplateGetEncodingTest.java           |   64 +
 .../core/TemplateLookupStrategyTest.java        |  669 +++
 .../core/TemplateNameSpecialVariablesTest.java  |  159 +
 .../core/TemplateNotFoundMessageTest.java       |  207 +
 .../core/TheadInterruptingSupportTest.java      |  163 +
 .../freemarker/core/TypeErrorMessagesTest.java  |  105 +
 .../freemarker/core/UnclosedCommentTest.java    |   41 +
 .../org/apache/freemarker/core/VersionTest.java |  227 +
 .../core/WhitespaceStrippingTest.java           |   63 +
 .../freemarker/core/XHTMLOutputFormatTest.java  |   59 +
 .../freemarker/core/XMLOutputFormatTest.java    |   59 +
 .../impl/AbstractParallelIntrospectionTest.java |  126 +
 .../model/impl/AlphabeticalMethodSorter.java    |   45 +
 .../CommonSupertypeForUnwrappingHintTest.java   |  129 +
 .../model/impl/DefaultObjectWrapperDesc.java    |   31 +
 .../model/impl/DefaultObjectWrapperInc.java     |   31 +
 ...jectWrapperModelFactoryRegistrationTest.java |   63 +
 .../DefaultObjectWrapperSingletonsTest.java     |  675 +++
 .../model/impl/DefaultObjectWrapperTest.java    |  901 ++++
 .../core/model/impl/EnumModelsTest.java         |   85 +
 .../core/model/impl/ErrorMessagesTest.java      |  170 +
 .../impl/FineTuneMethodAppearanceTest.java      |   65 +
 .../GetlessMethodsAsPropertyGettersRule.java    |   67 +
 .../core/model/impl/IsApplicableTest.java       |  171 +
 .../impl/IsMoreSpecificParameterTypeTest.java   |   98 +
 .../Java7MembersOnlyDefaultObjectWrapper.java   |  101 +
 .../impl/ManyObjectsOfDifferentClasses.java     |  249 ++
 .../impl/ManyStaticsOfDifferentClasses.java     |  236 +
 .../model/impl/MiscNumericalOperationsTest.java |  111 +
 .../model/impl/ModelAPINewInstanceTest.java     |  134 +
 .../core/model/impl/ModelCacheTest.java         |   71 +
 .../model/impl/OverloadedNumberUtilTest.java    |  585 +++
 .../impl/ParameterListPreferabilityTest.java    |  445 ++
 .../impl/PrallelObjectIntrospectionTest.java    |   43 +
 .../impl/PrallelStaticIntrospectionTest.java    |   47 +
 .../core/model/impl/RationalNumber.java         |   90 +
 .../core/model/impl/StaticModelsTest.java       |   91 +
 .../core/model/impl/TypeFlagsTest.java          |  671 +++
 .../core/outputformat/_OutputFormatTestAPI.java |   35 +
 .../impl/CombinedMarkupOutputFormatTest.java    |  194 +
 .../outputformat/impl/HTMLOutputFormatTest.java |  187 +
 .../outputformat/impl/RTFOutputFormatTest.java  |  129 +
 .../DefaultTemplateResolverTest.java            |  365 ++
 .../FileTemplateLoaderTest.java                 |  122 +
 .../MultiTemplateLoaderTest.java                |   99 +
 .../TemplateConfigurationFactoryTest.java       |  203 +
 .../TemplateNameFormatTest.java                 |  330 ++
 .../TemplateSourceMatcherTest.java              |  188 +
 .../AppMetaTemplateDateFormatFactory.java       |  129 +
 .../BaseNTemplateNumberFormatFactory.java       |  128 +
 .../core/userpkg/CustomHTMLOutputFormat.java    |   72 +
 .../core/userpkg/CustomTemplateHTMLModel.java   |   34 +
 .../core/userpkg/DummyOutputFormat.java         |   65 +
 ...EpochMillisDivTemplateDateFormatFactory.java |  102 +
 .../EpochMillisTemplateDateFormatFactory.java   |   92 +
 .../HTMLISOTemplateDateFormatFactory.java       |  114 +
 .../userpkg/HexTemplateNumberFormatFactory.java |   77 +
 ...AndTZSensitiveTemplateDateFormatFactory.java |   97 +
 ...aleSensitiveTemplateNumberFormatFactory.java |   78 +
 .../core/userpkg/PackageVisibleAll.java         |   26 +
 .../userpkg/PackageVisibleAllWithBuilder.java   |   26 +
 .../PackageVisibleAllWithBuilderBuilder.java    |   28 +
 .../PackageVisibleWithPublicConstructor.java    |   27 +
 .../PrintfGTemplateNumberFormatFactory.java     |  138 +
 .../freemarker/core/userpkg/PublicAll.java      |   24 +
 .../userpkg/PublicWithMixedConstructors.java    |   38 +
 .../PublicWithPackageVisibleConstructor.java    |   26 +
 .../core/userpkg/SeldomEscapedOutputFormat.java |   71 +
 .../core/userpkg/TemplateDummyOutputModel.java  |   34 +
 .../TemplateSeldomEscapedOutputModel.java       |   34 +
 .../freemarker/core/util/DateUtilTest.java      | 1085 +++++
 .../freemarker/core/util/FTLUtilTest.java       |  117 +
 .../freemarker/core/util/NumberUtilTest.java    |  215 +
 .../freemarker/core/util/StringUtilTest.java    |  403 ++
 .../core/valueformat/NumberFormatTest.java      |  365 ++
 .../impl/ExtendedDecimalFormatTest.java         |  343 ++
 .../apache/freemarker/dom/DOMSiblingTest.java   |   99 +
 .../freemarker/dom/DOMSimplifiersTest.java      |  201 +
 .../java/org/apache/freemarker/dom/DOMTest.java |  159 +
 .../manualtest/AutoEscapingExample.java         |   72 +
 .../ConfigureOutputFormatExamples.java          |  105 +
 .../manualtest/CustomFormatsExample.java        |   84 +
 .../manualtest/GettingStartedExample.java       |   69 +
 .../apache/freemarker/manualtest/Product.java   |   49 +
 .../TemplateConfigurationExamples.java          |  191 +
 .../UnitAwareTemplateNumberFormatFactory.java   |   80 +
 .../UnitAwareTemplateNumberModel.java           |   43 +
 .../CopyrightCommentRemoverTemplateLoader.java  |  104 +
 .../test/MonitoredTemplateLoader.java           |  325 ++
 .../apache/freemarker/test/TemplateTest.java    |  341 ++
 .../test/TestConfigurationBuilder.java          |   92 +
 .../freemarker/test/hamcerst/Matchers.java      |   34 +
 .../hamcerst/StringContainsIgnoringCase.java    |   47 +
 .../org/apache/freemarker/test/package.html     |   28 +
 .../test/templatesuite/TemplateTestCase.java    |  515 +++
 .../test/templatesuite/TemplateTestSuite.java   |  298 ++
 .../templatesuite/models/AllTemplateModels.java |  128 +
 .../templatesuite/models/BeanTestClass.java     |   93 +
 .../templatesuite/models/BeanTestInterface.java |   25 +
 .../models/BeanTestSuperclass.java              |   30 +
 .../models/BooleanAndScalarModel.java           |   40 +
 .../models/BooleanAndStringTemplateModel.java   |   38 +
 .../test/templatesuite/models/BooleanHash1.java |   58 +
 .../test/templatesuite/models/BooleanHash2.java |   50 +
 .../test/templatesuite/models/BooleanList1.java |   62 +
 .../test/templatesuite/models/BooleanList2.java |   53 +
 .../models/BooleanVsStringMethods.java          |   40 +
 .../templatesuite/models/EnumTestClass.java     |   34 +
 .../templatesuite/models/ExceptionModel.java    |   39 +
 .../models/HashAndScalarModel.java              |   84 +
 .../templatesuite/models/JavaObjectInfo.java    |   35 +
 .../test/templatesuite/models/Listables.java    |  185 +
 .../test/templatesuite/models/MultiModel1.java  |  116 +
 .../test/templatesuite/models/MultiModel2.java  |   63 +
 .../test/templatesuite/models/MultiModel3.java  |   69 +
 .../test/templatesuite/models/MultiModel4.java  |   77 +
 .../test/templatesuite/models/MultiModel5.java  |   81 +
 .../test/templatesuite/models/NewTestModel.java |   52 +
 .../templatesuite/models/NewTestModel2.java     |   52 +
 .../models/NumberAndStringModel.java            |   47 +
 .../models/OverloadedConstructor.java           |   46 +
 .../templatesuite/models/OverloadedMethods.java |  191 +
 .../models/OverloadedMethods2.java              | 1110 +++++
 .../templatesuite/models/SimpleTestMethod.java  |   49 +
 .../models/TransformHashWrapper.java            |   79 +
 .../models/TransformMethodWrapper1.java         |   49 +
 .../models/TransformMethodWrapper2.java         |   64 +
 .../templatesuite/models/TransformModel1.java   |  175 +
 .../templatesuite/models/VarArgTestModel.java   |   63 +
 .../freemarker/test/templatesuite/package.html  |   42 +
 .../freemarker/test/util/AssertDirective.java   |   73 +
 .../test/util/AssertEqualsDirective.java        |   91 +
 .../test/util/AssertFailsDirective.java         |  152 +
 .../AssertationFailedInTemplateException.java   |   46 +
 .../test/util/BadParameterTypeException.java    |   60 +
 .../freemarker/test/util/CoreTestUtil.java      |   19 +
 .../test/util/EntirelyCustomObjectWrapper.java  |   91 +
 .../freemarker/test/util/FileTestCase.java      |  217 +
 .../util/MissingRequiredParameterException.java |   51 +
 .../freemarker/test/util/NoOutputDirective.java |   50 +
 .../test/util/ParameterException.java           |   54 +
 .../SimpleMapAndCollectionObjectWrapper.java    |   60 +
 .../util/UnsupportedParameterException.java     |   50 +
 .../apache/freemarker/test/util/XMLLoader.java  |  138 +
 .../org/apache/freemarker/core/ast-1.ast        |  187 +
 .../org/apache/freemarker/core/ast-1.ftl        |   29 +
 .../apache/freemarker/core/ast-assignments.ast  |  172 +
 .../apache/freemarker/core/ast-assignments.ftl  |   29 +
 .../org/apache/freemarker/core/ast-builtins.ast |   59 +
 .../org/apache/freemarker/core/ast-builtins.ftl |   23 +
 .../apache/freemarker/core/ast-locations.ast    |  155 +
 .../apache/freemarker/core/ast-locations.ftl    |   36 +
 .../core/ast-mixedcontentsimplifications.ast    |   38 +
 .../core/ast-mixedcontentsimplifications.ftl    |   26 +
 .../core/ast-multipleignoredchildren.ast        |   30 +
 .../core/ast-multipleignoredchildren.ftl        |   33 +
 .../core/ast-nestedignoredchildren.ast          |   20 +
 .../core/ast-nestedignoredchildren.ftl          |   19 +
 .../org/apache/freemarker/core/ast-range.ast    |  281 ++
 .../org/apache/freemarker/core/ast-range.ftl    |   47 +
 .../freemarker/core/ast-strlitinterpolation.ast |   82 +
 .../freemarker/core/ast-strlitinterpolation.ftl |   25 +
 .../freemarker/core/ast-whitespacestripping.ast |   70 +
 .../freemarker/core/ast-whitespacestripping.ftl |   40 +
 .../apache/freemarker/core/cano-assignments.ftl |   35 +
 .../freemarker/core/cano-assignments.ftl.out    |   34 +
 .../apache/freemarker/core/cano-builtins.ftl    |   23 +
 .../freemarker/core/cano-builtins.ftl.out       |   23 +
 .../core/cano-identifier-escaping.ftl           |   76 +
 .../core/cano-identifier-escaping.ftl.out       |   44 +
 .../org/apache/freemarker/core/cano-macros.ftl  |   29 +
 .../apache/freemarker/core/cano-macros.ftl.out  |   28 +
 .../core/cano-strlitinterpolation.ftl           |   19 +
 .../core/cano-strlitinterpolation.ftl.out       |   19 +
 .../core/encodingOverride-ISO-8859-1.ftl        |   20 +
 .../freemarker/core/encodingOverride-UTF-8.ftl  |   20 +
 .../freemarker/core/templateresolver/test.ftl   |   19 +
 .../org/apache/freemarker/core/toCache1.ftl     |   19 +
 .../org/apache/freemarker/core/toCache2.ftl     |   19 +
 .../apache/freemarker/dom/DOMSiblingTest.xml    |   31 +
 .../manualtest/AutoEscapingExample-capture.ftlh |   21 +
 .../AutoEscapingExample-capture.ftlh.out        |   20 +
 .../manualtest/AutoEscapingExample-convert.ftlh |   27 +
 .../AutoEscapingExample-convert.ftlh.out        |   25 +
 .../manualtest/AutoEscapingExample-convert2.ftl |   25 +
 .../AutoEscapingExample-convert2.ftl.out        |   21 +
 .../manualtest/AutoEscapingExample-infoBox.ftlh |   26 +
 .../AutoEscapingExample-infoBox.ftlh.out        |   25 +
 .../manualtest/AutoEscapingExample-markup.ftlh  |   28 +
 .../AutoEscapingExample-markup.ftlh.out         |   26 +
 .../AutoEscapingExample-stringConcat.ftlh       |   19 +
 .../AutoEscapingExample-stringConcat.ftlh.out   |   19 +
 .../AutoEscapingExample-stringLiteral.ftlh      |   21 +
 .../AutoEscapingExample-stringLiteral.ftlh.out  |   20 +
 .../AutoEscapingExample-stringLiteral2.ftlh     |   25 +
 .../AutoEscapingExample-stringLiteral2.ftlh.out |   21 +
 .../ConfigureOutputFormatExamples1.properties   |   21 +
 .../ConfigureOutputFormatExamples2.properties   |   31 +
 .../manualtest/CustomFormatsExample-alias1.ftlh |   22 +
 .../CustomFormatsExample-alias1.ftlh.out        |   22 +
 .../manualtest/CustomFormatsExample-alias2.ftlh |   19 +
 .../CustomFormatsExample-alias2.ftlh.out        |   19 +
 .../CustomFormatsExample-modelAware.ftlh        |   20 +
 .../CustomFormatsExample-modelAware.ftlh.out    |   20 +
 .../TemplateConfigurationExamples1.properties   |   25 +
 .../TemplateConfigurationExamples2.properties   |   32 +
 .../TemplateConfigurationExamples3.properties   |   47 +
 .../org/apache/freemarker/manualtest/test.ftlh  |   28 +
 .../org/apache/freemarker/test/servlet/web.xml  |  101 +
 .../test/templatesuite/expected/arithmetic.txt  |   46 +
 .../expected/boolean-formatting.txt             |   31 +
 .../test/templatesuite/expected/boolean.txt     |  102 +
 .../expected/charset-in-header.txt              |   26 +
 .../test/templatesuite/expected/comment.txt     |   34 +
 .../test/templatesuite/expected/comparisons.txt |   93 +
 .../test/templatesuite/expected/compress.txt    |   40 +
 .../templatesuite/expected/dateformat-java.txt  |   55 +
 .../expected/default-object-wrapper.txt         |   55 +
 .../templatesuite/expected/default-xmlns.txt    |   25 +
 .../test/templatesuite/expected/default.txt     |   26 +
 .../expected/encoding-builtins.txt              |   44 +
 .../test/templatesuite/expected/escapes.txt     |   49 +
 .../test/templatesuite/expected/exception.txt   |   43 +
 .../test/templatesuite/expected/exception2.txt  |   47 +
 .../test/templatesuite/expected/exception3.txt  |   21 +
 .../test/templatesuite/expected/exthash.txt     |   76 +
 .../test/templatesuite/expected/hashconcat.txt  |  138 +
 .../test/templatesuite/expected/hashliteral.txt |   74 +
 .../test/templatesuite/expected/helloworld.txt  |   31 +
 .../expected/identifier-escaping.txt            |   57 +
 .../expected/identifier-non-ascii.txt           |   19 +
 .../test/templatesuite/expected/if.txt          |  104 +
 .../test/templatesuite/expected/import.txt      |   40 +
 .../test/templatesuite/expected/include.txt     |   67 +
 .../test/templatesuite/expected/include2.txt    |   28 +
 .../test/templatesuite/expected/interpret.txt   |   23 +
 .../test/templatesuite/expected/iterators.txt   |   84 +
 .../templatesuite/expected/lastcharacter.txt    |   31 +
 .../test/templatesuite/expected/list-bis.txt    |   51 +
 .../test/templatesuite/expected/list.txt        |   51 +
 .../test/templatesuite/expected/list2.txt       |  211 +
 .../test/templatesuite/expected/list3.txt       |   57 +
 .../test/templatesuite/expected/listhash.txt    |  157 +
 .../templatesuite/expected/listhashliteral.txt  |   36 +
 .../test/templatesuite/expected/listliteral.txt |   75 +
 .../templatesuite/expected/localization.txt     |   32 +
 .../test/templatesuite/expected/logging.txt     |   27 +
 .../templatesuite/expected/loopvariable.txt     |   54 +
 .../templatesuite/expected/macros-return.txt    |   23 +
 .../test/templatesuite/expected/macros.txt      |   67 +
 .../test/templatesuite/expected/macros2.txt     |   22 +
 .../test/templatesuite/expected/multimodels.txt |   93 +
 .../test/templatesuite/expected/nested.txt      |   25 +
 .../expected/new-allowsnothing.txt              |   19 +
 .../expected/new-defaultresolver.txt            |   19 +
 .../test/templatesuite/expected/new-optin.txt   |   32 +
 .../test/templatesuite/expected/newlines1.txt   |   29 +
 .../test/templatesuite/expected/newlines2.txt   |   30 +
 .../test/templatesuite/expected/noparse.txt     |   54 +
 .../templatesuite/expected/number-format.txt    |   33 +
 .../templatesuite/expected/number-literal.txt   |   79 +
 .../templatesuite/expected/number-to-date.txt   |   31 +
 .../templatesuite/expected/numerical-cast.txt   |  462 ++
 .../templatesuite/expected/output-encoding1.txt |   27 +
 .../templatesuite/expected/output-encoding2.txt |  Bin 0 -> 1972 bytes
 .../templatesuite/expected/output-encoding3.txt |   26 +
 .../test/templatesuite/expected/precedence.txt  |   48 +
 .../test/templatesuite/expected/recover.txt     |   26 +
 .../test/templatesuite/expected/root.txt        |   44 +
 .../expected/sequence-builtins.txt              |  404 ++
 .../test/templatesuite/expected/specialvars.txt |   25 +
 .../string-builtins-regexps-matches.txt         |   99 +
 .../expected/string-builtins-regexps.txt        |  112 +
 .../templatesuite/expected/string-builtins1.txt |  112 +
 .../templatesuite/expected/string-builtins2.txt |  135 +
 .../templatesuite/expected/stringbimethods.txt  |   29 +
 .../templatesuite/expected/stringliteral.txt    |  Bin 0 -> 1550 bytes
 .../test/templatesuite/expected/switch.txt      |   80 +
 .../test/templatesuite/expected/transforms.txt  |   68 +
 .../templatesuite/expected/type-builtins.txt    |   33 +
 .../test/templatesuite/expected/var-layers.txt  |   37 +
 .../test/templatesuite/expected/varargs.txt     |   44 +
 .../test/templatesuite/expected/variables.txt   |   62 +
 .../templatesuite/expected/whitespace-trim.txt  |   60 +
 .../templatesuite/expected/wstrip-in-header.txt |   23 +
 .../test/templatesuite/expected/wstripping.txt  |   39 +
 .../templatesuite/expected/xml-fragment.txt     |   25 +
 .../expected/xml-ns_prefix-scope.txt            |   29 +
 .../test/templatesuite/expected/xml.txt         |   65 +
 .../test/templatesuite/expected/xmlns1.txt      |   63 +
 .../test/templatesuite/expected/xmlns3.txt      |   47 +
 .../test/templatesuite/expected/xmlns4.txt      |   47 +
 .../test/templatesuite/expected/xmlns5.txt      |   26 +
 .../models/BeansTestResources.properties        |   19 +
 .../test/templatesuite/models/defaultxmlns1.xml |   24 +
 .../models/xml-ns_prefix-scope.xml              |   26 +
 .../test/templatesuite/models/xml.xml           |   31 +
 .../test/templatesuite/models/xmlfragment.xml   |   19 +
 .../test/templatesuite/models/xmlns.xml         |   32 +
 .../test/templatesuite/models/xmlns2.xml        |   32 +
 .../test/templatesuite/models/xmlns3.xml        |   32 +
 .../templatesuite/templates/api-builtins.ftl    |   40 +
 .../test/templatesuite/templates/arithmetic.ftl |   50 +
 .../templatesuite/templates/assignments.ftl     |  108 +
 .../templates/boolean-formatting.ftl            |   82 +
 .../test/templatesuite/templates/boolean.ftl    |  142 +
 .../templates/charset-in-header.ftl             |   27 +
 .../templates/charset-in-header_inc1.ftl        |   20 +
 .../templates/charset-in-header_inc2.ftl        |   19 +
 .../test/templatesuite/templates/comment.ftl    |   50 +
 .../templatesuite/templates/comparisons.ftl     |  218 +
 .../test/templatesuite/templates/compress.ftl   |   59 +
 .../templates/date-type-builtins.ftl            |   47 +
 .../templates/dateformat-iso-bi.ftl             |  163 +
 .../templates/dateformat-iso-like.ftl           |  155 +
 .../templatesuite/templates/dateformat-java.ftl |   71 +
 .../templatesuite/templates/dateparsing.ftl     |   84 +
 .../templates/default-object-wrapper.ftl        |   59 +
 .../templatesuite/templates/default-xmlns.ftl   |   28 +
 .../test/templatesuite/templates/default.ftl    |   34 +
 .../templates/encoding-builtins.ftl             |   52 +
 .../test/templatesuite/templates/escapes.ftl    |   79 +
 .../test/templatesuite/templates/exception.ftl  |   31 +
 .../test/templatesuite/templates/exception2.ftl |   31 +
 .../test/templatesuite/templates/exception3.ftl |   31 +
 .../templates/existence-operators.ftl           |  141 +
 .../test/templatesuite/templates/hashconcat.ftl |   60 +
 .../templatesuite/templates/hashliteral.ftl     |  100 +
 .../test/templatesuite/templates/helloworld.ftl |   30 +
 .../templates/identifier-escaping.ftl           |   81 +
 .../templates/identifier-non-ascii.ftl          |   21 +
 .../test/templatesuite/templates/if.ftl         |  109 +
 .../test/templatesuite/templates/import.ftl     |   45 +
 .../test/templatesuite/templates/import_lib.ftl |   31 +
 .../test/templatesuite/templates/include.ftl    |   47 +
 .../templates/include2-included.ftl             |   19 +
 .../test/templatesuite/templates/include2.ftl   |   32 +
 .../test/templatesuite/templates/included.ftl   |   30 +
 .../test/templatesuite/templates/interpret.ftl  |   25 +
 .../test/templatesuite/templates/iterators.ftl  |   71 +
 .../templatesuite/templates/lastcharacter.ftl   |   31 +
 .../test/templatesuite/templates/list-bis.ftl   |   48 +
 .../test/templatesuite/templates/list.ftl       |   44 +
 .../test/templatesuite/templates/list2.ftl      |   90 +
 .../test/templatesuite/templates/list3.ftl      |   70 +
 .../test/templatesuite/templates/listhash.ftl   |   70 +
 .../templatesuite/templates/listhashliteral.ftl |   35 +
 .../templatesuite/templates/listliteral.ftl     |   84 +
 .../templatesuite/templates/localization.ftl    |   32 +
 .../templatesuite/templates/localization_en.ftl |   32 +
 .../templates/localization_en_AU.ftl            |   32 +
 .../test/templatesuite/templates/logging.ftl    |   42 +
 .../templatesuite/templates/loopvariable.ftl    |   49 +
 .../templatesuite/templates/macros-return.ftl   |   34 +
 .../test/templatesuite/templates/macros.ftl     |  101 +
 .../test/templatesuite/templates/macros2.ftl    |   35 +
 .../templatesuite/templates/multimodels.ftl     |   84 +
 .../test/templatesuite/templates/nested.ftl     |   29 +
 .../templatesuite/templates/nestedinclude.ftl   |   21 +
 .../templates/new-defaultresolver.ftl           |   23 +
 .../test/templatesuite/templates/new-optin.ftl  |   30 +
 .../test/templatesuite/templates/newlines1.ftl  |   29 +
 .../test/templatesuite/templates/newlines2.ftl  |   33 +
 .../test/templatesuite/templates/noparse.ftl    |   62 +
 .../templatesuite/templates/number-format.ftl   |   42 +
 .../templatesuite/templates/number-literal.ftl  |  133 +
 .../templates/number-math-builtins.ftl          |   78 +
 .../templatesuite/templates/number-to-date.ftl  |   35 +
 .../templatesuite/templates/numerical-cast.ftl  |   82 +
 .../templates/output-encoding1.ftl              |   30 +
 .../templates/output-encoding2.ftl              |   28 +
 .../templates/output-encoding3.ftl              |   28 +
 .../templates/overloaded-methods.ftl            |  411 ++
 .../test/templatesuite/templates/precedence.ftl |   61 +
 .../templatesuite/templates/range-common.ftl    |  314 ++
 .../test/templatesuite/templates/range.ftl      |   50 +
 .../test/templatesuite/templates/recover.ftl    |   47 +
 .../test/templatesuite/templates/root.ftl       |   47 +
 .../templates/sequence-builtins.ftl             |  360 ++
 .../test/templatesuite/templates/setting.ftl    |   53 +
 .../templates/simplehash-char-key.ftl           |   44 +
 .../templatesuite/templates/specialvars.ftl     |   38 +
 .../templates/string-builtin-coercion.ftl       |   34 +
 .../string-builtins-regexps-matches.ftl         |  118 +
 .../templates/string-builtins-regexps.ftl       |  136 +
 .../templates/string-builtins1.ftl              |  129 +
 .../templates/string-builtins2.ftl              |  135 +
 .../templates/string-builtins3.ftl              |  225 +
 .../templatesuite/templates/stringbimethods.ftl |   36 +
 .../templatesuite/templates/stringliteral.ftl   |   69 +
 .../templates/subdir/include-subdir.ftl         |   27 +
 .../templates/subdir/include-subdir2.ftl        |   19 +
 .../templates/subdir/new-optin-2.ftl            |   24 +
 .../templates/subdir/new-optin.ftl              |   26 +
 .../templates/subdir/subsub/new-optin.ftl       |   24 +
 .../templatesuite/templates/switch-builtin.ftl  |   54 +
 .../test/templatesuite/templates/switch.ftl     |  139 +
 .../templatesuite/templates/then-builtin.ftl    |   53 +
 .../test/templatesuite/templates/transforms.ftl |  100 +
 .../templatesuite/templates/type-builtins.ftl   |   44 +
 .../test/templatesuite/templates/undefined.ftl  |   19 +
 .../test/templatesuite/templates/url.ftl        |   24 +
 .../test/templatesuite/templates/var-layers.ftl |   39 +
 .../test/templatesuite/templates/varargs.ftl    |   45 +
 .../test/templatesuite/templates/variables.ftl  |   70 +
 .../templatesuite/templates/varlayers_lib.ftl   |   28 +
 .../templatesuite/templates/whitespace-trim.ftl |  102 +
 .../templates/wsstripinheader_inc.ftl           |   22 +
 .../templates/wstrip-in-header.ftl              |   26 +
 .../templatesuite/templates/xml-fragment.ftl    |   26 +
 .../templates/xml-ns_prefix-scope-lib.ftl       |   23 +
 .../templates/xml-ns_prefix-scope-main.ftl      |   36 +
 .../test/templatesuite/templates/xml.ftl        |   47 +
 .../test/templatesuite/templates/xmlns1.ftl     |   53 +
 .../test/templatesuite/templates/xmlns3.ftl     |   70 +
 .../test/templatesuite/templates/xmlns4.ftl     |   70 +
 .../test/templatesuite/templates/xmlns5.ftl     |   28 +
 .../freemarker/test/templatesuite/testcases.xml |  211 +
 freemarker-servlet/build.gradle                 |   80 +
 .../servlet/AllHttpScopesHashModel.java         |  114 +
 .../freemarker/servlet/FreemarkerServlet.java   | 1611 +++++++
 .../FreemarkerServletConfigurationBuilder.java  |   79 +
 .../servlet/HttpRequestHashModel.java           |  108 +
 .../servlet/HttpRequestParametersHashModel.java |  104 +
 .../servlet/HttpSessionHashModel.java           |  113 +
 .../apache/freemarker/servlet/IncludePage.java  |  254 ++
 .../freemarker/servlet/InitParamParser.java     |  264 ++
 .../servlet/ServletContextHashModel.java        |   62 +
 .../servlet/WebAppTemplateLoader.java           |  301 ++
 .../apache/freemarker/servlet/_ServletLogs.java |   34 +
 .../jsp/CustomTagAndELFunctionCombiner.java     |  202 +
 .../freemarker/servlet/jsp/EventForwarding.java |  200 +
 .../jsp/FreeMarkerJspApplicationContext.java    |  165 +
 .../servlet/jsp/FreeMarkerJspFactory.java       |   63 +
 .../servlet/jsp/FreeMarkerJspFactory21.java     |   51 +
 .../servlet/jsp/FreeMarkerPageContext.java      |  459 ++
 .../freemarker/servlet/jsp/JspTagModelBase.java |  162 +
 .../servlet/jsp/JspWriterAdapter.java           |  188 +
 .../servlet/jsp/PageContextFactory.java         |   66 +
 .../servlet/jsp/SimpleTagDirectiveModel.java    |  111 +
 .../servlet/jsp/TagTransformModel.java          |  419 ++
 .../freemarker/servlet/jsp/TaglibFactory.java   | 2015 +++++++++
 .../servlet/jsp/TaglibMethodUtil.java           |  117 +
 .../servlet/jsp/_FreeMarkerPageContext21.java   |  122 +
 .../apache/freemarker/servlet/jsp/package.html  |   26 +
 .../org/apache/freemarker/servlet/package.html  |   26 +
 .../src/main/resources/META-INF/DISCLAIMER      |    8 +
 .../src/main/resources/META-INF/LICENSE         |  202 +
 .../servlet/DummyMockServletContext.java        |  157 +
 .../servlet/FreemarkerServletTest.java          |  628 +++
 .../freemarker/servlet/InitParamParserTest.java |  163 +
 .../servlet/WebAppTemplateLoaderTest.java       |   48 +
 .../servlet/jsp/JspTestFreemarkerServlet.java   |   51 +
 ...estFreemarkerServletWithDefaultOverride.java |   47 +
 .../servlet/jsp/RealServletContainertTest.java  |  506 +++
 .../freemarker/servlet/jsp/TLDParsingTest.java  |  137 +
 .../servlet/jsp/TaglibMethodUtilTest.java       |  108 +
 .../jsp/taglibmembers/AttributeAccessorTag.java |   68 +
 .../jsp/taglibmembers/AttributeInfoTag.java     |   59 +
 .../jsp/taglibmembers/EnclosingClass.java       |   32 +
 .../servlet/jsp/taglibmembers/GetAndSetTag.java |   66 +
 .../jsp/taglibmembers/TestFunctions.java        |   79 +
 .../jsp/taglibmembers/TestSimpleTag.java        |   54 +
 .../jsp/taglibmembers/TestSimpleTag2.java       |   32 +
 .../jsp/taglibmembers/TestSimpleTag3.java       |   32 +
 .../servlet/jsp/taglibmembers/TestTag.java      |  100 +
 .../servlet/jsp/taglibmembers/TestTag2.java     |   50 +
 .../servlet/jsp/taglibmembers/TestTag3.java     |   50 +
 .../config/WebappLocalFreemarkerServlet.java    |   25 +
 .../servlet/test/DefaultModel2TesterAction.java |   92 +
 .../freemarker/servlet/test/Model2Action.java   |   37 +
 .../servlet/test/Model2TesterServlet.java       |  139 +
 .../freemarker/servlet/test/WebAppTestCase.java |  360 ++
 .../src/test/resources/META-INF/malformed.tld   |   31 +
 .../tldDiscovery MetaInfTldSources-1.tld        |   31 +
 .../freemarker/servlet/jsp/TLDParsingTest.tld   |   89 +
 .../servlet/jsp/templates/classpath-test.ftl    |   19 +
 .../jsp/tldDiscovery-ClassPathTlds-1.tld        |   31 +
 .../jsp/tldDiscovery-ClassPathTlds-2.tld        |   31 +
 .../servlet/jsp/webapps/basic/CONTENTS.txt      |   36 +
 .../WEB-INF/el-function-tag-name-clash.tld      |   50 +
 .../jsp/webapps/basic/WEB-INF/el-functions.tld  |   84 +
 .../expected/attributes-modernModels.txt        |   73 +
 .../basic/WEB-INF/expected/attributes.txt       |   73 +
 .../basic/WEB-INF/expected/customTags1.txt      |  106 +
 .../servlet/jsp/webapps/basic/WEB-INF/test.tld  |   75 +
 .../servlet/jsp/webapps/basic/WEB-INF/web.xml   |  142 +
 .../servlet/jsp/webapps/basic/attributes.ftl    |   90 +
 .../jsp/webapps/basic/customELFunctions1.ftl    |   30 +
 .../jsp/webapps/basic/customELFunctions1.jsp    |   31 +
 .../servlet/jsp/webapps/basic/customTags1.ftl   |   59 +
 .../webapps/basic/elFunctionsTagNameClash.ftl   |   25 +
 .../webapps/basic/elFunctionsTagNameClash.jsp   |   26 +
 .../jsp/webapps/basic/trivial-jstl-@Ignore.ftl  |   48 +
 .../servlet/jsp/webapps/basic/trivial.ftl       |   37 +
 .../servlet/jsp/webapps/basic/trivial.jsp       |   45 +
 .../servlet/jsp/webapps/config/CONTENTS.txt     |   33 +
 .../webapps/config/WEB-INF/classes/sub/test.ftl |   19 +
 .../jsp/webapps/config/WEB-INF/classes/test.ftl |   19 +
 .../WEB-INF/lib/templates.jar/sub/test2.ftl     |   19 +
 .../webapps/config/WEB-INF/templates/test.ftl   |   19 +
 .../servlet/jsp/webapps/config/WEB-INF/web.xml  |  109 +
 .../servlet/jsp/webapps/config/test.ftl         |   19 +
 .../servlet/jsp/webapps/errors/CONTENTS.txt     |   28 +
 .../servlet/jsp/webapps/errors/WEB-INF/web.xml  |   92 +
 .../jsp/webapps/errors/failing-parsetime.ftlnv  |   20 +
 .../jsp/webapps/errors/failing-parsetime.jsp    |   19 +
 .../jsp/webapps/errors/failing-runtime.ftl      |   26 +
 .../jsp/webapps/errors/failing-runtime.jsp      |   23 +
 .../servlet/jsp/webapps/errors/not-failing.ftl  |   19 +
 .../jsp/webapps/multipleLoaders/CONTENTS.txt    |   24 +
 .../multipleLoaders/WEB-INF/templates/test.ftl  |   19 +
 .../jsp/webapps/multipleLoaders/WEB-INF/web.xml |   83 +
 .../jsp/webapps/tldDiscovery/CONTENTS.txt       |   37 +
 .../WEB-INF/expected/subdir/test-rel.txt        |   20 +
 .../WEB-INF/expected/test-noClasspath.txt       |   32 +
 .../tldDiscovery/WEB-INF/expected/test1.txt     |   73 +
 .../tldDiscovery/WEB-INF/fmtesttag 2.tld        |   32 +
 .../webapps/tldDiscovery/WEB-INF/fmtesttag4.tld |   32 +
 .../lib/taglib-foo.jar/META-INF/foo bar.tld     |   32 +
 .../WEB-INF/subdir-with-tld/fmtesttag3.tld      |   32 +
 .../WEB-INF/taglib 2.jar/META-INF/taglib.tld    |   31 +
 .../jsp/webapps/tldDiscovery/WEB-INF/web.xml    |  179 +
 .../tldDiscovery/not-auto-scanned/fmtesttag.tld |   40 +
 .../webapps/tldDiscovery/subdir/test-rel.ftl    |   20 +
 .../webapps/tldDiscovery/test-noClasspath.ftl   |   32 +
 .../servlet/jsp/webapps/tldDiscovery/test1.ftl  |   55 +
 .../WEB-INF/templates/test.ftl                  |    1 +
 freemarker-test-utils/build.gradle              |   53 +
 .../freemarker/test/ResourcesExtractor.java     |  294 ++
 .../org/apache/freemarker/test/TestUtil.java    |  255 ++
 .../apache/freemarker/test/_TStringUtil.java    |   65 +
 .../src/main/resources/logback-test.xml         |   34 +
 gradle.properties.sample                        |    2 +
 gradle/wrapper/gradle-wrapper.properties        |    4 +-
 ivy.xml                                         |  152 -
 ivysettings.xml                                 |   54 -
 old-ant-build/.travis.yml                       |    5 +
 old-ant-build/build.properties                  |   23 +
 old-ant-build/build.properties.sample           |   23 +
 old-ant-build/build.xml                         | 1093 +++++
 old-ant-build/ivy.xml                           |  152 +
 old-ant-build/ivysettings.xml                   |   54 +
 old-ant-build/osgi.bnd                          |   64 +
 osgi.bnd                                        |   64 -
 settings.gradle                                 |    6 +
 src/dist/bin/LICENSE                            |  232 -
 src/dist/bin/documentation/index.html           |   67 -
 src/dist/jar/META-INF/LICENSE                   |  202 -
 src/dist/javadoc/META-INF/LICENSE               |  202 -
 .../Eclipse/Formatter-profile-FreeMarker.xml    |  313 --
 .../Editor-Inspections-FreeMarker.xml           |   33 -
 .../Java-code-style-FreeMarker.xml              |   66 -
 .../core/APINotSupportedTemplateException.java  |   49 -
 .../org/apache/freemarker/core/ASTComment.java  |   87 -
 .../apache/freemarker/core/ASTDebugBreak.java   |   89 -
 .../freemarker/core/ASTDirAssignment.java       |  279 --
 .../core/ASTDirAssignmentsContainer.java        |  115 -
 .../core/ASTDirAttemptRecoverContainer.java     |   88 -
 .../apache/freemarker/core/ASTDirAutoEsc.java   |   77 -
 .../org/apache/freemarker/core/ASTDirBreak.java |   70 -
 .../core/ASTDirCapturingAssignment.java         |  184 -
 .../org/apache/freemarker/core/ASTDirCase.java  |   91 -
 .../apache/freemarker/core/ASTDirCompress.java  |   87 -
 .../freemarker/core/ASTDirElseOfList.java       |   75 -
 .../apache/freemarker/core/ASTDirEscape.java    |  111 -
 .../apache/freemarker/core/ASTDirFallback.java  |   70 -
 .../org/apache/freemarker/core/ASTDirFlush.java |   65 -
 .../core/ASTDirIfElseIfElseContainer.java       |  107 -
 .../freemarker/core/ASTDirIfOrElseOrElseIf.java |  114 -
 .../apache/freemarker/core/ASTDirImport.java    |  125 -
 .../apache/freemarker/core/ASTDirInclude.java   |  174 -
 .../org/apache/freemarker/core/ASTDirItems.java |  120 -
 .../org/apache/freemarker/core/ASTDirList.java  |  462 --
 .../core/ASTDirListElseContainer.java           |   88 -
 .../org/apache/freemarker/core/ASTDirMacro.java |  325 --
 .../apache/freemarker/core/ASTDirNested.java    |  159 -
 .../apache/freemarker/core/ASTDirNoAutoEsc.java |   77 -
 .../apache/freemarker/core/ASTDirNoEscape.java  |   78 -
 .../freemarker/core/ASTDirOutputFormat.java     |   85 -
 .../apache/freemarker/core/ASTDirRecover.java   |   75 -
 .../apache/freemarker/core/ASTDirRecurse.java   |  130 -
 .../apache/freemarker/core/ASTDirReturn.java    |   91 -
 .../org/apache/freemarker/core/ASTDirSep.java   |   89 -
 .../apache/freemarker/core/ASTDirSetting.java   |  172 -
 .../org/apache/freemarker/core/ASTDirStop.java  |   81 -
 .../apache/freemarker/core/ASTDirSwitch.java    |  129 -
 .../apache/freemarker/core/ASTDirTOrTrOrTl.java |  109 -
 .../freemarker/core/ASTDirUserDefined.java      |  343 --
 .../org/apache/freemarker/core/ASTDirVisit.java |  126 -
 .../apache/freemarker/core/ASTDirective.java    |   98 -
 .../freemarker/core/ASTDollarInterpolation.java |  151 -
 .../org/apache/freemarker/core/ASTElement.java  |  445 --
 .../freemarker/core/ASTExpAddOrConcat.java      |  313 --
 .../org/apache/freemarker/core/ASTExpAnd.java   |   82 -
 .../apache/freemarker/core/ASTExpBoolean.java   |   34 -
 .../freemarker/core/ASTExpBooleanLiteral.java   |   91 -
 .../apache/freemarker/core/ASTExpBuiltIn.java   |  485 --
 .../freemarker/core/ASTExpBuiltInVariable.java  |  298 --
 .../freemarker/core/ASTExpComparison.java       |  104 -
 .../apache/freemarker/core/ASTExpDefault.java   |  142 -
 .../org/apache/freemarker/core/ASTExpDot.java   |   92 -
 .../freemarker/core/ASTExpDynamicKeyName.java   |  284 --
 .../apache/freemarker/core/ASTExpExists.java    |   91 -
 .../freemarker/core/ASTExpHashLiteral.java      |  220 -
 .../freemarker/core/ASTExpListLiteral.java      |  195 -
 .../freemarker/core/ASTExpMethodCall.java       |  147 -
 .../freemarker/core/ASTExpNegateOrPlus.java     |  110 -
 .../org/apache/freemarker/core/ASTExpNot.java   |   76 -
 .../freemarker/core/ASTExpNumberLiteral.java    |   92 -
 .../org/apache/freemarker/core/ASTExpOr.java    |   82 -
 .../freemarker/core/ASTExpParenthesis.java      |   88 -
 .../org/apache/freemarker/core/ASTExpRange.java |  119 -
 .../freemarker/core/ASTExpStringLiteral.java    |  211 -
 .../apache/freemarker/core/ASTExpVariable.java  |  105 -
 .../apache/freemarker/core/ASTExpression.java   |  208 -
 .../freemarker/core/ASTHashInterpolation.java   |  172 -
 .../freemarker/core/ASTImplicitParent.java      |  101 -
 .../freemarker/core/ASTInterpolation.java       |   51 -
 .../org/apache/freemarker/core/ASTNode.java     |  233 -
 .../apache/freemarker/core/ASTStaticText.java   |  408 --
 .../freemarker/core/ArithmeticExpression.java   |  129 -
 .../freemarker/core/BoundedRangeModel.java      |   70 -
 .../core/BuiltInBannedWhenAutoEscaping.java     |   27 -
 .../apache/freemarker/core/BuiltInForDate.java  |   56 -
 .../freemarker/core/BuiltInForHashEx.java       |   55 -
 .../core/BuiltInForLegacyEscaping.java          |   48 -
 .../freemarker/core/BuiltInForLoopVariable.java |   48 -
 .../freemarker/core/BuiltInForMarkupOutput.java |   40 -
 .../apache/freemarker/core/BuiltInForNode.java  |   39 -
 .../freemarker/core/BuiltInForNodeEx.java       |   37 -
 .../freemarker/core/BuiltInForNumber.java       |   35 -
 .../freemarker/core/BuiltInForSequence.java     |   38 -
 .../freemarker/core/BuiltInForString.java       |   36 -
 .../core/BuiltInWithParseTimeParameters.java    |  109 -
 .../freemarker/core/BuiltInsForDates.java       |  212 -
 .../core/BuiltInsForExistenceHandling.java      |  133 -
 .../freemarker/core/BuiltInsForHashes.java      |   59 -
 .../core/BuiltInsForLoopVariables.java          |  156 -
 .../core/BuiltInsForMarkupOutputs.java          |   41 -
 .../core/BuiltInsForMultipleTypes.java          |  717 ---
 .../freemarker/core/BuiltInsForNodes.java       |  154 -
 .../freemarker/core/BuiltInsForNumbers.java     |  319 --
 .../core/BuiltInsForOutputFormatRelated.java    |   84 -
 .../freemarker/core/BuiltInsForSequences.java   |  871 ----
 .../core/BuiltInsForStringsBasic.java           |  697 ---
 .../core/BuiltInsForStringsEncoding.java        |  195 -
 .../freemarker/core/BuiltInsForStringsMisc.java |  305 --
 .../core/BuiltInsForStringsRegexp.java          |  322 --
 .../core/BuiltInsWithParseTimeParameters.java   |  157 -
 ...lPlaceCustomDataInitializationException.java |   33 -
 .../apache/freemarker/core/Configuration.java   | 2631 -----------
 .../freemarker/core/ConfigurationException.java |   37 -
 .../ConfigurationSettingValueException.java     |   86 -
 .../apache/freemarker/core/CustomStateKey.java  |   60 -
 .../freemarker/core/CustomStateScope.java       |   34 -
 .../freemarker/core/DirectiveCallPlace.java     |  137 -
 .../org/apache/freemarker/core/Environment.java | 3213 --------------
 .../core/InvalidReferenceException.java         |  167 -
 .../core/ListableRightUnboundedRangeModel.java  |   97 -
 .../apache/freemarker/core/LocalContext.java    |   36 -
 .../freemarker/core/LocalContextStack.java      |   57 -
 .../core/MarkupOutputFormatBoundBuiltIn.java    |   46 -
 .../org/apache/freemarker/core/MessageUtil.java |  341 --
 .../org/apache/freemarker/core/MiscUtil.java    |   69 -
 ...utableParsingAndProcessingConfiguration.java |  475 --
 .../core/MutableProcessingConfiguration.java    | 2418 ----------
 .../freemarker/core/NativeCollectionEx.java     |   73 -
 .../apache/freemarker/core/NativeHashEx2.java   |  106 -
 .../apache/freemarker/core/NativeSequence.java  |   74 -
 .../core/NativeStringArraySequence.java         |   53 -
 .../NativeStringCollectionCollectionEx.java     |   79 -
 .../core/NativeStringListSequence.java          |   56 -
 .../NestedContentNotSupportedException.java     |   67 -
 .../freemarker/core/NonBooleanException.java    |   62 -
 .../freemarker/core/NonDateException.java       |   58 -
 .../core/NonExtendedHashException.java          |   62 -
 .../core/NonExtendedNodeException.java          |   64 -
 .../freemarker/core/NonHashException.java       |   64 -
 .../core/NonMarkupOutputException.java          |   64 -
 .../freemarker/core/NonMethodException.java     |   64 -
 .../freemarker/core/NonNamespaceException.java  |   63 -
 .../freemarker/core/NonNodeException.java       |   64 -
 .../freemarker/core/NonNumericalException.java  |   74 -
 .../freemarker/core/NonSequenceException.java   |   64 -
 .../core/NonSequenceOrCollectionException.java  |   92 -
 .../freemarker/core/NonStringException.java     |   74 -
 .../NonStringOrTemplateOutputException.java     |   78 -
 .../NonUserDefinedDirectiveLikeException.java   |   67 -
 .../core/OutputFormatBoundBuiltIn.java          |   48 -
 .../apache/freemarker/core/ParameterRole.java   |   91 -
 .../apache/freemarker/core/ParseException.java  |  518 ---
 .../core/ParsingAndProcessingConfiguration.java |   29 -
 .../freemarker/core/ParsingConfiguration.java   |  299 --
 .../core/ProcessingConfiguration.java           |  704 ---
 .../org/apache/freemarker/core/RangeModel.java  |   59 -
 .../apache/freemarker/core/RegexpHelper.java    |  207 -
 .../core/RightUnboundedRangeModel.java          |   48 -
 .../core/SettingValueNotSetException.java       |   33 -
 .../apache/freemarker/core/SpecialBuiltIn.java  |   27 -
 .../apache/freemarker/core/StopException.java   |   64 -
 .../org/apache/freemarker/core/Template.java    | 1341 ------
 .../freemarker/core/TemplateBooleanFormat.java  |   91 -
 .../freemarker/core/TemplateClassResolver.java  |   82 -
 .../freemarker/core/TemplateConfiguration.java  |  991 -----
 .../core/TemplateElementArrayBuilder.java       |  102 -
 .../core/TemplateElementsToVisit.java           |   48 -
 .../freemarker/core/TemplateException.java      |  655 ---
 .../core/TemplateExceptionHandler.java          |  156 -
 .../freemarker/core/TemplateLanguage.java       |  111 -
 .../core/TemplateNotFoundException.java         |   64 -
 ...emplateParsingConfigurationWithFallback.java |  146 -
 .../freemarker/core/TemplatePostProcessor.java  |   31 -
 .../core/TemplatePostProcessorException.java    |   35 -
 ...nterruptionSupportTemplatePostProcessor.java |  140 -
 .../apache/freemarker/core/TokenMgrError.java   |  249 --
 .../freemarker/core/TopLevelConfiguration.java  |  194 -
 .../core/UnexpectedTypeException.java           |  109 -
 .../UnknownConfigurationSettingException.java   |   40 -
 .../org/apache/freemarker/core/Version.java     |  297 --
 .../core/WrongTemplateCharsetException.java     |   63 -
 .../apache/freemarker/core/_CharsetBuilder.java |   41 -
 .../org/apache/freemarker/core/_CoreAPI.java    |   88 -
 .../org/apache/freemarker/core/_CoreLogs.java   |   46 -
 .../java/org/apache/freemarker/core/_Debug.java |  122 -
 .../apache/freemarker/core/_DelayedAOrAn.java   |   35 -
 .../core/_DelayedConversionToString.java        |   52 -
 .../core/_DelayedFTLTypeDescription.java        |   37 -
 .../core/_DelayedGetCanonicalForm.java          |   39 -
 .../freemarker/core/_DelayedGetMessage.java     |   35 -
 .../core/_DelayedGetMessageWithoutStackTop.java |   34 -
 .../apache/freemarker/core/_DelayedJQuote.java  |   36 -
 .../freemarker/core/_DelayedJoinWithComma.java  |   48 -
 .../apache/freemarker/core/_DelayedOrdinal.java |   47 -
 .../freemarker/core/_DelayedShortClassName.java |   35 -
 .../freemarker/core/_DelayedToString.java       |   37 -
 .../core/_ErrorDescriptionBuilder.java          |  356 --
 .../org/apache/freemarker/core/_EvalUtil.java   |  545 ---
 .../java/org/apache/freemarker/core/_Java8.java |   34 -
 .../org/apache/freemarker/core/_Java8Impl.java  |   43 -
 .../freemarker/core/_MiscTemplateException.java |  124 -
 ...ObjectBuilderSettingEvaluationException.java |   46 -
 .../core/_ObjectBuilderSettingEvaluator.java    | 1068 -----
 .../core/_SettingEvaluationEnvironment.java     |   61 -
 .../core/_TemplateModelException.java           |  133 -
 .../freemarker/core/_TimeZoneBuilder.java       |   43 -
 ...expectedTypeErrorExplainerTemplateModel.java |   36 -
 .../core/arithmetic/ArithmeticEngine.java       |   92 -
 .../impl/BigDecimalArithmeticEngine.java        |  107 -
 .../impl/ConservativeArithmeticEngine.java      |  381 --
 .../core/arithmetic/impl/package.html           |   26 -
 .../freemarker/core/arithmetic/package.html     |   25 -
 .../freemarker/core/debug/Breakpoint.java       |   83 -
 .../freemarker/core/debug/DebugModel.java       |  105 -
 .../core/debug/DebuggedEnvironment.java         |   58 -
 .../apache/freemarker/core/debug/Debugger.java  |   95 -
 .../freemarker/core/debug/DebuggerClient.java   |  149 -
 .../freemarker/core/debug/DebuggerListener.java |   36 -
 .../freemarker/core/debug/DebuggerServer.java   |  131 -
 .../core/debug/EnvironmentSuspendedEvent.java   |   67 -
 .../core/debug/RmiDebugModelImpl.java           |  164 -
 .../core/debug/RmiDebuggedEnvironmentImpl.java  |  340 --
 .../freemarker/core/debug/RmiDebuggerImpl.java  |   86 -
 .../core/debug/RmiDebuggerListenerImpl.java     |   67 -
 .../core/debug/RmiDebuggerService.java          |  307 --
 .../apache/freemarker/core/debug/SoftCache.java |   89 -
 .../freemarker/core/debug/_DebuggerService.java |   93 -
 .../apache/freemarker/core/debug/package.html   |   27 -
 .../core/model/AdapterTemplateModel.java        |   49 -
 .../apache/freemarker/core/model/Constants.java |  133 -
 .../core/model/FalseTemplateBooleanModel.java   |   36 -
 .../core/model/GeneralPurposeNothing.java       |   83 -
 .../freemarker/core/model/ObjectWrapper.java    |   59 -
 .../core/model/ObjectWrapperAndUnwrapper.java   |   90 -
 .../core/model/ObjectWrapperWithAPISupport.java |   46 -
 .../core/model/RichObjectWrapper.java           |   34 -
 .../model/SerializableTemplateBooleanModel.java |   24 -
 .../core/model/TemplateBooleanModel.java        |   48 -
 .../core/model/TemplateCollectionModel.java     |   48 -
 .../core/model/TemplateCollectionModelEx.java   |   45 -
 .../core/model/TemplateDateModel.java           |   73 -
 .../core/model/TemplateDirectiveBody.java       |   45 -
 .../core/model/TemplateDirectiveModel.java      |   69 -
 .../core/model/TemplateHashModel.java           |   41 -
 .../core/model/TemplateHashModelEx.java         |   51 -
 .../core/model/TemplateHashModelEx2.java        |   80 -
 .../core/model/TemplateMarkupOutputModel.java   |   52 -
 .../core/model/TemplateMethodModel.java         |   60 -
 .../core/model/TemplateMethodModelEx.java       |   54 -
 .../freemarker/core/model/TemplateModel.java    |   55 -
 .../core/model/TemplateModelAdapter.java        |   34 -
 .../core/model/TemplateModelException.java      |  111 -
 .../core/model/TemplateModelIterator.java       |   39 -
 .../core/model/TemplateModelWithAPISupport.java |   39 -
 .../core/model/TemplateNodeModel.java           |   78 -
 .../core/model/TemplateNodeModelEx.java         |   40 -
 .../core/model/TemplateNumberModel.java         |   42 -
 .../core/model/TemplateScalarModel.java         |   45 -
 .../core/model/TemplateSequenceModel.java       |   48 -
 .../core/model/TemplateTransformModel.java      |   54 -
 .../freemarker/core/model/TransformControl.java |  101 -
 .../core/model/TrueTemplateBooleanModel.java    |   36 -
 .../core/model/WrapperTemplateModel.java        |   33 -
 .../core/model/WrappingTemplateModel.java       |   62 -
 .../freemarker/core/model/impl/APIModel.java    |   45 -
 .../core/model/impl/ArgumentTypes.java          |  647 ---
 .../core/model/impl/BeanAndStringModel.java     |   53 -
 .../freemarker/core/model/impl/BeanModel.java   |  339 --
 .../model/impl/CallableMemberDescriptor.java    |   56 -
 .../core/model/impl/CharacterOrString.java      |   45 -
 .../core/model/impl/ClassBasedModelFactory.java |  148 -
 .../core/model/impl/ClassChangeNotifier.java    |   32 -
 .../core/model/impl/ClassIntrospector.java      | 1263 ------
 .../core/model/impl/CollectionAdapter.java      |   88 -
 .../core/model/impl/CollectionAndSequence.java  |  111 -
 .../core/model/impl/DefaultArrayAdapter.java    |  378 --
 .../model/impl/DefaultEnumerationAdapter.java   |  128 -
 .../core/model/impl/DefaultIterableAdapter.java |   94 -
 .../core/model/impl/DefaultIteratorAdapter.java |  138 -
 .../core/model/impl/DefaultListAdapter.java     |  123 -
 .../core/model/impl/DefaultMapAdapter.java      |  171 -
 .../impl/DefaultNonListCollectionAdapter.java   |  103 -
 .../core/model/impl/DefaultObjectWrapper.java   | 1773 --------
 .../DefaultObjectWrapperTCCLSingletonUtil.java  |  129 -
 .../DefaultUnassignableIteratorAdapter.java     |   59 -
 .../impl/EmptyCallableMemberDescriptor.java     |   35 -
 .../model/impl/EmptyMemberAndArguments.java     |   93 -
 .../freemarker/core/model/impl/EnumModels.java  |   50 -
 .../freemarker/core/model/impl/HashAdapter.java |  181 -
 .../model/impl/InvalidPropertyException.java    |   34 -
 .../model/impl/JRebelClassChangeNotifier.java   |   58 -
 .../core/model/impl/JavaMethodModel.java        |  105 -
 .../model/impl/MapKeyValuePairIterator.java     |   77 -
 .../MaybeEmptyCallableMemberDescriptor.java     |   25 -
 .../impl/MaybeEmptyMemberAndArguments.java      |   22 -
 .../core/model/impl/MemberAndArguments.java     |   64 -
 .../model/impl/MethodAppearanceFineTuner.java   |  156 -
 .../core/model/impl/MethodSorter.java           |   36 -
 .../NonPrimitiveArrayBackedReadOnlyList.java    |   42 -
 .../model/impl/OverloadedFixArgsMethods.java    |   99 -
 .../core/model/impl/OverloadedMethods.java      |  271 --
 .../core/model/impl/OverloadedMethodsModel.java |   65 -
 .../model/impl/OverloadedMethodsSubset.java     |  402 --
 .../core/model/impl/OverloadedNumberUtil.java   | 1289 ------
 .../model/impl/OverloadedVarArgsMethods.java    |  245 --
 .../impl/PrimtiveArrayBackedReadOnlyList.java   |   47 -
 .../ReflectionCallableMemberDescriptor.java     |   95 -
 .../core/model/impl/ResourceBundleModel.java    |  181 -
 .../model/impl/RestrictedObjectWrapper.java     |   98 -
 .../core/model/impl/SequenceAdapter.java        |   68 -
 .../freemarker/core/model/impl/SetAdapter.java  |   32 -
 .../core/model/impl/SimpleCollection.java       |  138 -
 .../freemarker/core/model/impl/SimpleDate.java  |   85 -
 .../freemarker/core/model/impl/SimpleHash.java  |  296 --
 .../core/model/impl/SimpleMethod.java           |  174 -
 .../core/model/impl/SimpleNumber.java           |   77 -
 .../core/model/impl/SimpleScalar.java           |   73 -
 .../core/model/impl/SimpleSequence.java         |  162 -
 .../core/model/impl/SingletonCustomizer.java    |   51 -
 .../freemarker/core/model/impl/StaticModel.java |  177 -
 .../core/model/impl/StaticModels.java           |   43 -
 .../model/impl/TemplateModelListSequence.java   |   58 -
 .../freemarker/core/model/impl/TypeFlags.java   |  130 -
 .../core/model/impl/UnsafeMethods.java          |  112 -
 .../freemarker/core/model/impl/_MethodUtil.java |  319 --
 .../freemarker/core/model/impl/_ModelAPI.java   |  122 -
 .../freemarker/core/model/impl/package.html     |   26 -
 .../apache/freemarker/core/model/package.html   |   25 -
 .../outputformat/CommonMarkupOutputFormat.java  |  124 -
 .../CommonTemplateMarkupOutputModel.java        |   69 -
 .../core/outputformat/MarkupOutputFormat.java   |  135 -
 .../core/outputformat/OutputFormat.java         |   86 -
 .../UnregisteredOutputFormatException.java      |   39 -
 .../core/outputformat/impl/CSSOutputFormat.java |   54 -
 .../impl/CombinedMarkupOutputFormat.java        |  108 -
 .../outputformat/impl/HTMLOutputFormat.java     |   77 -
 .../outputformat/impl/JSONOutputFormat.java     |   54 -
 .../impl/JavaScriptOutputFormat.java            |   55 -
 .../impl/PlainTextOutputFormat.java             |   58 -
 .../core/outputformat/impl/RTFOutputFormat.java |   77 -
 .../impl/TemplateCombinedMarkupOutputModel.java |   52 -
 .../impl/TemplateHTMLOutputModel.java           |   42 -
 .../impl/TemplateRTFOutputModel.java            |   42 -
 .../impl/TemplateXHTMLOutputModel.java          |   42 -
 .../impl/TemplateXMLOutputModel.java            |   42 -
 .../impl/UndefinedOutputFormat.java             |   58 -
 .../outputformat/impl/XHTMLOutputFormat.java    |   77 -
 .../core/outputformat/impl/XMLOutputFormat.java |   77 -
 .../core/outputformat/impl/package.html         |   26 -
 .../freemarker/core/outputformat/package.html   |   25 -
 .../org/apache/freemarker/core/package.html     |   27 -
 .../core/templateresolver/AndMatcher.java       |   45 -
 .../core/templateresolver/CacheStorage.java     |   37 -
 .../CacheStorageWithGetSize.java                |   36 -
 ...ConditionalTemplateConfigurationFactory.java |   65 -
 .../templateresolver/FileExtensionMatcher.java  |   85 -
 .../templateresolver/FileNameGlobMatcher.java   |   86 -
 .../FirstMatchTemplateConfigurationFactory.java |  110 -
 .../templateresolver/GetTemplateResult.java     |   89 -
 .../MalformedTemplateNameException.java         |   60 -
 .../MergingTemplateConfigurationFactory.java    |   63 -
 .../core/templateresolver/NotMatcher.java       |   41 -
 .../core/templateresolver/OrMatcher.java        |   45 -
 .../core/templateresolver/PathGlobMatcher.java  |  100 -
 .../core/templateresolver/PathRegexMatcher.java |   54 -
 .../TemplateConfigurationFactory.java           |   54 -
 .../TemplateConfigurationFactoryException.java  |   36 -
 .../core/templateresolver/TemplateLoader.java   |  104 -
 .../templateresolver/TemplateLoaderSession.java |   76 -
 .../templateresolver/TemplateLoadingResult.java |  208 -
 .../TemplateLoadingResultStatus.java            |   49 -
 .../templateresolver/TemplateLoadingSource.java |   69 -
 .../templateresolver/TemplateLookupContext.java |  112 -
 .../templateresolver/TemplateLookupResult.java  |   54 -
 .../TemplateLookupStrategy.java                 |   78 -
 .../templateresolver/TemplateNameFormat.java    |   53 -
 .../core/templateresolver/TemplateResolver.java |  166 -
 .../templateresolver/TemplateSourceMatcher.java |   30 -
 .../core/templateresolver/_CacheAPI.java        |   43 -
 .../impl/ByteArrayTemplateLoader.java           |  199 -
 .../impl/ClassTemplateLoader.java               |  184 -
 .../impl/DefaultTemplateLookupStrategy.java     |   61 -
 .../impl/DefaultTemplateNameFormat.java         |  309 --
 .../impl/DefaultTemplateNameFormatFM2.java      |  105 -
 .../impl/DefaultTemplateResolver.java           |  904 ----
 .../impl/FileTemplateLoader.java                |  383 --
 .../templateresolver/impl/MruCacheStorage.java  |  330 --
 .../impl/MultiTemplateLoader.java               |  172 -
 .../templateresolver/impl/NullCacheStorage.java |   71 -
 .../templateresolver/impl/SoftCacheStorage.java |  112 -
 .../impl/StringTemplateLoader.java              |  199 -
 .../impl/StrongCacheStorage.java                |   70 -
 ...emplateLoaderBasedTemplateLookupContext.java |   66 -
 ...TemplateLoaderBasedTemplateLookupResult.java |  124 -
 .../impl/URLTemplateLoader.java                 |  229 -
 .../impl/URLTemplateLoadingSource.java          |   58 -
 .../impl/_TemplateLoaderUtils.java              |   43 -
 .../core/templateresolver/impl/package.html     |   26 -
 .../core/templateresolver/package.html          |   25 -
 .../freemarker/core/util/BugException.java      |   52 -
 .../freemarker/core/util/CaptureOutput.java     |  147 -
 .../freemarker/core/util/CommonBuilder.java     |   35 -
 .../apache/freemarker/core/util/DeepUnwrap.java |  153 -
 .../apache/freemarker/core/util/FTLUtil.java    |  805 ----
 .../core/util/GenericParseException.java        |   40 -
 .../apache/freemarker/core/util/HtmlEscape.java |  109 -
 .../freemarker/core/util/NormalizeNewlines.java |  115 -
 .../freemarker/core/util/ObjectFactory.java     |   31 -
 .../core/util/OptInTemplateClassResolver.java   |  160 -
 .../core/util/ProductWrappingBuilder.java       |   38 -
 .../freemarker/core/util/StandardCompress.java  |  239 -
 .../core/util/UndeclaredThrowableException.java |   43 -
 .../util/UnrecognizedTimeZoneException.java     |   38 -
 .../util/UnsupportedNumberClassException.java   |   38 -
 .../apache/freemarker/core/util/XmlEscape.java  |   92 -
 .../freemarker/core/util/_ArrayEnumeration.java |   51 -
 .../freemarker/core/util/_ArrayIterator.java    |   54 -
 .../apache/freemarker/core/util/_ClassUtil.java |  182 -
 .../freemarker/core/util/_CollectionUtil.java   |   36 -
 .../apache/freemarker/core/util/_DateUtil.java  |  914 ----
 .../freemarker/core/util/_JavaVersions.java     |   80 -
 .../freemarker/core/util/_KeyValuePair.java     |   61 -
 .../freemarker/core/util/_LocaleUtil.java       |   43 -
 .../core/util/_NullArgumentException.java       |   59 -
 .../freemarker/core/util/_NullWriter.java       |   90 -
 .../freemarker/core/util/_NumberUtil.java       |  228 -
 .../freemarker/core/util/_ObjectHolder.java     |   55 -
 .../freemarker/core/util/_SecurityUtil.java     |   87 -
 .../freemarker/core/util/_SortedArraySet.java   |   80 -
 .../freemarker/core/util/_StringUtil.java       | 1675 -------
 .../core/util/_UnmodifiableCompositeSet.java    |   98 -
 .../freemarker/core/util/_UnmodifiableSet.java  |   47 -
 .../apache/freemarker/core/util/package.html    |   25 -
 .../InvalidFormatParametersException.java       |   37 -
 .../InvalidFormatStringException.java           |   37 -
 .../ParsingNotSupportedException.java           |   37 -
 .../core/valueformat/TemplateDateFormat.java    |  110 -
 .../valueformat/TemplateDateFormatFactory.java  |   95 -
 .../core/valueformat/TemplateFormatUtil.java    |   77 -
 .../core/valueformat/TemplateNumberFormat.java  |   93 -
 .../TemplateNumberFormatFactory.java            |   67 -
 .../core/valueformat/TemplateValueFormat.java   |   42 -
 .../TemplateValueFormatException.java           |   37 -
 .../valueformat/TemplateValueFormatFactory.java |   28 -
 .../UndefinedCustomFormatException.java         |   34 -
 .../UnformattableValueException.java            |   41 -
 ...nDateTypeFormattingUnsupportedException.java |   36 -
 ...nownDateTypeParsingUnsupportedException.java |   37 -
 .../valueformat/UnparsableValueException.java   |   38 -
 ...AliasTargetTemplateValueFormatException.java |   38 -
 .../impl/AliasTemplateDateFormatFactory.java    |   97 -
 .../impl/AliasTemplateNumberFormatFactory.java  |   96 -
 .../impl/ExtendedDecimalFormatParser.java       |  530 ---
 .../impl/ISOLikeTemplateDateFormat.java         |  270 --
 .../impl/ISOLikeTemplateDateFormatFactory.java  |   57 -
 .../valueformat/impl/ISOTemplateDateFormat.java |   90 -
 .../impl/ISOTemplateDateFormatFactory.java      |   56 -
 .../impl/JavaTemplateDateFormat.java            |   75 -
 .../impl/JavaTemplateDateFormatFactory.java     |  187 -
 .../impl/JavaTemplateNumberFormat.java          |   64 -
 .../impl/JavaTemplateNumberFormatFactory.java   |  133 -
 .../valueformat/impl/XSTemplateDateFormat.java  |   94 -
 .../impl/XSTemplateDateFormatFactory.java       |   51 -
 .../core/valueformat/impl/package.html          |   26 -
 .../freemarker/core/valueformat/package.html    |   25 -
 .../java/org/apache/freemarker/dom/AtAtKey.java |   58 -
 .../freemarker/dom/AttributeNodeModel.java      |   69 -
 .../freemarker/dom/CharacterDataNodeModel.java  |   46 -
 .../apache/freemarker/dom/DocumentModel.java    |   76 -
 .../freemarker/dom/DocumentTypeModel.java       |   56 -
 .../java/org/apache/freemarker/dom/DomLog.java  |   32 -
 .../apache/freemarker/dom/DomStringUtil.java    |   67 -
 .../org/apache/freemarker/dom/ElementModel.java |  234 -
 .../freemarker/dom/JaxenXPathSupport.java       |  243 -
 .../apache/freemarker/dom/NodeListModel.java    |  219 -
 .../org/apache/freemarker/dom/NodeModel.java    |  613 ---
 .../apache/freemarker/dom/NodeOutputter.java    |  258 --
 .../dom/NodeQueryResultItemObjectWrapper.java   |   92 -
 .../org/apache/freemarker/dom/PINodeModel.java  |   45 -
 .../dom/SunInternalXalanXPathSupport.java       |  163 -
 .../org/apache/freemarker/dom/XPathSupport.java |   30 -
 .../freemarker/dom/XalanXPathSupport.java       |  163 -
 .../java/org/apache/freemarker/dom/package.html |   30 -
 .../servlet/AllHttpScopesHashModel.java         |  114 -
 .../freemarker/servlet/FreemarkerServlet.java   | 1611 -------
 .../FreemarkerServletConfigurationBuilder.java  |   79 -
 .../servlet/HttpRequestHashModel.java           |  108 -
 .../servlet/HttpRequestParametersHashModel.java |  104 -
 .../servlet/HttpSessionHashModel.java           |  113 -
 .../apache/freemarker/servlet/IncludePage.java  |  254 --
 .../freemarker/servlet/InitParamParser.java     |  264 --
 .../servlet/ServletContextHashModel.java        |   62 -
 .../servlet/WebAppTemplateLoader.java           |  301 --
 .../apache/freemarker/servlet/_ServletLogs.java |   34 -
 .../jsp/CustomTagAndELFunctionCombiner.java     |  202 -
 .../freemarker/servlet/jsp/EventForwarding.java |  200 -
 .../jsp/FreeMarkerJspApplicationContext.java    |  165 -
 .../servlet/jsp/FreeMarkerJspFactory.java       |   63 -
 .../servlet/jsp/FreeMarkerJspFactory21.java     |   51 -
 .../servlet/jsp/FreeMarkerPageContext.java      |  460 --
 .../freemarker/servlet/jsp/JspTagModelBase.java |  162 -
 .../servlet/jsp/JspWriterAdapter.java           |  188 -
 .../servlet/jsp/PageContextFactory.java         |   66 -
 .../servlet/jsp/SimpleTagDirectiveModel.java    |  111 -
 .../servlet/jsp/TagTransformModel.java          |  419 --
 .../freemarker/servlet/jsp/TaglibFactory.java   | 2015 ---------
 .../servlet/jsp/TaglibMethodUtil.java           |  117 -
 .../servlet/jsp/_FreeMarkerPageContext21.java   |  122 -
 .../apache/freemarker/servlet/jsp/package.html  |   26 -
 .../org/apache/freemarker/servlet/package.html  |   26 -
 src/main/javacc/FTL.jj                          | 4132 ------------------
 .../adhoc/IdentifierCharGenerator.java          |  546 ---
 src/main/misc/overloadedNumberRules/README.txt  |   34 -
 src/main/misc/overloadedNumberRules/config.fmpp |   73 -
 .../misc/overloadedNumberRules/generator.ftl    |   80 -
 src/main/misc/overloadedNumberRules/prices.ods  |  Bin 17855 -> 0 bytes
 .../core/model/impl/unsafeMethods.properties    |   98 -
 .../apache/freemarker/core/version.properties   |  104 -
 src/manual/en_US/FM3-CHANGE-LOG.txt             |  226 -
 src/manual/en_US/book.xml                       |   82 -
 src/manual/en_US/docgen-help/editors-readme.txt |  130 -
 .../en_US/docgen-misc/copyrightComment.txt      |   16 -
 .../en_US/docgen-misc/googleAnalytics.html      |   14 -
 .../figures/model2sketch_with_alpha.png         |  Bin 61463 -> 0 bytes
 .../figures/odg-convert-howto.txt               |   43 -
 .../en_US/docgen-originals/figures/overview.odg |  Bin 11939 -> 0 bytes
 .../figures/tree_with_alpha.png                 |  Bin 10304 -> 0 bytes
 src/manual/en_US/docgen.cjson                   |  132 -
 src/manual/en_US/favicon.png                    |  Bin 1291 -> 0 bytes
 src/manual/en_US/figures/model2sketch.png       |  Bin 21425 -> 0 bytes
 src/manual/en_US/figures/overview.png           |  Bin 11837 -> 0 bytes
 src/manual/en_US/figures/tree.png               |  Bin 4699 -> 0 bytes
 src/manual/en_US/logo.png                       |  Bin 10134 -> 0 bytes
 src/manual/zh_CN/book.xml                       |   82 -
 src/manual/zh_CN/docgen-help/README             |    2 -
 .../zh_CN/docgen-misc/googleAnalytics.html      |   14 -
 .../zh_CN/docgen-originals/figures/README       |    2 -
 src/manual/zh_CN/docgen.cjson                   |  130 -
 src/manual/zh_CN/favicon.png                    |  Bin 1291 -> 0 bytes
 src/manual/zh_CN/figures/model2sketch.png       |  Bin 21425 -> 0 bytes
 src/manual/zh_CN/figures/overview.png           |  Bin 11837 -> 0 bytes
 src/manual/zh_CN/figures/tree.png               |  Bin 4699 -> 0 bytes
 src/manual/zh_CN/logo.png                       |  Bin 10134 -> 0 bytes
 .../core/ASTBasedErrorMessagesTest.java         |   74 -
 .../org/apache/freemarker/core/ASTPrinter.java  |  438 --
 .../org/apache/freemarker/core/ASTTest.java     |  103 -
 .../core/ActualNamingConvetionTest.java         |   66 -
 .../freemarker/core/ActualTagSyntaxTest.java    |   68 -
 .../freemarker/core/BreakPlacementTest.java     |   56 -
 .../apache/freemarker/core/CamelCaseTest.java   |  486 --
 .../freemarker/core/CanonicalFormTest.java      |   68 -
 .../freemarker/core/CoercionToTextualTest.java  |  145 -
 .../freemarker/core/ConfigurableTest.java       |  176 -
 .../freemarker/core/ConfigurationTest.java      | 1480 -------
 .../freemarker/core/CoreLocaleUtilsTest.java    |   73 -
 .../freemarker/core/CustomAttributeTest.java    |  163 -
 .../apache/freemarker/core/DateFormatTest.java  |  464 --
 .../freemarker/core/DirectiveCallPlaceTest.java |  249 --
 .../freemarker/core/EncodingOverrideTest.java   |   62 -
 .../EnvironmentGetTemplateVariantsTest.java     |  214 -
 .../apache/freemarker/core/ExceptionTest.java   |  115 -
 .../apache/freemarker/core/GetSourceTest.java   |   52 -
 .../freemarker/core/HeaderParsingTest.java      |   60 -
 .../IncludeAndImportConfigurableLayersTest.java |  354 --
 .../freemarker/core/IncludeAndImportTest.java   |  270 --
 .../freemarker/core/IncudeFromNamelessTest.java |   58 -
 .../core/InterpretAndEvalTemplateNameTest.java  |   70 -
 .../core/InterpretSettingInheritanceTest.java   |  104 -
 .../freemarker/core/IteratorIssuesTest.java     |   64 -
 .../core/JavaCCExceptionAsEOFFixTest.java       |  126 -
 .../apache/freemarker/core/ListErrorsTest.java  |  130 -
 .../freemarker/core/MiscErrorMessagesTest.java  |   48 -
 .../core/MistakenlyPublicImportAPIsTest.java    |  104 -
 .../core/MistakenlyPublicMacroAPIsTest.java     |   88 -
 .../freemarker/core/MockServletContext.java     |  157 -
 .../core/NewBiObjectWrapperRestrictionTest.java |   50 -
 .../core/ObjectBuilderSettingsTest.java         | 1499 -------
 .../core/OptInTemplateClassResolverTest.java    |  230 -
 .../freemarker/core/OutputFormatTest.java       | 1068 -----
 .../ParseTimeParameterBIErrorMessagesTest.java  |   46 -
 .../core/ParsingErrorMessagesTest.java          |  116 -
 .../core/RestrictedObjectWrapperTest.java       |   72 -
 .../core/RestrictedObjetWrapperTest.java        |  112 -
 .../apache/freemarker/core/SQLTimeZoneTest.java |  371 --
 .../freemarker/core/SettingDirectiveTest.java   |   40 -
 .../freemarker/core/SpecialVariableTest.java    |  114 -
 .../core/StringLiteralInterpolationTest.java    |  133 -
 .../org/apache/freemarker/core/TabSizeTest.java |   91 -
 .../core/TagSyntaxVariationsTest.java           |  186 -
 .../core/TemplateConfigurationTest.java         |  909 ----
 ...gurationWithDefaultTemplateResolverTest.java |  267 --
 .../core/TemplateConstructorsTest.java          |  113 -
 .../core/TemplateGetEncodingTest.java           |   64 -
 .../core/TemplateLookupStrategyTest.java        |  669 ---
 .../core/TemplateNameSpecialVariablesTest.java  |  159 -
 .../core/TemplateNotFoundMessageTest.java       |  219 -
 .../core/TheadInterruptingSupportTest.java      |  163 -
 .../freemarker/core/TypeErrorMessagesTest.java  |  105 -
 .../freemarker/core/UnclosedCommentTest.java    |   41 -
 .../org/apache/freemarker/core/VersionTest.java |  227 -
 .../core/WhitespaceStrippingTest.java           |   63 -
 .../freemarker/core/XHTMLOutputFormatTest.java  |   59 -
 .../freemarker/core/XMLOutputFormatTest.java    |   59 -
 .../impl/AbstractParallelIntrospectionTest.java |  126 -
 .../model/impl/AlphabeticalMethodSorter.java    |   45 -
 .../core/model/impl/BridgeMethodsBean.java      |   30 -
 .../core/model/impl/BridgeMethodsBeanBase.java  |   29 -
 .../CommonSupertypeForUnwrappingHintTest.java   |  129 -
 .../model/impl/DefaultObjectWrapperDesc.java    |   31 -
 .../model/impl/DefaultObjectWrapperInc.java     |   31 -
 ...jectWrapperModelFactoryRegistrationTest.java |   63 -
 .../DefaultObjectWrapperSingletonsTest.java     |  675 ---
 .../model/impl/DefaultObjectWrapperTest.java    |  901 ----
 .../core/model/impl/EnumModelsTest.java         |   85 -
 .../core/model/impl/ErrorMessagesTest.java      |  170 -
 .../impl/FineTuneMethodAppearanceTest.java      |   65 -
 .../GetlessMethodsAsPropertyGettersRule.java    |   67 -
 .../core/model/impl/IsApplicableTest.java       |  171 -
 .../impl/IsMoreSpecificParameterTypeTest.java   |   98 -
 .../Java7MembersOnlyDefaultObjectWrapper.java   |  101 -
 ...Java8BridgeMethodsWithDefaultMethodBean.java |   29 -
 ...ava8BridgeMethodsWithDefaultMethodBean2.java |   23 -
 ...8BridgeMethodsWithDefaultMethodBeanBase.java |   31 -
 ...BridgeMethodsWithDefaultMethodBeanBase2.java |   28 -
 .../model/impl/Java8DefaultMethodsBean.java     |   84 -
 .../model/impl/Java8DefaultMethodsBeanBase.java |   97 -
 ...a8DefaultObjectWrapperBridgeMethodsTest.java |   65 -
 .../impl/Java8DefaultObjectWrapperTest.java     |  160 -
 .../impl/ManyObjectsOfDifferentClasses.java     |  249 --
 .../impl/ManyStaticsOfDifferentClasses.java     |  236 -
 .../model/impl/MiscNumericalOperationsTest.java |  111 -
 .../model/impl/ModelAPINewInstanceTest.java     |  134 -
 .../core/model/impl/ModelCacheTest.java         |   71 -
 .../model/impl/OverloadedNumberUtilTest.java    |  585 ---
 .../impl/ParameterListPreferabilityTest.java    |  445 --
 .../impl/PrallelObjectIntrospectionTest.java    |   43 -
 .../impl/PrallelStaticIntrospectionTest.java    |   47 -
 .../core/model/impl/RationalNumber.java         |   90 -
 .../core/model/impl/StaticModelsTest.java       |   91 -
 .../core/model/impl/TypeFlagsTest.java          |  671 ---
 .../core/outputformat/_OutputFormatTestAPI.java |   35 -
 .../impl/CombinedMarkupOutputFormatTest.java    |  194 -
 .../outputformat/impl/HTMLOutputFormatTest.java |  187 -
 .../outputformat/impl/RTFOutputFormatTest.java  |  129 -
 .../DefaultTemplateResolverTest.java            |  365 --
 .../FileTemplateLoaderTest.java                 |  122 -
 .../MultiTemplateLoaderTest.java                |   99 -
 .../TemplateConfigurationFactoryTest.java       |  203 -
 .../TemplateNameFormatTest.java                 |  330 --
 .../TemplateSourceMatcherTest.java              |  188 -
 .../AppMetaTemplateDateFormatFactory.java       |  129 -
 .../BaseNTemplateNumberFormatFactory.java       |  128 -
 .../core/userpkg/CustomHTMLOutputFormat.java    |   72 -
 .../core/userpkg/CustomTemplateHTMLModel.java   |   34 -
 .../core/userpkg/DummyOutputFormat.java         |   65 -
 ...EpochMillisDivTemplateDateFormatFactory.java |  102 -
 .../EpochMillisTemplateDateFormatFactory.java   |   92 -
 .../HTMLISOTemplateDateFormatFactory.java       |  114 -
 .../userpkg/HexTemplateNumberFormatFactory.java |   77 -
 ...AndTZSensitiveTemplateDateFormatFactory.java |   97 -
 ...aleSensitiveTemplateNumberFormatFactory.java |   78 -
 .../core/userpkg/PackageVisibleAll.java         |   26 -
 .../userpkg/PackageVisibleAllWithBuilder.java   |   26 -
 .../PackageVisibleAllWithBuilderBuilder.java    |   28 -
 .../PackageVisibleWithPublicConstructor.java    |   27 -
 .../PrintfGTemplateNumberFormatFactory.java     |  138 -
 .../freemarker/core/userpkg/PublicAll.java      |   24 -
 .../userpkg/PublicWithMixedConstructors.java    |   38 -
 .../PublicWithPackageVisibleConstructor.java    |   26 -
 .../core/userpkg/SeldomEscapedOutputFormat.java |   71 -
 .../core/userpkg/TemplateDummyOutputModel.java  |   34 -
 .../TemplateSeldomEscapedOutputModel.java       |   34 -
 .../freemarker/core/util/DateUtilTest.java      | 1085 -----
 .../freemarker/core/util/FTLUtilTest.java       |  117 -
 .../freemarker/core/util/NumberUtilTest.java    |  215 -
 .../freemarker/core/util/StringUtilTest.java    |  403 --
 .../core/valueformat/NumberFormatTest.java      |  365 --
 .../impl/ExtendedDecimalFormatTest.java         |  343 --
 .../apache/freemarker/dom/DOMSiblingTest.java   |   99 -
 .../freemarker/dom/DOMSimplifiersTest.java      |  201 -
 .../java/org/apache/freemarker/dom/DOMTest.java |  159 -
 .../manualtest/AutoEscapingExample.java         |   72 -
 .../ConfigureOutputFormatExamples.java          |  105 -
 .../manualtest/CustomFormatsExample.java        |   82 -
 .../manualtest/GettingStartedExample.java       |   69 -
 .../apache/freemarker/manualtest/Product.java   |   49 -
 .../TemplateConfigurationExamples.java          |  191 -
 .../UnitAwareTemplateNumberFormatFactory.java   |   80 -
 .../UnitAwareTemplateNumberModel.java           |   43 -
 .../servlet/FreemarkerServletTest.java          |  626 ---
 .../freemarker/servlet/InitParamParserTest.java |  164 -
 .../servlet/jsp/JspTestFreemarkerServlet.java   |   50 -
 ...estFreemarkerServletWithDefaultOverride.java |   47 -
 .../servlet/jsp/RealServletContainertTest.java  |  505 ---
 .../freemarker/servlet/jsp/TLDParsingTest.java  |  135 -
 .../servlet/jsp/TaglibMethodUtilTest.java       |  107 -
 .../jsp/taglibmembers/AttributeAccessorTag.java |   68 -
 .../jsp/taglibmembers/AttributeInfoTag.java     |   59 -
 .../jsp/taglibmembers/EnclosingClass.java       |   32 -
 .../servlet/jsp/taglibmembers/GetAndSetTag.java |   66 -
 .../jsp/taglibmembers/TestFunctions.java        |   79 -
 .../jsp/taglibmembers/TestSimpleTag.java        |   54 -
 .../jsp/taglibmembers/TestSimpleTag2.java       |   32 -
 .../jsp/taglibmembers/TestSimpleTag3.java       |   32 -
 .../servlet/jsp/taglibmembers/TestTag.java      |  100 -
 .../servlet/jsp/taglibmembers/TestTag2.java     |   50 -
 .../servlet/jsp/taglibmembers/TestTag3.java     |   50 -
 .../config/WebappLocalFreemarkerServlet.java    |   25 -
 .../CopyrightCommentRemoverTemplateLoader.java  |  105 -
 .../test/MonitoredTemplateLoader.java           |  325 --
 .../freemarker/test/ResourcesExtractor.java     |  295 --
 .../apache/freemarker/test/TemplateTest.java    |  342 --
 .../test/TestConfigurationBuilder.java          |   92 -
 .../freemarker/test/hamcerst/Matchers.java      |   34 -
 .../hamcerst/StringContainsIgnoringCase.java    |   47 -
 .../org/apache/freemarker/test/package.html     |   28 -
 .../test/servlet/DefaultModel2TesterAction.java |   92 -
 .../freemarker/test/servlet/Model2Action.java   |   37 -
 .../test/servlet/Model2TesterServlet.java       |  142 -
 .../freemarker/test/servlet/WebAppTestCase.java |  360 --
 .../test/templatesuite/TemplateTestCase.java    |  515 ---
 .../test/templatesuite/TemplateTestSuite.java   |  298 --
 .../templatesuite/models/AllTemplateModels.java |  128 -
 .../templatesuite/models/BeanTestClass.java     |   93 -
 .../templatesuite/models/BeanTestInterface.java |   25 -
 .../models/BeanTestSuperclass.java              |   30 -
 .../models/BooleanAndScalarModel.java           |   40 -
 .../models/BooleanAndStringTemplateModel.java   |   38 -
 .../test/templatesuite/models/BooleanHash1.java |   58 -
 .../test/templatesuite/models/BooleanHash2.java |   50 -
 .../test/templatesuite/models/BooleanList1.java |   62 -
 .../test/templatesuite/models/BooleanList2.java |   53 -
 .../models/BooleanVsStringMethods.java          |   40 -
 .../templatesuite/models/EnumTestClass.java     |   34 -
 .../templatesuite/models/ExceptionModel.java    |   39 -
 .../models/HashAndScalarModel.java              |   84 -
 .../templatesuite/models/JavaObjectInfo.java    |   35 -
 .../test/templatesuite/models/Listables.java    |  185 -
 .../test/templatesuite/models/MultiModel1.java  |  116 -
 .../test/templatesuite/models/MultiModel2.java  |   63 -
 .../test/templatesuite/models/MultiModel3.java  |   69 -
 .../test/templatesuite/models/MultiModel4.java  |   77 -
 .../test/templatesuite/models/MultiModel5.java  |   81 -
 .../test/templatesuite/models/NewTestModel.java |   52 -
 .../templatesuite/models/NewTestModel2.java     |   52 -
 .../models/NumberAndStringModel.java            |   47 -
 .../models/OverloadedConstructor.java           |   46 -
 .../templatesuite/models/OverloadedMethods.java |  191 -
 .../models/OverloadedMethods2.java              | 1110 -----
 .../templatesuite/models/SimpleTestMethod.java  |   49 -
 .../models/TransformHashWrapper.java            |   79 -
 .../models/TransformMethodWrapper1.java         |   49 -
 .../models/TransformMethodWrapper2.java         |   64 -
 .../templatesuite/models/TransformModel1.java   |  175 -
 .../templatesuite/models/VarArgTestModel.java   |   63 -
 .../freemarker/test/templatesuite/package.html  |   42 -
 .../freemarker/test/util/AssertDirective.java   |   73 -
 .../test/util/AssertEqualsDirective.java        |   91 -
 .../test/util/AssertFailsDirective.java         |  152 -
 .../AssertationFailedInTemplateException.java   |   46 -
 .../test/util/BadParameterTypeException.java    |   60 -
 .../test/util/EntirelyCustomObjectWrapper.java  |   91 -
 .../freemarker/test/util/FileTestCase.java      |  216 -
 .../util/MissingRequiredParameterException.java |   51 -
 .../freemarker/test/util/NoOutputDirective.java |   50 -
 .../test/util/ParameterException.java           |   54 -
 .../SimpleMapAndCollectionObjectWrapper.java    |   60 -
 .../apache/freemarker/test/util/TestUtil.java   |  266 --
 .../util/UnsupportedParameterException.java     |   50 -
 .../apache/freemarker/test/util/XMLLoader.java  |  138 -
 src/test/resources/META-INF/malformed.tld       |   31 -
 .../tldDiscovery MetaInfTldSources-1.tld        |   31 -
 src/test/resources/logback-test.xml             |   34 -
 .../org/apache/freemarker/core/ast-1.ast        |  187 -
 .../org/apache/freemarker/core/ast-1.ftl        |   29 -
 .../apache/freemarker/core/ast-assignments.ast  |  172 -
 .../apache/freemarker/core/ast-assignments.ftl  |   29 -
 .../org/apache/freemarker/core/ast-builtins.ast |   59 -
 .../org/apache/freemarker/core/ast-builtins.ftl |   23 -
 .../apache/freemarker/core/ast-locations.ast    |  155 -
 .../apache/freemarker/core/ast-locations.ftl    |   36 -
 .../core/ast-mixedcontentsimplifications.ast    |   38 -
 .../core/ast-mixedcontentsimplifications.ftl    |   26 -
 .../core/ast-multipleignoredchildren.ast        |   30 -
 .../core/ast-multipleignoredchildren.ftl        |   33 -
 .../core/ast-nestedignoredchildren.ast          |   20 -
 .../core/ast-nestedignoredchildren.ftl          |   19 -
 .../org/apache/freemarker/core/ast-range.ast    |  281 --
 .../org/apache/freemarker/core/ast-range.ftl    |   47 -
 .../freemarker/core/ast-strlitinterpolation.ast |   82 -
 .../freemarker/core/ast-strlitinterpolation.ftl |   25 -
 .../freemarker/core/ast-whitespacestripping.ast |   70 -
 .../freemarker/core/ast-whitespacestripping.ftl |   40 -
 .../apache/freemarker/core/cano-assignments.ftl |   35 -
 .../freemarker/core/cano-assignments.ftl.out    |   34 -
 .../apache/freemarker/core/cano-builtins.ftl    |   23 -
 .../freemarker/core/cano-builtins.ftl.out       |   23 -
 .../core/cano-identifier-escaping.ftl           |   76 -
 .../core/cano-identifier-escaping.ftl.out       |   44 -
 .../org/apache/freemarker/core/cano-macros.ftl  |   29 -
 .../apache/freemarker/core/cano-macros.ftl.out  |   28 -
 .../core/cano-strlitinterpolation.ftl           |   19 -
 .../core/cano-strlitinterpolation.ftl.out       |   19 -
 .../core/encodingOverride-ISO-8859-1.ftl        |   20 -
 .../freemarker/core/encodingOverride-UTF-8.ftl  |   20 -
 .../freemarker/core/templateresolver/test.ftl   |   19 -
 .../org/apache/freemarker/core/toCache1.ftl     |   19 -
 .../org/apache/freemarker/core/toCache2.ftl     |   19 -
 .../apache/freemarker/dom/DOMSiblingTest.xml    |   31 -
 .../manualtest/AutoEscapingExample-capture.ftlh |   21 -
 .../AutoEscapingExample-capture.ftlh.out        |   20 -
 .../manualtest/AutoEscapingExample-convert.ftlh |   27 -
 .../AutoEscapingExample-convert.ftlh.out        |   25 -
 .../manualtest/AutoEscapingExample-convert2.ftl |   25 -
 .../AutoEscapingExample-convert2.ftl.out        |   21 -
 .../manualtest/AutoEscapingExample-infoBox.ftlh |   26 -
 .../AutoEscapingExample-infoBox.ftlh.out        |   25 -
 .../manualtest/AutoEscapingExample-markup.ftlh  |   28 -
 .../AutoEscapingExample-markup.ftlh.out         |   26 -
 .../AutoEscapingExample-stringConcat.ftlh       |   19 -
 .../AutoEscapingExample-stringConcat.ftlh.out   |   19 -
 .../AutoEscapingExample-stringLiteral.ftlh      |   21 -
 .../AutoEscapingExample-stringLiteral.ftlh.out  |   20 -
 .../AutoEscapingExample-stringLiteral2.ftlh     |   25 -
 .../AutoEscapingExample-stringLiteral2.ftlh.out |   21 -
 .../ConfigureOutputFormatExamples1.properties   |   21 -
 .../ConfigureOutputFormatExamples2.properties   |   31 -
 .../manualtest/CustomFormatsExample-alias1.ftlh |   22 -
 .../CustomFormatsExample-alias1.ftlh.out        |   22 -
 .../manualtest/CustomFormatsExample-alias2.ftlh |   19 -
 .../CustomFormatsExample-alias2.ftlh.out        |   19 -
 .../CustomFormatsExample-modelAware.ftlh        |   20 -
 .../CustomFormatsExample-modelAware.ftlh.out    |   20 -
 .../TemplateConfigurationExamples1.properties   |   25 -
 .../TemplateConfigurationExamples2.properties   |   32 -
 .../TemplateConfigurationExamples3.properties   |   47 -
 .../org/apache/freemarker/manualtest/test.ftlh  |   28 -
 .../freemarker/servlet/jsp/TLDParsingTest.tld   |   89 -
 .../servlet/jsp/templates/classpath-test.ftl    |   19 -
 .../jsp/tldDiscovery-ClassPathTlds-1.tld        |   31 -
 .../jsp/tldDiscovery-ClassPathTlds-2.tld        |   31 -
 .../servlet/jsp/webapps/basic/CONTENTS.txt      |   36 -
 .../WEB-INF/el-function-tag-name-clash.tld      |   50 -
 .../jsp/webapps/basic/WEB-INF/el-functions.tld  |   84 -
 .../expected/attributes-modernModels.txt        |   73 -
 .../basic/WEB-INF/expected/attributes.txt       |   73 -
 .../basic/WEB-INF/expected/customTags1.txt      |  106 -
 .../servlet/jsp/webapps/basic/WEB-INF/test.tld  |   75 -
 .../servlet/jsp/webapps/basic/WEB-INF/web.xml   |  142 -
 .../servlet/jsp/webapps/basic/attributes.ftl    |   90 -
 .../jsp/webapps/basic/customELFunctions1.ftl    |   30 -
 .../jsp/webapps/basic/customELFunctions1.jsp    |   31 -
 .../servlet/jsp/webapps/basic/customTags1.ftl   |   59 -
 .../webapps/basic/elFunctionsTagNameClash.ftl   |   25 -
 .../webapps/basic/elFunctionsTagNameClash.jsp   |   26 -
 .../jsp/webapps/basic/trivial-jstl-@Ignore.ftl  |   48 -
 .../servlet/jsp/webapps/basic/trivial.ftl       |   37 -
 .../servlet/jsp/webapps/basic/trivial.jsp       |   45 -
 .../servlet/jsp/webapps/config/CONTENTS.txt     |   33 -
 .../webapps/config/WEB-INF/classes/sub/test.ftl |   19 -
 .../jsp/webapps/config/WEB-INF/classes/test.ftl |   19 -
 .../WEB-INF/lib/templates.jar/sub/test2.ftl     |   19 -
 .../webapps/config/WEB-INF/templates/test.ftl   |   19 -
 .../servlet/jsp/webapps/config/WEB-INF/web.xml  |  109 -
 .../servlet/jsp/webapps/config/test.ftl         |   19 -
 .../servlet/jsp/webapps/errors/CONTENTS.txt     |   28 -
 .../servlet/jsp/webapps/errors/WEB-INF/web.xml  |   92 -
 .../jsp/webapps/errors/failing-parsetime.ftlnv  |   20 -
 .../jsp/webapps/errors/failing-parsetime.jsp    |   19 -
 .../jsp/webapps/errors/failing-runtime.ftl      |   26 -
 .../jsp/webapps/errors/failing-runtime.jsp      |   23 -
 .../servlet/jsp/webapps/errors/not-failing.ftl  |   19 -
 .../jsp/webapps/multipleLoaders/CONTENTS.txt    |   24 -
 .../multipleLoaders/WEB-INF/templates/test.ftl  |   19 -
 .../jsp/webapps/multipleLoaders/WEB-INF/web.xml |   83 -
 .../jsp/webapps/tldDiscovery/CONTENTS.txt       |   37 -
 .../WEB-INF/expected/subdir/test-rel.txt        |   20 -
 .../WEB-INF/expected/test-noClasspath.txt       |   32 -
 .../tldDiscovery/WEB-INF/expected/test1.txt     |   73 -
 .../tldDiscovery/WEB-INF/fmtesttag 2.tld        |   32 -
 .../webapps/tldDiscovery/WEB-INF/fmtesttag4.tld |   32 -
 .../lib/taglib-foo.jar/META-INF/foo bar.tld     |   32 -
 .../WEB-INF/subdir-with-tld/fmtesttag3.tld      |   32 -
 .../WEB-INF/taglib 2.jar/META-INF/taglib.tld    |   31 -
 .../jsp/webapps/tldDiscovery/WEB-INF/web.xml    |  179 -
 .../tldDiscovery/not-auto-scanned/fmtesttag.tld |   40 -
 .../webapps/tldDiscovery/subdir/test-rel.ftl    |   20 -
 .../webapps/tldDiscovery/test-noClasspath.ftl   |   32 -
 .../servlet/jsp/webapps/tldDiscovery/test1.ftl  |   55 -
 .../org/apache/freemarker/test/servlet/web.xml  |  101 -
 .../test/templatesuite/expected/arithmetic.txt  |   46 -
 .../expected/boolean-formatting.txt             |   31 -
 .../test/templatesuite/expected/boolean.txt     |  102 -
 .../expected/charset-in-header.txt              |   26 -
 .../test/templatesuite/expected/comment.txt     |   34 -
 .../test/templatesuite/expected/comparisons.txt |   93 -
 .../test/templatesuite/expected/compress.txt    |   40 -
 .../templatesuite/expected/dateformat-java.txt  |   55 -
 .../expected/default-object-wrapper.txt         |   55 -
 .../templatesuite/expected/default-xmlns.txt    |   25 -
 .../test/templatesuite/expected/default.txt     |   26 -
 .../expected/encoding-builtins.txt              |   44 -
 .../test/templatesuite/expected/escapes.txt     |   49 -
 .../test/templatesuite/expected/exception.txt   |   43 -
 .../test/templatesuite/expected/exception2.txt  |   47 -
 .../test/templatesuite/expected/exception3.txt  |   21 -
 .../test/templatesuite/expected/exthash.txt     |   76 -
 .../test/templatesuite/expected/hashconcat.txt  |  138 -
 .../test/templatesuite/expected/hashliteral.txt |   74 -
 .../test/templatesuite/expected/helloworld.txt  |   31 -
 .../expected/identifier-escaping.txt            |   57 -
 .../expected/identifier-non-ascii.txt           |   19 -
 .../test/templatesuite/expected/if.txt          |  104 -
 .../test/templatesuite/expected/import.txt      |   40 -
 .../test/templatesuite/expected/include.txt     |   67 -
 .../test/templatesuite/expected/include2.txt    |   28 -
 .../test/templatesuite/expected/interpret.txt   |   23 -
 .../test/templatesuite/expected/iterators.txt   |   84 -
 .../templatesuite/expected/lastcharacter.txt    |   31 -
 .../test/templatesuite/expected/list-bis.txt    |   51 -
 .../test/templatesuite/expected/list.txt        |   51 -
 .../test/templatesuite/expected/list2.txt       |  211 -
 .../test/templatesuite/expected/list3.txt       |   57 -
 .../test/templatesuite/expected/listhash.txt    |  157 -
 .../templatesuite/expected/listhashliteral.txt  |   36 -
 .../test/templatesuite/expected/listliteral.txt |   75 -
 .../templatesuite/expected/localization.txt     |   32 -
 .../test/templatesuite/expected/logging.txt     |   27 -
 .../templatesuite/expected/loopvariable.txt     |   54 -
 .../templatesuite/expected/macros-return.txt    |   23 -
 .../test/templatesuite/expected/macros.txt      |   67 -
 .../test/templatesuite/expected/macros2.txt     |   22 -
 .../test/templatesuite/expected/multimodels.txt |   93 -
 .../test/templatesuite/expected/nested.txt      |   25 -
 .../expected/new-allowsnothing.txt              |   19 -
 .../expected/new-defaultresolver.txt            |   19 -
 .../test/templatesuite/expected/new-optin.txt   |   32 -
 .../test/templatesuite/expected/newlines1.txt   |   29 -
 .../test/templatesuite/expected/newlines2.txt   |   30 -
 .../test/templatesuite/expected/noparse.txt     |   54 -
 .../templatesuite/expected/number-format.txt    |   33 -
 .../templatesuite/expected/number-literal.txt   |   79 -
 .../templatesuite/expected/number-to-date.txt   |   31 -
 .../templatesuite/expected/numerical-cast.txt   |  462 --
 .../templatesuite/expected/output-encoding1.txt |   27 -
 .../templatesuite/expected/output-encoding2.txt |  Bin 1972 -> 0 bytes
 .../templatesuite/expected/output-encoding3.txt |   26 -
 .../test/templatesuite/expected/precedence.txt  |   48 -
 .../test/templatesuite/expected/recover.txt     |   26 -
 .../test/templatesuite/expected/root.txt        |   44 -
 .../expected/sequence-builtins.txt              |  404 --
 .../test/templatesuite/expected/specialvars.txt |   25 -
 .../string-builtins-regexps-matches.txt         |   99 -
 .../expected/string-builtins-regexps.txt        |  112 -
 .../templatesuite/expected/string-builtins1.txt |  112 -
 .../templatesuite/expected/string-builtins2.txt |  135 -
 .../templatesuite/expected/stringbimethods.txt  |   29 -
 .../templatesuite/expected/stringliteral.txt    |  Bin 1550 -> 0 bytes
 .../test/templatesuite/expected/switch.txt      |   80 -
 .../test/templatesuite/expected/transforms.txt  |   68 -
 .../templatesuite/expected/type-builtins.txt    |   33 -
 .../test/templatesuite/expected/var-layers.txt  |   37 -
 .../test/templatesuite/expected/varargs.txt     |   44 -
 .../test/templatesuite/expected/variables.txt   |   62 -
 .../templatesuite/expected/whitespace-trim.txt  |   60 -
 .../templatesuite/expected/wstrip-in-header.txt |   23 -
 .../test/templatesuite/expected/wstripping.txt  |   39 -
 .../templatesuite/expected/xml-fragment.txt     |   25 -
 .../expected/xml-ns_prefix-scope.txt            |   29 -
 .../test/templatesuite/expected/xml.txt         |   65 -
 .../test/templatesuite/expected/xmlns1.txt      |   63 -
 .../test/templatesuite/expected/xmlns3.txt      |   47 -
 .../test/templatesuite/expected/xmlns4.txt      |   47 -
 .../test/templatesuite/expected/xmlns5.txt      |   26 -
 .../models/BeansTestResources.properties        |   19 -
 .../test/templatesuite/models/defaultxmlns1.xml |   24 -
 .../models/xml-ns_prefix-scope.xml              |   26 -
 .../test/templatesuite/models/xml.xml           |   31 -
 .../test/templatesuite/models/xmlfragment.xml   |   19 -
 .../test/templatesuite/models/xmlns.xml         |   32 -
 .../test/templatesuite/models/xmlns2.xml        |   32 -
 .../test/templatesuite/models/xmlns3.xml        |   32 -
 .../templatesuite/templates/api-builtins.ftl    |   40 -
 .../test/templatesuite/templates/arithmetic.ftl |   50 -
 .../templatesuite/templates/assignments.ftl     |  108 -
 .../templates/boolean-formatting.ftl            |   82 -
 .../test/templatesuite/templates/boolean.ftl    |  142 -
 .../templates/charset-in-header.ftl             |   27 -
 .../templates/charset-in-header_inc1.ftl        |   20 -
 .../templates/charset-in-header_inc2.ftl        |   19 -
 .../test/templatesuite/templates/comment.ftl    |   50 -
 .../templatesuite/templates/comparisons.ftl     |  218 -
 .../test/templatesuite/templates/compress.ftl   |   59 -
 .../templates/date-type-builtins.ftl            |   47 -
 .../templates/dateformat-iso-bi.ftl             |  163 -
 .../templates/dateformat-iso-like.ftl           |  155 -
 .../templatesuite/templates/dateformat-java.ftl |   71 -
 .../templatesuite/templates/dateparsing.ftl     |   84 -
 .../templates/default-object-wrapper.ftl        |   59 -
 .../templatesuite/templates/default-xmlns.ftl   |   28 -
 .../test/templatesuite/templates/default.ftl    |   34 -
 .../templates/encoding-builtins.ftl             |   52 -
 .../test/templatesuite/templates/escapes.ftl    |   79 -
 .../test/templatesuite/templates/exception.ftl  |   31 -
 .../test/templatesuite/templates/exception2.ftl |   31 -
 .../test/templatesuite/templates/exception3.ftl |   31 -
 .../templates/existence-operators.ftl           |  141 -
 .../test/templatesuite/templates/hashconcat.ftl |   60 -
 .../templatesuite/templates/hashliteral.ftl     |  100 -
 .../test/templatesuite/templates/helloworld.ftl |   30 -
 .../templates/identifier-escaping.ftl           |   81 -
 .../templates/identifier-non-ascii.ftl          |   21 -
 .../test/templatesuite/templates/if.ftl         |  109 -
 .../test/templatesuite/templates/import.ftl     |   45 -
 .../test/templatesuite/templates/import_lib.ftl |   31 -
 .../test/templatesuite/templates/include.ftl    |   47 -
 .../templates/include2-included.ftl             |   19 -
 .../test/templatesuite/templates/include2.ftl   |   32 -
 .../test/templatesuite/templates/included.ftl   |   30 -
 .../test/templatesuite/templates/interpret.ftl  |   25 -
 .../test/templatesuite/templates/iterators.ftl  |   71 -
 .../templatesuite/templates/lastcharacter.ftl   |   31 -
 .../test/templatesuite/templates/list-bis.ftl   |   48 -
 .../test/templatesuite/templates/list.ftl       |   44 -
 .../test/templatesuite/templates/list2.ftl      |   90 -
 .../test/templatesuite/templates/list3.ftl      |   70 -
 .../test/templatesuite/templates/listhash.ftl   |   70 -
 .../templatesuite/templates/listhashliteral.ftl |   35 -
 .../templatesuite/templates/listliteral.ftl     |   84 -
 .../templatesuite/templates/localization.ftl    |   32 -
 .../templatesuite/templates/localization_en.ftl |   32 -
 .../templates/localization_en_AU.ftl            |   32 -
 .../test/templatesuite/templates/logging.ftl    |   42 -
 .../templatesuite/templates/loopvariable.ftl    |   49 -
 .../templatesuite/templates/macros-return.ftl   |   34 -
 .../test/templatesuite/templates/macros.ftl     |  101 -
 .../test/templatesuite/templates/macros2.ftl    |   35 -
 .../templatesuite/templates/multimodels.ftl     |   84 -
 .../test/templatesuite/templates/nested.ftl     |   29 -
 .../templatesuite/templates/nestedinclude.ftl   |   21 -
 .../templates/new-defaultresolver.ftl           |   23 -
 .../test/templatesuite/templates/new-optin.ftl  |   30 -
 .../test/templatesuite/templates/newlines1.ftl  |   29 -
 .../test/templatesuite/templates/newlines2.ftl  |   33 -
 .../test/templatesuite/templates/noparse.ftl    |   62 -
 .../templatesuite/templates/number-format.ftl   |   42 -
 .../templatesuite/templates/number-literal.ftl  |  133 -
 .../templates/number-math-builtins.ftl          |   78 -
 .../templatesuite/templates/number-to-date.ftl  |   35 -
 .../templatesuite/templates/numerical-cast.ftl  |   82 -
 .../templates/output-encoding1.ftl              |   30 -
 .../templates/output-encoding2.ftl              |   28 -
 .../templates/output-encoding3.ftl              |   28 -
 .../templates/overloaded-methods.ftl            |  411 --
 .../test/templatesuite/templates/precedence.ftl |   61 -
 .../templatesuite/templates/range-common.ftl    |  314 --
 .../test/templatesuite/templates/range.ftl      |   50 -
 .../test/templatesuite/templates/recover.ftl    |   47 -
 .../test/templatesuite/templates/root.ftl       |   47 -
 .../templates/sequence-builtins.ftl             |  360 --
 .../test/templatesuite/templates/setting.ftl    |   53 -
 .../templates/simplehash-char-key.ftl           |   44 -
 .../templatesuite/templates/specialvars.ftl     |   38 -
 .../templates/string-builtin-coercion.ftl       |   34 -
 .../string-builtins-regexps-matches.ftl         |  118 -
 .../templates/string-builtins-regexps.ftl       |  136 -
 .../templates/string-builtins1.ftl              |  129 -
 .../templates/string-builtins2.ftl              |  135 -
 .../templates/string-builtins3.ftl              |  225 -
 .../templatesuite/templates/stringbimethods.ftl |   36 -
 .../templatesuite/templates/stringliteral.ftl   |   69 -
 .../templates/subdir/include-subdir.ftl         |   27 -
 .../templates/subdir/include-subdir2.ftl        |   19 -
 .../templates/subdir/new-optin-2.ftl            |   24 -
 .../templates/subdir/new-optin.ftl              |   26 -
 .../templates/subdir/subsub/new-optin.ftl       |   24 -
 .../templatesuite/templates/switch-builtin.ftl  |   54 -
 .../test/templatesuite/templates/switch.ftl     |  139 -
 .../templatesuite/templates/then-builtin.ftl    |   53 -
 .../test/templatesuite/templates/transforms.ftl |  100 -
 .../templatesuite/templates/type-builtins.ftl   |   44 -
 .../test/templatesuite/templates/undefined.ftl  |   19 -
 .../test/templatesuite/templates/url.ftl        |   24 -
 .../test/templatesuite/templates/var-layers.ftl |   39 -
 .../test/templatesuite/templates/varargs.ftl    |   45 -
 .../test/templatesuite/templates/variables.ftl  |   70 -
 .../templatesuite/templates/varlayers_lib.ftl   |   28 -
 .../templatesuite/templates/whitespace-trim.ftl |  102 -
 .../templates/wsstripinheader_inc.ftl           |   22 -
 .../templates/wstrip-in-header.ftl              |   26 -
 .../templatesuite/templates/xml-fragment.ftl    |   26 -
 .../templates/xml-ns_prefix-scope-lib.ftl       |   23 -
 .../templates/xml-ns_prefix-scope-main.ftl      |   36 -
 .../test/templatesuite/templates/xml.ftl        |   47 -
 .../test/templatesuite/templates/xmlns1.ftl     |   53 -
 .../test/templatesuite/templates/xmlns3.ftl     |   70 -
 .../test/templatesuite/templates/xmlns4.ftl     |   70 -
 .../test/templatesuite/templates/xmlns5.ftl     |   28 -
 .../freemarker/test/templatesuite/testcases.xml |  211 -
 2220 files changed, 143651 insertions(+), 142650 deletions(-)
----------------------------------------------------------------------



Mime
View raw message