Top level package name change to org.apache.freemarker, and some of of the internal package structure changes. Other smaller cleanup. To be continued...
Details: - Renamed top level java package from freemarker to org.apache.freemarker - Reorganized package structure. We will have a freemarker-core and a freemarker-servlet module later, so we got org.apache.freemarker.core (has nothing to do with the old freemarker.core) and org.apache.freemarker.servlet (this replaced freemarker.ext.servlet and freemarker.ext.jsp). Directly inside org.apache.freemarker.core we have most of the classes that were in freemarker.template and freemarker.core, however, model related classes (and object wrappers) were moved to org.apache.freemarker.core.model, and template loading and caching related classes to org.apache.freemarker.core.templateresolver (because later we will have a class called TemplateResolver, which is the central class of loading and caching and template name rules). freemarker.ext.beans were moved under org.apache.freemarker.core.model.impl.beans for now (but later we only want a DefaultObject wrapper, no BeansWrapper, so this will change) and freemarker.ext.dom was moved to org.apache.freemarker.core.model.impl.dom. The old freemarker.core package was renamed to org.apache.freemarker.core.ast for now, but a lot of its content will be moved into freemarker.core, so that it will really only contain the parser and the AST classes (or at least that's the idea). - Moved the all the static final ObjectWrapper-s to the new _StaticObjectWrappers class, and made them write protected (non-configurable). Also now they come from the pool that ObjectWrapper builders use. - WrappingTemplateModel.objectWrapper is now final, and its statically stored default value can't be set anymore. - Removed SimpleObjectWrapper deprecated paramerless constructor - Removed ResourceBundleLocalizedString and LocalizedString: Hardly anybody has discovered these, and they had no JUnit coverage. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/ecb4e230 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/ecb4e230 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/ecb4e230 Branch: refs/heads/3 Commit: ecb4e23058f261fb702933db72557d61f9b23cb5 Parents: ae8a3d5 Author: ddekany <[email protected]> Authored: Wed Feb 15 14:00:57 2017 +0100 Committer: ddekany <[email protected]> Committed: Thu Feb 16 23:51:56 2017 +0100 ---------------------------------------------------------------------- build.xml | 61 +- osgi.bnd | 12 +- src/main/java/freemarker/cache/AndMatcher.java | 45 - .../cache/ByteArrayTemplateLoader.java | 194 -- .../java/freemarker/cache/CacheStorage.java | 37 - .../cache/CacheStorageWithGetSize.java | 36 - .../freemarker/cache/ClassTemplateLoader.java | 182 - .../cache/ConcurrentCacheStorage.java | 35 - ...ConditionalTemplateConfigurationFactory.java | 76 - .../freemarker/cache/FileExtensionMatcher.java | 85 - .../freemarker/cache/FileNameGlobMatcher.java | 86 - .../freemarker/cache/FileTemplateLoader.java | 381 --- .../FirstMatchTemplateConfigurationFactory.java | 118 - .../MergingTemplateConfigurationFactory.java | 78 - .../java/freemarker/cache/MruCacheStorage.java | 322 -- .../freemarker/cache/MultiTemplateLoader.java | 167 - src/main/java/freemarker/cache/NotMatcher.java | 41 - .../java/freemarker/cache/NullCacheStorage.java | 66 - src/main/java/freemarker/cache/OrMatcher.java | 45 - .../java/freemarker/cache/PathGlobMatcher.java | 100 - .../java/freemarker/cache/PathRegexMatcher.java | 54 - .../java/freemarker/cache/SoftCacheStorage.java | 141 - .../freemarker/cache/StringTemplateLoader.java | 194 -- .../freemarker/cache/StrongCacheStorage.java | 67 - .../java/freemarker/cache/TemplateCache.java | 1113 ------ .../cache/TemplateConfigurationFactory.java | 91 - .../TemplateConfigurationFactoryException.java | 36 - .../java/freemarker/cache/TemplateLoader.java | 102 - .../freemarker/cache/TemplateLoaderSession.java | 73 - .../freemarker/cache/TemplateLoaderUtils.java | 37 - .../freemarker/cache/TemplateLoadingResult.java | 207 -- .../cache/TemplateLoadingResultStatus.java | 49 - .../freemarker/cache/TemplateLoadingSource.java | 66 - .../freemarker/cache/TemplateLookupContext.java | 126 - .../freemarker/cache/TemplateLookupResult.java | 133 - .../cache/TemplateLookupStrategy.java | 115 - .../freemarker/cache/TemplateNameFormat.java | 450 --- .../freemarker/cache/TemplateSourceMatcher.java | 30 - .../freemarker/cache/URLTemplateLoader.java | 225 -- .../cache/URLTemplateLoadingSource.java | 56 - .../freemarker/cache/WebAppTemplateLoader.java | 296 -- src/main/java/freemarker/cache/_CacheAPI.java | 45 - src/main/java/freemarker/cache/package.html | 30 - .../core/APINotSupportedTemplateException.java | 76 - .../freemarker/core/AddConcatExpression.java | 306 -- ...AliasTargetTemplateValueFormatException.java | 36 - .../core/AliasTemplateDateFormatFactory.java | 91 - .../core/AliasTemplateNumberFormatFactory.java | 90 - .../java/freemarker/core/AndExpression.java | 81 - .../java/freemarker/core/ArithmeticEngine.java | 550 --- .../freemarker/core/ArithmeticExpression.java | 129 - src/main/java/freemarker/core/Assignment.java | 278 -- .../freemarker/core/AssignmentInstruction.java | 117 - src/main/java/freemarker/core/AttemptBlock.java | 89 - src/main/java/freemarker/core/AutoEscBlock.java | 79 - .../BackwardCompatibleTemplateNumberFormat.java | 30 - .../java/freemarker/core/BlockAssignment.java | 183 - .../java/freemarker/core/BodyInstruction.java | 158 - .../java/freemarker/core/BooleanExpression.java | 32 - .../java/freemarker/core/BooleanLiteral.java | 88 - .../java/freemarker/core/BoundedRangeModel.java | 69 - .../java/freemarker/core/BreakInstruction.java | 70 - src/main/java/freemarker/core/BugException.java | 52 - src/main/java/freemarker/core/BuiltIn.java | 493 --- .../core/BuiltInBannedWhenAutoEscaping.java | 27 - .../java/freemarker/core/BuiltInForDate.java | 57 - .../java/freemarker/core/BuiltInForHashEx.java | 56 - .../core/BuiltInForLegacyEscaping.java | 48 - .../freemarker/core/BuiltInForLoopVariable.java | 49 - .../freemarker/core/BuiltInForMarkupOutput.java | 40 - .../java/freemarker/core/BuiltInForNode.java | 40 - .../java/freemarker/core/BuiltInForNodeEx.java | 38 - .../java/freemarker/core/BuiltInForNumber.java | 36 - .../freemarker/core/BuiltInForSequence.java | 39 - .../java/freemarker/core/BuiltInForString.java | 37 - .../core/BuiltInWithParseTimeParameters.java | 109 - .../java/freemarker/core/BuiltInsForDates.java | 214 -- .../java/freemarker/core/BuiltInsForHashes.java | 58 - .../core/BuiltInsForLoopVariables.java | 156 - .../core/BuiltInsForMarkupOutputs.java | 40 - .../core/BuiltInsForMultipleTypes.java | 759 ----- .../java/freemarker/core/BuiltInsForNodes.java | 154 - .../freemarker/core/BuiltInsForNumbers.java | 320 -- .../core/BuiltInsForOutputFormatRelated.java | 83 - .../freemarker/core/BuiltInsForSequences.java | 861 ----- .../core/BuiltInsForStringsBasic.java | 684 ---- .../core/BuiltInsForStringsEncoding.java | 201 -- .../freemarker/core/BuiltInsForStringsMisc.java | 125 - .../core/BuiltInsForStringsRegexp.java | 305 -- .../core/BuiltInsWithParseTimeParameters.java | 158 - .../java/freemarker/core/BuiltinVariable.java | 305 -- .../java/freemarker/core/CSSOutputFormat.java | 52 - ...lPlaceCustomDataInitializationException.java | 33 - src/main/java/freemarker/core/Case.java | 91 - .../freemarker/core/CollectionAndSequence.java | 104 - .../core/CombinedMarkupOutputFormat.java | 106 - src/main/java/freemarker/core/Comment.java | 91 - .../core/CommonMarkupOutputFormat.java | 124 - .../core/CommonTemplateMarkupOutputModel.java | 66 - .../freemarker/core/ComparisonExpression.java | 104 - .../java/freemarker/core/CompressedBlock.java | 86 - .../java/freemarker/core/ConditionalBlock.java | 114 - src/main/java/freemarker/core/Configurable.java | 2945 ---------------- .../java/freemarker/core/CustomAttribute.java | 265 -- src/main/java/freemarker/core/DebugBreak.java | 94 - .../freemarker/core/DefaultToExpression.java | 138 - .../freemarker/core/DirectiveCallPlace.java | 138 - .../java/freemarker/core/DollarVariable.java | 149 - src/main/java/freemarker/core/Dot.java | 93 - .../java/freemarker/core/DynamicKeyName.java | 294 -- src/main/java/freemarker/core/ElseOfList.java | 77 - src/main/java/freemarker/core/Environment.java | 3048 ----------------- src/main/java/freemarker/core/EscapeBlock.java | 111 - src/main/java/freemarker/core/EvalUtil.java | 540 --- .../java/freemarker/core/ExistenceBuiltins.java | 132 - .../java/freemarker/core/ExistsExpression.java | 90 - src/main/java/freemarker/core/Expression.java | 218 -- .../core/ExtendedDecimalFormatParser.java | 523 --- .../freemarker/core/FallbackInstruction.java | 69 - .../java/freemarker/core/FlushInstruction.java | 65 - .../java/freemarker/core/FreeMarkerTree.java | 117 - .../java/freemarker/core/HTMLOutputFormat.java | 75 - src/main/java/freemarker/core/HashLiteral.java | 241 -- .../java/freemarker/core/ICIChainMember.java | 41 - .../core/ISOLikeTemplateDateFormat.java | 262 -- .../core/ISOLikeTemplateDateFormatFactory.java | 52 - .../freemarker/core/ISOTemplateDateFormat.java | 87 - .../core/ISOTemplateDateFormatFactory.java | 43 - src/main/java/freemarker/core/Identifier.java | 105 - src/main/java/freemarker/core/IfBlock.java | 109 - src/main/java/freemarker/core/Include.java | 259 -- .../java/freemarker/core/Interpolation.java | 48 - src/main/java/freemarker/core/Interpret.java | 156 - .../core/InvalidFormatParametersException.java | 37 - .../core/InvalidFormatStringException.java | 37 - .../core/InvalidReferenceException.java | 169 - src/main/java/freemarker/core/Items.java | 120 - .../java/freemarker/core/IteratorBlock.java | 475 --- .../java/freemarker/core/JSONOutputFormat.java | 52 - .../freemarker/core/JavaScriptOutputFormat.java | 53 - .../freemarker/core/JavaTemplateDateFormat.java | 72 - .../core/JavaTemplateDateFormatFactory.java | 175 - .../core/JavaTemplateNumberFormat.java | 66 - .../core/JavaTemplateNumberFormatFactory.java | 121 - src/main/java/freemarker/core/LibraryLoad.java | 130 - .../java/freemarker/core/ListElseContainer.java | 87 - src/main/java/freemarker/core/ListLiteral.java | 196 -- .../core/ListableRightUnboundedRangeModel.java | 93 - src/main/java/freemarker/core/LocalContext.java | 38 - .../java/freemarker/core/LocalContextStack.java | 57 - src/main/java/freemarker/core/Macro.java | 329 -- ...eleaserTemplateSpecifiedEncodingHandler.java | 55 - .../freemarker/core/MarkupOutputFormat.java | 132 - .../core/MarkupOutputFormatBoundBuiltIn.java | 46 - src/main/java/freemarker/core/MessageUtil.java | 352 -- src/main/java/freemarker/core/MethodCall.java | 149 - src/main/java/freemarker/core/MiscUtil.java | 68 - src/main/java/freemarker/core/MixedContent.java | 118 - .../NestedContentNotSupportedException.java | 68 - src/main/java/freemarker/core/NewBI.java | 72 - .../java/freemarker/core/NoAutoEscBlock.java | 79 - .../java/freemarker/core/NoEscapeBlock.java | 79 - .../freemarker/core/NonBooleanException.java | 62 - .../java/freemarker/core/NonDateException.java | 58 - .../core/NonExtendedHashException.java | 62 - .../core/NonExtendedNodeException.java | 64 - .../java/freemarker/core/NonHashException.java | 64 - .../NonListableRightUnboundedRangeModel.java | 39 - .../core/NonMarkupOutputException.java | 63 - .../freemarker/core/NonMethodException.java | 64 - .../freemarker/core/NonNamespaceException.java | 63 - .../java/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 | 77 - .../NonUserDefinedDirectiveLikeException.java | 67 - .../java/freemarker/core/NotExpression.java | 75 - .../java/freemarker/core/NumberLiteral.java | 93 - .../java/freemarker/core/NumericalOutput.java | 173 - .../core/OptInTemplateClassResolver.java | 158 - src/main/java/freemarker/core/OrExpression.java | 81 - src/main/java/freemarker/core/OutputFormat.java | 84 - .../java/freemarker/core/OutputFormatBlock.java | 87 - .../core/OutputFormatBoundBuiltIn.java | 48 - .../java/freemarker/core/ParameterRole.java | 93 - .../core/ParentheticalExpression.java | 86 - .../java/freemarker/core/ParseException.java | 560 --- .../freemarker/core/ParserConfiguration.java | 80 - .../core/ParsingNotSupportedException.java | 37 - .../freemarker/core/PlainTextOutputFormat.java | 56 - .../java/freemarker/core/PropertySetting.java | 173 - .../java/freemarker/core/RTFOutputFormat.java | 75 - src/main/java/freemarker/core/Range.java | 122 - src/main/java/freemarker/core/RangeModel.java | 58 - .../java/freemarker/core/RecoveryBlock.java | 74 - src/main/java/freemarker/core/RecurseNode.java | 132 - src/main/java/freemarker/core/RegexpHelper.java | 209 -- .../java/freemarker/core/ReturnInstruction.java | 93 - .../core/RightUnboundedRangeModel.java | 48 - src/main/java/freemarker/core/Sep.java | 90 - .../java/freemarker/core/SpecialBuiltIn.java | 27 - .../java/freemarker/core/StopException.java | 66 - .../java/freemarker/core/StopInstruction.java | 83 - .../freemarker/core/StringArraySequence.java | 58 - .../java/freemarker/core/StringLiteral.java | 207 -- src/main/java/freemarker/core/SwitchBlock.java | 132 - .../freemarker/core/TemplateClassResolver.java | 84 - .../core/TemplateCombinedMarkupOutputModel.java | 50 - .../freemarker/core/TemplateConfiguration.java | 645 ---- .../freemarker/core/TemplateDateFormat.java | 108 - .../core/TemplateDateFormatFactory.java | 92 - .../java/freemarker/core/TemplateElement.java | 509 --- .../core/TemplateElementArrayBuilder.java | 102 - .../core/TemplateElementsToVisit.java | 48 - .../freemarker/core/TemplateFormatUtil.java | 76 - .../core/TemplateHTMLOutputModel.java | 40 - .../core/TemplateMarkupOutputModel.java | 52 - .../freemarker/core/TemplateNumberFormat.java | 90 - .../core/TemplateNumberFormatFactory.java | 64 - .../java/freemarker/core/TemplateObject.java | 247 -- .../freemarker/core/TemplatePostProcessor.java | 34 - .../core/TemplatePostProcessorException.java | 35 - .../freemarker/core/TemplateRTFOutputModel.java | 40 - .../core/TemplateSpecifiedEncodingHandler.java | 61 - .../freemarker/core/TemplateValueFormat.java | 33 - .../core/TemplateValueFormatException.java | 37 - .../core/TemplateValueFormatFactory.java | 28 - .../core/TemplateXHTMLOutputModel.java | 40 - .../freemarker/core/TemplateXMLOutputModel.java | 40 - src/main/java/freemarker/core/TextBlock.java | 410 --- ...nterruptionSupportTemplatePostProcessor.java | 141 - .../java/freemarker/core/TokenMgrError.java | 263 -- .../java/freemarker/core/TransformBlock.java | 168 - .../java/freemarker/core/TrimInstruction.java | 110 - .../core/UnaryPlusMinusExpression.java | 106 - .../core/UndefinedCustomFormatException.java | 34 - .../freemarker/core/UndefinedOutputFormat.java | 57 - .../core/UnexpectedTypeException.java | 110 - .../core/UnformattableValueException.java | 41 - src/main/java/freemarker/core/UnifiedCall.java | 341 -- ...nDateTypeFormattingUnsupportedException.java | 35 - ...nownDateTypeParsingUnsupportedException.java | 36 - .../core/UnparsableValueException.java | 38 - .../core/UnregisteredOutputFormatException.java | 34 - src/main/java/freemarker/core/VisitNode.java | 128 - .../java/freemarker/core/XHTMLOutputFormat.java | 75 - .../java/freemarker/core/XMLOutputFormat.java | 75 - .../freemarker/core/XSTemplateDateFormat.java | 91 - .../core/XSTemplateDateFormatFactory.java | 43 - .../java/freemarker/core/_ArrayEnumeration.java | 49 - .../java/freemarker/core/_ArrayIterator.java | 51 - src/main/java/freemarker/core/_CoreAPI.java | 223 -- .../java/freemarker/core/_CoreLocaleUtils.java | 45 - .../java/freemarker/core/_CoreStringUtils.java | 125 - .../java/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 | 36 - .../java/freemarker/core/_DelayedJQuote.java | 36 - .../freemarker/core/_DelayedJoinWithComma.java | 48 - .../java/freemarker/core/_DelayedOrdinal.java | 47 - .../freemarker/core/_DelayedShortClassName.java | 35 - .../java/freemarker/core/_DelayedToString.java | 37 - .../core/_ErrorDescriptionBuilder.java | 362 -- src/main/java/freemarker/core/_Java6.java | 35 - src/main/java/freemarker/core/_Java6Impl.java | 45 - .../java/freemarker/core/_JavaVersions.java | 78 - .../freemarker/core/_MiscTemplateException.java | 126 - ...ObjectBuilderSettingEvaluationException.java | 46 - .../core/_ObjectBuilderSettingEvaluator.java | 1117 ------ ..._ParserConfigurationWithInheritedFormat.java | 84 - .../core/_SettingEvaluationEnvironment.java | 62 - .../java/freemarker/core/_SortedArraySet.java | 80 - .../core/_TemplateModelException.java | 133 - .../java/freemarker/core/_TimeZoneBuilder.java | 43 - ...expectedTypeErrorExplainerTemplateModel.java | 36 - .../core/_UnmodifiableCompositeSet.java | 95 - .../java/freemarker/core/_UnmodifiableSet.java | 47 - src/main/java/freemarker/core/package.html | 26 - src/main/java/freemarker/debug/Breakpoint.java | 82 - src/main/java/freemarker/debug/DebugModel.java | 105 - .../freemarker/debug/DebuggedEnvironment.java | 56 - src/main/java/freemarker/debug/Debugger.java | 95 - .../java/freemarker/debug/DebuggerClient.java | 140 - .../java/freemarker/debug/DebuggerListener.java | 36 - .../debug/EnvironmentSuspendedEvent.java | 67 - .../freemarker/debug/impl/DebuggerServer.java | 129 - .../freemarker/debug/impl/DebuggerService.java | 93 - .../debug/impl/RmiDebugModelImpl.java | 152 - .../debug/impl/RmiDebuggedEnvironmentImpl.java | 343 -- .../freemarker/debug/impl/RmiDebuggerImpl.java | 81 - .../debug/impl/RmiDebuggerListenerImpl.java | 68 - .../debug/impl/RmiDebuggerService.java | 396 --- src/main/java/freemarker/debug/package.html | 27 - .../java/freemarker/ext/beans/APIModel.java | 45 - .../freemarker/ext/beans/ArgumentTypes.java | 735 ---- .../java/freemarker/ext/beans/ArrayModel.java | 120 - .../java/freemarker/ext/beans/BeanModel.java | 365 -- .../freemarker/ext/beans/BeansModelCache.java | 74 - .../java/freemarker/ext/beans/BeansWrapper.java | 1812 ---------- .../ext/beans/BeansWrapperBuilder.java | 159 - .../ext/beans/BeansWrapperConfiguration.java | 234 -- .../ext/beans/BeansWrapperSingletonHolder.java | 33 - .../java/freemarker/ext/beans/BooleanModel.java | 39 - .../ext/beans/CallableMemberDescriptor.java | 56 - .../freemarker/ext/beans/CharacterOrString.java | 45 - .../ext/beans/ClassBasedModelFactory.java | 146 - .../ext/beans/ClassChangeNotifier.java | 32 - .../freemarker/ext/beans/ClassIntrospector.java | 823 ----- .../ext/beans/ClassIntrospectorBuilder.java | 199 -- .../freemarker/ext/beans/CollectionAdapter.java | 84 - .../freemarker/ext/beans/CollectionModel.java | 107 - .../java/freemarker/ext/beans/DateModel.java | 77 - .../beans/EmptyCallableMemberDescriptor.java | 35 - .../ext/beans/EmptyMemberAndArguments.java | 93 - .../freemarker/ext/beans/EnumerationModel.java | 105 - .../java/freemarker/ext/beans/HashAdapter.java | 173 - .../ext/beans/InvalidPropertyException.java | 34 - .../freemarker/ext/beans/IteratorModel.java | 109 - .../ext/beans/JRebelClassChangeNotifier.java | 56 - .../java/freemarker/ext/beans/MapModel.java | 119 - .../MaybeEmptyCallableMemberDescriptor.java | 25 - .../ext/beans/MaybeEmptyMemberAndArguments.java | 22 - .../ext/beans/MemberAndArguments.java | 64 - .../ext/beans/MethodAppearanceFineTuner.java | 94 - .../java/freemarker/ext/beans/MethodSorter.java | 32 - .../NonPrimitiveArrayBackedReadOnlyList.java | 42 - .../java/freemarker/ext/beans/NumberModel.java | 59 - .../ext/beans/OverloadedFixArgsMethods.java | 103 - .../freemarker/ext/beans/OverloadedMethods.java | 276 -- .../ext/beans/OverloadedMethodsModel.java | 80 - .../ext/beans/OverloadedMethodsSubset.java | 427 --- .../ext/beans/OverloadedNumberUtil.java | 1288 ------- .../ext/beans/OverloadedVarArgsMethods.java | 251 -- .../beans/PrimtiveArrayBackedReadOnlyList.java | 47 - .../ReflectionCallableMemberDescriptor.java | 95 - .../ext/beans/ResourceBundleModel.java | 189 -- .../freemarker/ext/beans/SequenceAdapter.java | 67 - .../java/freemarker/ext/beans/SetAdapter.java | 32 - .../freemarker/ext/beans/SimpleMapModel.java | 122 - .../java/freemarker/ext/beans/SimpleMethod.java | 175 - .../freemarker/ext/beans/SimpleMethodModel.java | 130 - .../ext/beans/SingletonCustomizer.java | 51 - .../java/freemarker/ext/beans/StaticModel.java | 178 - .../java/freemarker/ext/beans/StaticModels.java | 43 - .../java/freemarker/ext/beans/StringModel.java | 62 - .../java/freemarker/ext/beans/TypeFlags.java | 130 - .../freemarker/ext/beans/UnsafeMethods.java | 114 - .../java/freemarker/ext/beans/_BeansAPI.java | 222 -- .../java/freemarker/ext/beans/_EnumModels.java | 54 - .../java/freemarker/ext/beans/_MethodUtil.java | 294 -- src/main/java/freemarker/ext/beans/package.html | 40 - src/main/java/freemarker/ext/dom/AtAtKey.java | 58 - .../freemarker/ext/dom/AttributeNodeModel.java | 67 - .../ext/dom/CharacterDataNodeModel.java | 44 - .../java/freemarker/ext/dom/DocumentModel.java | 75 - .../freemarker/ext/dom/DocumentTypeModel.java | 55 - .../java/freemarker/ext/dom/DomStringUtil.java | 93 - .../java/freemarker/ext/dom/ElementModel.java | 231 -- .../freemarker/ext/dom/JaxenXPathSupport.java | 235 -- .../java/freemarker/ext/dom/NodeListModel.java | 233 -- src/main/java/freemarker/ext/dom/NodeModel.java | 791 ----- .../java/freemarker/ext/dom/NodeOutputter.java | 259 -- .../java/freemarker/ext/dom/PINodeModel.java | 43 - .../ext/dom/SunInternalXalanXPathSupport.java | 159 - .../java/freemarker/ext/dom/XPathSupport.java | 30 - .../freemarker/ext/dom/XalanXPathSupport.java | 159 - .../java/freemarker/ext/dom/_ExtDomApi.java | 43 - src/main/java/freemarker/ext/dom/package.html | 31 - .../ext/jsp/CustomTagAndELFunctionCombiner.java | 210 -- .../freemarker/ext/jsp/EventForwarding.java | 200 -- .../jsp/FreeMarkerJspApplicationContext.java | 166 - .../ext/jsp/FreeMarkerJspFactory.java | 63 - .../ext/jsp/FreeMarkerJspFactory21.java | 51 - .../ext/jsp/FreeMarkerPageContext.java | 492 --- .../java/freemarker/ext/jsp/FreemarkerTag.java | 129 - .../freemarker/ext/jsp/JspContextModel.java | 54 - .../freemarker/ext/jsp/JspTagModelBase.java | 167 - .../freemarker/ext/jsp/JspWriterAdapter.java | 188 - .../freemarker/ext/jsp/PageContextFactory.java | 66 - .../ext/jsp/SimpleTagDirectiveModel.java | 110 - .../freemarker/ext/jsp/TagTransformModel.java | 420 --- .../java/freemarker/ext/jsp/TaglibFactory.java | 2020 ----------- .../freemarker/ext/jsp/TaglibMethodUtil.java | 117 - .../ext/jsp/_FreeMarkerPageContext21.java | 122 - src/main/java/freemarker/ext/jsp/package.html | 29 - src/main/java/freemarker/ext/package.html | 25 - .../ext/servlet/AllHttpScopesHashModel.java | 114 - .../ext/servlet/FreemarkerServlet.java | 1674 --------- .../ext/servlet/HttpRequestHashModel.java | 106 - .../servlet/HttpRequestParametersHashModel.java | 95 - .../ext/servlet/HttpSessionHashModel.java | 111 - .../freemarker/ext/servlet/IncludePage.java | 253 -- .../freemarker/ext/servlet/InitParamParser.java | 268 -- .../ext/servlet/ServletContextHashModel.java | 72 - .../java/freemarker/ext/servlet/package.html | 25 - .../freemarker/ext/util/IdentityHashMap.java | 839 ----- .../java/freemarker/ext/util/ModelCache.java | 143 - .../java/freemarker/ext/util/ModelFactory.java | 34 - .../ext/util/WrapperTemplateModel.java | 35 - src/main/java/freemarker/ext/util/package.html | 23 - .../template/AdapterTemplateModel.java | 49 - .../java/freemarker/template/Configuration.java | 3189 ----------------- .../template/DefaultArrayAdapter.java | 339 -- .../template/DefaultIterableAdapter.java | 86 - .../template/DefaultIteratorAdapter.java | 118 - .../freemarker/template/DefaultListAdapter.java | 108 - .../freemarker/template/DefaultMapAdapter.java | 153 - .../DefaultNonListCollectionAdapter.java | 112 - .../template/DefaultObjectWrapper.java | 365 -- .../template/DefaultObjectWrapperBuilder.java | 82 - .../DefaultObjectWrapperConfiguration.java | 102 - .../DefaultUnassignableIteratorAdapter.java | 52 - src/main/java/freemarker/template/EmptyMap.java | 90 - .../template/FalseTemplateBooleanModel.java | 35 - .../template/GeneralPurposeNothing.java | 80 - .../freemarker/template/LocalizedString.java | 54 - .../MalformedTemplateNameException.java | 56 - .../template/MapKeyValuePairIterator.java | 69 - .../java/freemarker/template/ObjectWrapper.java | 99 - .../template/ObjectWrapperAndUnwrapper.java | 92 - .../template/ResourceBundleLocalizedString.java | 54 - .../SerializableTemplateBooleanModel.java | 24 - .../freemarker/template/SimpleCollection.java | 150 - .../java/freemarker/template/SimpleDate.java | 79 - .../java/freemarker/template/SimpleHash.java | 418 --- .../java/freemarker/template/SimpleNumber.java | 74 - .../template/SimpleObjectWrapper.java | 65 - .../java/freemarker/template/SimpleScalar.java | 70 - .../freemarker/template/SimpleSequence.java | 299 -- src/main/java/freemarker/template/Template.java | 1088 ------ .../template/TemplateBooleanModel.java | 47 - .../template/TemplateCollectionModel.java | 48 - .../template/TemplateCollectionModelEx.java | 57 - .../freemarker/template/TemplateDateModel.java | 75 - .../template/TemplateDirectiveBody.java | 43 - .../template/TemplateDirectiveModel.java | 68 - .../freemarker/template/TemplateException.java | 661 ---- .../template/TemplateExceptionHandler.java | 155 - .../freemarker/template/TemplateHashModel.java | 41 - .../template/TemplateHashModelEx.java | 49 - .../template/TemplateHashModelEx2.java | 80 - .../template/TemplateMethodModel.java | 60 - .../template/TemplateMethodModelEx.java | 53 - .../java/freemarker/template/TemplateModel.java | 54 - .../template/TemplateModelAdapter.java | 34 - .../template/TemplateModelException.java | 110 - .../template/TemplateModelIterator.java | 39 - .../template/TemplateModelListSequence.java | 52 - .../template/TemplateModelWithAPISupport.java | 41 - .../freemarker/template/TemplateNodeModel.java | 78 - .../template/TemplateNodeModelEx.java | 40 - .../template/TemplateNotFoundException.java | 61 - .../template/TemplateNumberModel.java | 42 - .../template/TemplateScalarModel.java | 43 - .../template/TemplateSequenceModel.java | 48 - .../template/TemplateTransformModel.java | 54 - .../freemarker/template/TransformControl.java | 99 - .../template/TrueTemplateBooleanModel.java | 35 - src/main/java/freemarker/template/Version.java | 297 -- .../template/WrappingTemplateModel.java | 115 - .../java/freemarker/template/_TemplateAPI.java | 148 - src/main/java/freemarker/template/package.html | 27 - .../template/utility/CaptureOutput.java | 147 - .../freemarker/template/utility/ClassUtil.java | 382 --- .../template/utility/CollectionUtils.java | 36 - .../template/utility/Collections12.java | 48 - .../freemarker/template/utility/Constants.java | 122 - .../template/utility/DOMNodeModel.java | 268 -- .../freemarker/template/utility/DateUtil.java | 911 ----- .../freemarker/template/utility/DeepUnwrap.java | 162 - .../freemarker/template/utility/HtmlEscape.java | 107 - .../template/utility/NormalizeNewlines.java | 113 - .../template/utility/NullArgumentException.java | 59 - .../freemarker/template/utility/NullWriter.java | 90 - .../freemarker/template/utility/NumberUtil.java | 170 - .../template/utility/ObjectFactory.java | 31 - .../utility/ObjectWrapperWithAPISupport.java | 51 - .../template/utility/OptimizerUtil.java | 97 - .../template/utility/RichObjectWrapper.java | 37 - .../template/utility/SecurityUtilities.java | 85 - .../template/utility/StandardCompress.java | 237 -- .../freemarker/template/utility/StringUtil.java | 2126 ------------ .../utility/UndeclaredThrowableException.java | 43 - .../utility/UnrecognizedTimeZoneException.java | 38 - .../UnsupportedNumberClassException.java | 38 - .../template/utility/WriteProtectable.java | 37 - .../freemarker/template/utility/XmlEscape.java | 90 - .../freemarker/template/utility/package.html | 25 - .../apache/freemarker/core/Configuration.java | 3201 ++++++++++++++++++ .../org/apache/freemarker/core/Template.java | 1093 ++++++ .../freemarker/core/TemplateException.java | 661 ++++ .../core/TemplateExceptionHandler.java | 155 + .../core/TemplateNotFoundException.java | 63 + .../org/apache/freemarker/core/Version.java | 297 ++ .../org/apache/freemarker/core/_CoreLogs.java | 45 + .../apache/freemarker/core/_TemplateAPI.java | 143 + .../ast/APINotSupportedTemplateException.java | 76 + .../core/ast/AddConcatExpression.java | 306 ++ ...AliasTargetTemplateValueFormatException.java | 36 + .../ast/AliasTemplateDateFormatFactory.java | 91 + .../ast/AliasTemplateNumberFormatFactory.java | 90 + .../freemarker/core/ast/AndExpression.java | 81 + .../freemarker/core/ast/ArithmeticEngine.java | 550 +++ .../core/ast/ArithmeticExpression.java | 129 + .../apache/freemarker/core/ast/Assignment.java | 279 ++ .../core/ast/AssignmentInstruction.java | 117 + .../freemarker/core/ast/AttemptBlock.java | 89 + .../freemarker/core/ast/AutoEscBlock.java | 79 + .../BackwardCompatibleTemplateNumberFormat.java | 30 + .../freemarker/core/ast/BlockAssignment.java | 183 + .../freemarker/core/ast/BodyInstruction.java | 158 + .../freemarker/core/ast/BooleanExpression.java | 32 + .../freemarker/core/ast/BooleanLiteral.java | 88 + .../freemarker/core/ast/BoundedRangeModel.java | 69 + .../freemarker/core/ast/BreakInstruction.java | 70 + .../freemarker/core/ast/BugException.java | 52 + .../org/apache/freemarker/core/ast/BuiltIn.java | 495 +++ .../core/ast/BuiltInBannedWhenAutoEscaping.java | 27 + .../freemarker/core/ast/BuiltInForDate.java | 57 + .../freemarker/core/ast/BuiltInForHashEx.java | 56 + .../core/ast/BuiltInForLegacyEscaping.java | 48 + .../core/ast/BuiltInForLoopVariable.java | 49 + .../core/ast/BuiltInForMarkupOutput.java | 40 + .../freemarker/core/ast/BuiltInForNode.java | 40 + .../freemarker/core/ast/BuiltInForNodeEx.java | 38 + .../freemarker/core/ast/BuiltInForNumber.java | 36 + .../freemarker/core/ast/BuiltInForSequence.java | 39 + .../freemarker/core/ast/BuiltInForString.java | 37 + .../ast/BuiltInWithParseTimeParameters.java | 111 + .../freemarker/core/ast/BuiltInsForDates.java | 214 ++ .../freemarker/core/ast/BuiltInsForHashes.java | 58 + .../core/ast/BuiltInsForLoopVariables.java | 156 + .../core/ast/BuiltInsForMarkupOutputs.java | 40 + .../core/ast/BuiltInsForMultipleTypes.java | 759 +++++ .../freemarker/core/ast/BuiltInsForNodes.java | 155 + .../freemarker/core/ast/BuiltInsForNumbers.java | 320 ++ .../ast/BuiltInsForOutputFormatRelated.java | 83 + .../core/ast/BuiltInsForSequences.java | 861 +++++ .../core/ast/BuiltInsForStringsBasic.java | 699 ++++ .../core/ast/BuiltInsForStringsEncoding.java | 201 ++ .../core/ast/BuiltInsForStringsMisc.java | 129 + .../core/ast/BuiltInsForStringsRegexp.java | 305 ++ .../ast/BuiltInsWithParseTimeParameters.java | 159 + .../freemarker/core/ast/BuiltinVariable.java | 307 ++ .../freemarker/core/ast/CSSOutputFormat.java | 52 + ...lPlaceCustomDataInitializationException.java | 33 + .../org/apache/freemarker/core/ast/Case.java | 91 + .../core/ast/CollectionAndSequence.java | 104 + .../core/ast/CombinedMarkupOutputFormat.java | 106 + .../org/apache/freemarker/core/ast/Comment.java | 91 + .../core/ast/CommonMarkupOutputFormat.java | 124 + .../ast/CommonTemplateMarkupOutputModel.java | 66 + .../core/ast/ComparisonExpression.java | 104 + .../freemarker/core/ast/CompressedBlock.java | 86 + .../freemarker/core/ast/ConditionalBlock.java | 114 + .../freemarker/core/ast/Configurable.java | 2945 ++++++++++++++++ .../freemarker/core/ast/CustomAttribute.java | 265 ++ .../apache/freemarker/core/ast/DebugBreak.java | 94 + .../core/ast/DefaultToExpression.java | 138 + .../freemarker/core/ast/DirectiveCallPlace.java | 139 + .../freemarker/core/ast/DollarVariable.java | 149 + .../org/apache/freemarker/core/ast/Dot.java | 93 + .../freemarker/core/ast/DynamicKeyName.java | 294 ++ .../apache/freemarker/core/ast/ElseOfList.java | 77 + .../apache/freemarker/core/ast/Environment.java | 3048 +++++++++++++++++ .../apache/freemarker/core/ast/EscapeBlock.java | 111 + .../apache/freemarker/core/ast/EvalUtil.java | 540 +++ .../freemarker/core/ast/ExistenceBuiltins.java | 132 + .../freemarker/core/ast/ExistsExpression.java | 90 + .../apache/freemarker/core/ast/Expression.java | 218 ++ .../core/ast/ExtendedDecimalFormatParser.java | 523 +++ .../core/ast/FallbackInstruction.java | 69 + .../freemarker/core/ast/FlushInstruction.java | 65 + .../freemarker/core/ast/FreeMarkerTree.java | 117 + .../freemarker/core/ast/HTMLOutputFormat.java | 75 + .../apache/freemarker/core/ast/HashLiteral.java | 241 ++ .../freemarker/core/ast/ICIChainMember.java | 41 + .../core/ast/ISOLikeTemplateDateFormat.java | 263 ++ .../ast/ISOLikeTemplateDateFormatFactory.java | 52 + .../core/ast/ISOTemplateDateFormat.java | 87 + .../core/ast/ISOTemplateDateFormatFactory.java | 43 + .../apache/freemarker/core/ast/Identifier.java | 105 + .../org/apache/freemarker/core/ast/IfBlock.java | 109 + .../org/apache/freemarker/core/ast/Include.java | 259 ++ .../freemarker/core/ast/Interpolation.java | 48 + .../apache/freemarker/core/ast/Interpret.java | 156 + .../ast/InvalidFormatParametersException.java | 37 + .../core/ast/InvalidFormatStringException.java | 37 + .../core/ast/InvalidReferenceException.java | 169 + .../org/apache/freemarker/core/ast/Items.java | 120 + .../freemarker/core/ast/IteratorBlock.java | 475 +++ .../freemarker/core/ast/JSONOutputFormat.java | 52 + .../core/ast/JavaScriptOutputFormat.java | 53 + .../core/ast/JavaTemplateDateFormat.java | 72 + .../core/ast/JavaTemplateDateFormatFactory.java | 174 + .../core/ast/JavaTemplateNumberFormat.java | 66 + .../ast/JavaTemplateNumberFormatFactory.java | 121 + .../apache/freemarker/core/ast/LibraryLoad.java | 130 + .../freemarker/core/ast/ListElseContainer.java | 87 + .../apache/freemarker/core/ast/ListLiteral.java | 196 ++ .../ast/ListableRightUnboundedRangeModel.java | 93 + .../freemarker/core/ast/LocalContext.java | 38 + .../freemarker/core/ast/LocalContextStack.java | 57 + .../org/apache/freemarker/core/ast/Macro.java | 329 ++ ...eleaserTemplateSpecifiedEncodingHandler.java | 55 + .../freemarker/core/ast/MarkupOutputFormat.java | 132 + .../ast/MarkupOutputFormatBoundBuiltIn.java | 46 + .../apache/freemarker/core/ast/MessageUtil.java | 352 ++ .../apache/freemarker/core/ast/MethodCall.java | 149 + .../apache/freemarker/core/ast/MiscUtil.java | 68 + .../freemarker/core/ast/MixedContent.java | 118 + .../ast/NestedContentNotSupportedException.java | 68 + .../org/apache/freemarker/core/ast/NewBI.java | 74 + .../freemarker/core/ast/NoAutoEscBlock.java | 79 + .../freemarker/core/ast/NoEscapeBlock.java | 79 + .../core/ast/NonBooleanException.java | 62 + .../freemarker/core/ast/NonDateException.java | 58 + .../core/ast/NonExtendedHashException.java | 62 + .../core/ast/NonExtendedNodeException.java | 64 + .../freemarker/core/ast/NonHashException.java | 64 + .../NonListableRightUnboundedRangeModel.java | 39 + .../core/ast/NonMarkupOutputException.java | 63 + .../freemarker/core/ast/NonMethodException.java | 64 + .../core/ast/NonNamespaceException.java | 63 + .../freemarker/core/ast/NonNodeException.java | 64 + .../core/ast/NonNumericalException.java | 74 + .../core/ast/NonSequenceException.java | 64 + .../ast/NonSequenceOrCollectionException.java | 92 + .../freemarker/core/ast/NonStringException.java | 74 + .../ast/NonStringOrTemplateOutputException.java | 77 + .../NonUserDefinedDirectiveLikeException.java | 67 + .../freemarker/core/ast/NotExpression.java | 75 + .../freemarker/core/ast/NumberLiteral.java | 93 + .../freemarker/core/ast/NumericalOutput.java | 173 + .../core/ast/OptInTemplateClassResolver.java | 158 + .../freemarker/core/ast/OrExpression.java | 81 + .../freemarker/core/ast/OutputFormat.java | 84 + .../freemarker/core/ast/OutputFormatBlock.java | 87 + .../core/ast/OutputFormatBoundBuiltIn.java | 48 + .../freemarker/core/ast/ParameterRole.java | 93 + .../core/ast/ParentheticalExpression.java | 86 + .../freemarker/core/ast/ParseException.java | 562 +++ .../core/ast/ParserConfiguration.java | 80 + .../core/ast/ParsingNotSupportedException.java | 37 + .../core/ast/PlainTextOutputFormat.java | 56 + .../freemarker/core/ast/PropertySetting.java | 175 + .../freemarker/core/ast/RTFOutputFormat.java | 75 + .../org/apache/freemarker/core/ast/Range.java | 122 + .../apache/freemarker/core/ast/RangeModel.java | 58 + .../freemarker/core/ast/RecoveryBlock.java | 74 + .../apache/freemarker/core/ast/RecurseNode.java | 132 + .../freemarker/core/ast/RegexpHelper.java | 208 ++ .../freemarker/core/ast/ReturnInstruction.java | 93 + .../core/ast/RightUnboundedRangeModel.java | 48 + .../org/apache/freemarker/core/ast/Sep.java | 90 + .../freemarker/core/ast/SpecialBuiltIn.java | 27 + .../freemarker/core/ast/StopException.java | 66 + .../freemarker/core/ast/StopInstruction.java | 83 + .../core/ast/StringArraySequence.java | 58 + .../freemarker/core/ast/StringLiteral.java | 210 ++ .../apache/freemarker/core/ast/SwitchBlock.java | 132 + .../core/ast/TemplateClassResolver.java | 84 + .../ast/TemplateCombinedMarkupOutputModel.java | 50 + .../core/ast/TemplateConfiguration.java | 645 ++++ .../freemarker/core/ast/TemplateDateFormat.java | 108 + .../core/ast/TemplateDateFormatFactory.java | 92 + .../freemarker/core/ast/TemplateElement.java | 509 +++ .../core/ast/TemplateElementArrayBuilder.java | 102 + .../core/ast/TemplateElementsToVisit.java | 48 + .../freemarker/core/ast/TemplateFormatUtil.java | 76 + .../core/ast/TemplateHTMLOutputModel.java | 40 + .../core/ast/TemplateMarkupOutputModel.java | 52 + .../core/ast/TemplateNumberFormat.java | 90 + .../core/ast/TemplateNumberFormatFactory.java | 64 + .../freemarker/core/ast/TemplateObject.java | 248 ++ .../core/ast/TemplatePostProcessor.java | 34 + .../ast/TemplatePostProcessorException.java | 35 + .../core/ast/TemplateRTFOutputModel.java | 40 + .../ast/TemplateSpecifiedEncodingHandler.java | 61 + .../core/ast/TemplateValueFormat.java | 33 + .../core/ast/TemplateValueFormatException.java | 37 + .../core/ast/TemplateValueFormatFactory.java | 28 + .../core/ast/TemplateXHTMLOutputModel.java | 40 + .../core/ast/TemplateXMLOutputModel.java | 40 + .../apache/freemarker/core/ast/TextBlock.java | 410 +++ ...nterruptionSupportTemplatePostProcessor.java | 142 + .../freemarker/core/ast/TokenMgrError.java | 263 ++ .../freemarker/core/ast/TransformBlock.java | 168 + .../freemarker/core/ast/TrimInstruction.java | 110 + .../core/ast/UnaryPlusMinusExpression.java | 106 + .../ast/UndefinedCustomFormatException.java | 34 + .../core/ast/UndefinedOutputFormat.java | 57 + .../core/ast/UnexpectedTypeException.java | 110 + .../core/ast/UnformattableValueException.java | 41 + .../apache/freemarker/core/ast/UnifiedCall.java | 344 ++ ...nDateTypeFormattingUnsupportedException.java | 35 + ...nownDateTypeParsingUnsupportedException.java | 36 + .../core/ast/UnparsableValueException.java | 38 + .../ast/UnregisteredOutputFormatException.java | 34 + .../apache/freemarker/core/ast/VisitNode.java | 128 + .../freemarker/core/ast/XHTMLOutputFormat.java | 75 + .../freemarker/core/ast/XMLOutputFormat.java | 75 + .../core/ast/XSTemplateDateFormat.java | 91 + .../core/ast/XSTemplateDateFormatFactory.java | 43 + .../freemarker/core/ast/_ArrayEnumeration.java | 49 + .../freemarker/core/ast/_ArrayIterator.java | 51 + .../apache/freemarker/core/ast/_CoreAPI.java | 224 ++ .../freemarker/core/ast/_CoreLocaleUtils.java | 45 + .../freemarker/core/ast/_CoreStringUtils.java | 125 + .../freemarker/core/ast/_DelayedAOrAn.java | 35 + .../core/ast/_DelayedConversionToString.java | 52 + .../core/ast/_DelayedFTLTypeDescription.java | 37 + .../core/ast/_DelayedGetCanonicalForm.java | 39 + .../freemarker/core/ast/_DelayedGetMessage.java | 35 + .../ast/_DelayedGetMessageWithoutStackTop.java | 36 + .../freemarker/core/ast/_DelayedJQuote.java | 36 + .../core/ast/_DelayedJoinWithComma.java | 48 + .../freemarker/core/ast/_DelayedOrdinal.java | 47 + .../core/ast/_DelayedShortClassName.java | 35 + .../freemarker/core/ast/_DelayedToString.java | 37 + .../core/ast/_ErrorDescriptionBuilder.java | 361 ++ .../org/apache/freemarker/core/ast/_Java6.java | 35 + .../apache/freemarker/core/ast/_Java6Impl.java | 45 + .../freemarker/core/ast/_JavaVersions.java | 77 + .../core/ast/_MiscTemplateException.java | 126 + ...ObjectBuilderSettingEvaluationException.java | 46 + .../ast/_ObjectBuilderSettingEvaluator.java | 1117 ++++++ ..._ParserConfigurationWithInheritedFormat.java | 84 + .../core/ast/_SettingEvaluationEnvironment.java | 62 + .../freemarker/core/ast/_SortedArraySet.java | 80 + .../core/ast/_TemplateModelException.java | 133 + .../freemarker/core/ast/_TimeZoneBuilder.java | 43 + ...expectedTypeErrorExplainerTemplateModel.java | 36 + .../core/ast/_UnmodifiableCompositeSet.java | 95 + .../freemarker/core/ast/_UnmodifiableSet.java | 47 + .../org/apache/freemarker/core/ast/package.html | 26 + .../freemarker/core/debug/Breakpoint.java | 82 + .../freemarker/core/debug/DebugModel.java | 105 + .../core/debug/DebuggedEnvironment.java | 56 + .../apache/freemarker/core/debug/Debugger.java | 95 + .../freemarker/core/debug/DebuggerClient.java | 140 + .../freemarker/core/debug/DebuggerListener.java | 36 + .../core/debug/EnvironmentSuspendedEvent.java | 67 + .../core/debug/impl/DebuggerServer.java | 130 + .../core/debug/impl/DebuggerService.java | 93 + .../core/debug/impl/RmiDebugModelImpl.java | 152 + .../debug/impl/RmiDebuggedEnvironmentImpl.java | 344 ++ .../core/debug/impl/RmiDebuggerImpl.java | 81 + .../debug/impl/RmiDebuggerListenerImpl.java | 67 + .../core/debug/impl/RmiDebuggerService.java | 397 +++ .../apache/freemarker/core/debug/package.html | 27 + .../core/model/AdapterTemplateModel.java | 49 + .../core/model/FalseTemplateBooleanModel.java | 35 + .../core/model/GeneralPurposeNothing.java | 87 + .../core/model/MapKeyValuePairIterator.java | 69 + .../freemarker/core/model/ObjectWrapper.java | 59 + .../core/model/ObjectWrapperAndUnwrapper.java | 90 + .../model/SerializableTemplateBooleanModel.java | 24 + .../core/model/TemplateBooleanModel.java | 46 + .../core/model/TemplateCollectionModel.java | 48 + .../core/model/TemplateCollectionModelEx.java | 57 + .../core/model/TemplateDateModel.java | 75 + .../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/TemplateMethodModel.java | 60 + .../core/model/TemplateMethodModelEx.java | 53 + .../freemarker/core/model/TemplateModel.java | 55 + .../core/model/TemplateModelAdapter.java | 34 + .../core/model/TemplateModelException.java | 111 + .../core/model/TemplateModelIterator.java | 39 + .../core/model/TemplateModelListSequence.java | 52 + .../core/model/TemplateModelWithAPISupport.java | 41 + .../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 | 35 + .../core/model/WrapperTemplateModel.java | 33 + .../core/model/WrappingTemplateModel.java | 73 + .../core/model/impl/DefaultArrayAdapter.java | 347 ++ .../core/model/impl/DefaultIterableAdapter.java | 95 + .../core/model/impl/DefaultIteratorAdapter.java | 126 + .../core/model/impl/DefaultListAdapter.java | 117 + .../core/model/impl/DefaultMapAdapter.java | 163 + .../impl/DefaultNonListCollectionAdapter.java | 121 + .../core/model/impl/DefaultObjectWrapper.java | 369 ++ .../model/impl/DefaultObjectWrapperBuilder.java | 83 + .../impl/DefaultObjectWrapperConfiguration.java | 105 + .../DefaultUnassignableIteratorAdapter.java | 57 + .../core/model/impl/SimpleCollection.java | 157 + .../freemarker/core/model/impl/SimpleDate.java | 81 + .../freemarker/core/model/impl/SimpleHash.java | 429 +++ .../core/model/impl/SimpleNumber.java | 76 + .../core/model/impl/SimpleObjectWrapper.java | 59 + .../core/model/impl/SimpleScalar.java | 72 + .../core/model/impl/SimpleSequence.java | 305 ++ .../core/model/impl/_ModelImplApi.java | 37 + .../core/model/impl/_StaticObjectWrappers.java | 49 + .../core/model/impl/beans/APIModel.java | 45 + .../core/model/impl/beans/ArgumentTypes.java | 735 ++++ .../core/model/impl/beans/ArrayModel.java | 119 + .../core/model/impl/beans/BeanModel.java | 363 ++ .../core/model/impl/beans/BeansModelCache.java | 73 + .../core/model/impl/beans/BeansWrapper.java | 1791 ++++++++++ .../model/impl/beans/BeansWrapperBuilder.java | 159 + .../impl/beans/BeansWrapperConfiguration.java | 234 ++ .../core/model/impl/beans/BooleanModel.java | 39 + .../impl/beans/CallableMemberDescriptor.java | 56 + .../model/impl/beans/CharacterOrString.java | 45 + .../impl/beans/ClassBasedModelFactory.java | 146 + .../model/impl/beans/ClassChangeNotifier.java | 32 + .../model/impl/beans/ClassIntrospector.java | 813 +++++ .../impl/beans/ClassIntrospectorBuilder.java | 199 ++ .../model/impl/beans/CollectionAdapter.java | 84 + .../core/model/impl/beans/CollectionModel.java | 106 + .../core/model/impl/beans/DateModel.java | 76 + .../beans/EmptyCallableMemberDescriptor.java | 35 + .../impl/beans/EmptyMemberAndArguments.java | 93 + .../core/model/impl/beans/EnumerationModel.java | 105 + .../core/model/impl/beans/HashAdapter.java | 173 + .../impl/beans/InvalidPropertyException.java | 34 + .../core/model/impl/beans/IteratorModel.java | 109 + .../impl/beans/JRebelClassChangeNotifier.java | 56 + .../core/model/impl/beans/MapModel.java | 118 + .../MaybeEmptyCallableMemberDescriptor.java | 25 + .../beans/MaybeEmptyMemberAndArguments.java | 22 + .../model/impl/beans/MemberAndArguments.java | 64 + .../impl/beans/MethodAppearanceFineTuner.java | 94 + .../core/model/impl/beans/MethodSorter.java | 32 + .../core/model/impl/beans/ModelCache.java | 143 + .../core/model/impl/beans/ModelFactory.java | 34 + .../NonPrimitiveArrayBackedReadOnlyList.java | 42 + .../core/model/impl/beans/NumberModel.java | 58 + .../impl/beans/OverloadedFixArgsMethods.java | 103 + .../model/impl/beans/OverloadedMethods.java | 276 ++ .../impl/beans/OverloadedMethodsModel.java | 80 + .../impl/beans/OverloadedMethodsSubset.java | 428 +++ .../model/impl/beans/OverloadedNumberUtil.java | 1288 +++++++ .../impl/beans/OverloadedVarArgsMethods.java | 251 ++ .../beans/PrimtiveArrayBackedReadOnlyList.java | 47 + .../ReflectionCallableMemberDescriptor.java | 95 + .../model/impl/beans/ResourceBundleModel.java | 188 + .../core/model/impl/beans/SequenceAdapter.java | 67 + .../core/model/impl/beans/SetAdapter.java | 32 + .../core/model/impl/beans/SimpleMapModel.java | 121 + .../core/model/impl/beans/SimpleMethod.java | 175 + .../model/impl/beans/SimpleMethodModel.java | 130 + .../model/impl/beans/SingletonCustomizer.java | 51 + .../core/model/impl/beans/StaticModel.java | 178 + .../core/model/impl/beans/StaticModels.java | 43 + .../core/model/impl/beans/StringModel.java | 61 + .../core/model/impl/beans/TypeFlags.java | 130 + .../core/model/impl/beans/UnsafeMethods.java | 112 + .../core/model/impl/beans/_BeansAPI.java | 222 ++ .../core/model/impl/beans/_EnumModels.java | 54 + .../core/model/impl/beans/_MethodUtil.java | 294 ++ .../core/model/impl/beans/package.html | 40 + .../freemarker/core/model/impl/dom/AtAtKey.java | 58 + .../core/model/impl/dom/AttributeNodeModel.java | 66 + .../model/impl/dom/CharacterDataNodeModel.java | 43 + .../core/model/impl/dom/DocumentModel.java | 74 + .../core/model/impl/dom/DocumentTypeModel.java | 54 + .../core/model/impl/dom/DomStringUtil.java | 93 + .../core/model/impl/dom/ElementModel.java | 230 ++ .../core/model/impl/dom/JaxenXPathSupport.java | 238 ++ .../core/model/impl/dom/NodeListModel.java | 232 ++ .../core/model/impl/dom/NodeModel.java | 790 +++++ .../core/model/impl/dom/NodeOutputter.java | 258 ++ .../core/model/impl/dom/PINodeModel.java | 42 + .../impl/dom/SunInternalXalanXPathSupport.java | 158 + .../core/model/impl/dom/XPathSupport.java | 30 + .../core/model/impl/dom/XalanXPathSupport.java | 158 + .../core/model/impl/dom/_ExtDomApi.java | 43 + .../freemarker/core/model/impl/dom/package.html | 31 + .../org/apache/freemarker/core/package.html | 27 + .../core/templateresolver/AndMatcher.java | 45 + .../ByteArrayTemplateLoader.java | 194 ++ .../core/templateresolver/CacheStorage.java | 37 + .../CacheStorageWithGetSize.java | 36 + .../templateresolver/ClassTemplateLoader.java | 182 + .../ConcurrentCacheStorage.java | 35 + ...ConditionalTemplateConfigurationFactory.java | 76 + .../templateresolver/FileExtensionMatcher.java | 85 + .../templateresolver/FileNameGlobMatcher.java | 86 + .../templateresolver/FileTemplateLoader.java | 380 +++ .../FirstMatchTemplateConfigurationFactory.java | 118 + .../MalformedTemplateNameException.java | 57 + .../MergingTemplateConfigurationFactory.java | 78 + .../core/templateresolver/MruCacheStorage.java | 322 ++ .../templateresolver/MultiTemplateLoader.java | 167 + .../core/templateresolver/NotMatcher.java | 41 + .../core/templateresolver/NullCacheStorage.java | 66 + .../core/templateresolver/OrMatcher.java | 45 + .../core/templateresolver/PathGlobMatcher.java | 100 + .../core/templateresolver/PathRegexMatcher.java | 54 + .../core/templateresolver/SoftCacheStorage.java | 141 + .../templateresolver/StringTemplateLoader.java | 194 ++ .../templateresolver/StrongCacheStorage.java | 67 + .../core/templateresolver/TemplateCache.java | 1111 ++++++ .../TemplateConfigurationFactory.java | 91 + .../TemplateConfigurationFactoryException.java | 36 + .../core/templateresolver/TemplateLoader.java | 102 + .../templateresolver/TemplateLoaderSession.java | 73 + .../templateresolver/TemplateLoadingResult.java | 207 ++ .../TemplateLoadingResultStatus.java | 49 + .../templateresolver/TemplateLoadingSource.java | 66 + .../templateresolver/TemplateLookupContext.java | 126 + .../templateresolver/TemplateLookupResult.java | 133 + .../TemplateLookupStrategy.java | 115 + .../templateresolver/TemplateNameFormat.java | 449 +++ .../templateresolver/TemplateSourceMatcher.java | 30 + .../templateresolver/URLTemplateLoader.java | 224 ++ .../URLTemplateLoadingSource.java | 57 + .../core/templateresolver/_CacheAPI.java | 43 + .../templateresolver/_TemplateLoaderUtils.java | 42 + .../core/templateresolver/package.html | 30 + .../freemarker/core/util/CaptureOutput.java | 147 + .../apache/freemarker/core/util/ClassUtil.java | 385 +++ .../freemarker/core/util/CollectionUtils.java | 36 + .../apache/freemarker/core/util/Constants.java | 122 + .../freemarker/core/util/DOMNodeModel.java | 267 ++ .../apache/freemarker/core/util/DateUtil.java | 911 +++++ .../apache/freemarker/core/util/DeepUnwrap.java | 162 + .../apache/freemarker/core/util/HtmlEscape.java | 107 + .../freemarker/core/util/NormalizeNewlines.java | 113 + .../core/util/NullArgumentException.java | 59 + .../apache/freemarker/core/util/NullWriter.java | 90 + .../apache/freemarker/core/util/NumberUtil.java | 170 + .../freemarker/core/util/ObjectFactory.java | 31 + .../core/util/ObjectWrapperWithAPISupport.java | 51 + .../freemarker/core/util/OptimizerUtil.java | 97 + .../freemarker/core/util/RichObjectWrapper.java | 37 + .../freemarker/core/util/SecurityUtilities.java | 87 + .../freemarker/core/util/StandardCompress.java | 237 ++ .../apache/freemarker/core/util/StringUtil.java | 2126 ++++++++++++ .../core/util/UndeclaredThrowableException.java | 43 + .../util/UnrecognizedTimeZoneException.java | 38 + .../util/UnsupportedNumberClassException.java | 38 + .../freemarker/core/util/WriteProtectable.java | 37 + .../apache/freemarker/core/util/XmlEscape.java | 90 + .../apache/freemarker/core/util/package.html | 25 + .../servlet/AllHttpScopesHashModel.java | 114 + .../freemarker/servlet/FreemarkerServlet.java | 1675 +++++++++ .../servlet/HttpRequestHashModel.java | 106 + .../servlet/HttpRequestParametersHashModel.java | 95 + .../servlet/HttpSessionHashModel.java | 111 + .../apache/freemarker/servlet/IncludePage.java | 253 ++ .../freemarker/servlet/InitParamParser.java | 265 ++ .../servlet/ServletContextHashModel.java | 72 + .../servlet/WebAppTemplateLoader.java | 301 ++ .../apache/freemarker/servlet/_ServletLogs.java | 34 + .../jsp/CustomTagAndELFunctionCombiner.java | 210 ++ .../freemarker/servlet/jsp/EventForwarding.java | 200 ++ .../jsp/FreeMarkerJspApplicationContext.java | 165 + .../servlet/jsp/FreeMarkerJspFactory.java | 63 + .../servlet/jsp/FreeMarkerJspFactory21.java | 51 + .../servlet/jsp/FreeMarkerPageContext.java | 492 +++ .../freemarker/servlet/jsp/FreemarkerTag.java | 129 + .../freemarker/servlet/jsp/JspContextModel.java | 56 + .../freemarker/servlet/jsp/JspTagModelBase.java | 168 + .../servlet/jsp/JspWriterAdapter.java | 188 + .../servlet/jsp/PageContextFactory.java | 66 + .../servlet/jsp/SimpleTagDirectiveModel.java | 110 + .../servlet/jsp/TagTransformModel.java | 419 +++ .../freemarker/servlet/jsp/TaglibFactory.java | 2019 +++++++++++ .../servlet/jsp/TaglibMethodUtil.java | 117 + .../servlet/jsp/_FreeMarkerPageContext21.java | 122 + .../apache/freemarker/servlet/jsp/package.html | 29 + .../org/apache/freemarker/servlet/package.html | 25 + src/main/javacc/FTL.jj | 8 +- src/main/misc/overloadedNumberRules/README.txt | 4 +- .../ext/beans/unsafeMethods.properties | 98 - .../resources/freemarker/version.properties | 104 - .../model/impl/beans/unsafeMethods.properties | 98 + .../apache/freemarker/core/version.properties | 104 + src/manual/en_US/FM3-CHANGE-LOG.txt | 17 + src/manual/en_US/book.xml | 573 ++-- .../cache/FileTemplateLoaderTest.java | 121 - .../cache/MultiTemplateLoaderTest.java | 98 - .../freemarker/cache/TemplateCacheTest.java | 481 --- .../cache/TemplateConfigurationFactoryTest.java | 239 -- .../cache/TemplateNameFormatTest.java | 330 -- .../cache/TemplateSourceMatcherTest.java | 188 - .../core/ASTBasedErrorMessagesTest.java | 80 - src/test/java/freemarker/core/ASTPrinter.java | 439 --- src/test/java/freemarker/core/ASTTest.java | 98 - .../core/AppMetaTemplateDateFormatFactory.java | 119 - .../core/BaseNTemplateNumberFormatFactory.java | 121 - .../freemarker/core/BreakPlacementTest.java | 68 - .../java/freemarker/core/CamelCaseTest.java | 485 --- .../java/freemarker/core/CanonicalFormTest.java | 70 - .../freemarker/core/CoercionToTextualTest.java | 137 - .../core/CombinedMarkupOutputFormatTest.java | 193 -- .../java/freemarker/core/ConfigurableTest.java | 178 - .../freemarker/core/CoreLocaleUtilsTest.java | 72 - .../freemarker/core/CustomHTMLOutputFormat.java | 71 - .../core/CustomTemplateHTMLModel.java | 32 - .../java/freemarker/core/DateFormatTest.java | 457 --- .../freemarker/core/DirectiveCallPlaceTest.java | 252 -- .../java/freemarker/core/DummyOutputFormat.java | 64 - .../freemarker/core/EncodingOverrideTest.java | 70 - .../core/EnvironmentCustomStateTest.java | 50 - .../EnvironmentGetTemplateVariantsTest.java | 224 -- ...EpochMillisDivTemplateDateFormatFactory.java | 94 - .../EpochMillisTemplateDateFormatFactory.java | 85 - .../core/ExtendedDecimalFormatTest.java | 341 -- .../core/HTMLISOTemplateDateFormatFactory.java | 104 - .../freemarker/core/HTMLOutputFormatTest.java | 186 - .../java/freemarker/core/HeaderParsingTest.java | 65 - .../core/HexTemplateNumberFormatFactory.java | 71 - .../IncludeAndImportConfigurableLayersTest.java | 334 -- .../freemarker/core/IncludeAndImportTest.java | 261 -- .../core/InterpretAndEvalTemplateNameTest.java | 71 - .../core/InterpretSettingInheritanceTest.java | 96 - .../freemarker/core/IteratorIssuesTest.java | 148 - .../java/freemarker/core/ListErrorsTest.java | 137 - ...AndTZSensitiveTemplateDateFormatFactory.java | 89 - ...aleSensitiveTemplateNumberFormatFactory.java | 72 - .../freemarker/core/MiscErrorMessagesTest.java | 48 - .../java/freemarker/core/NumberFormatTest.java | 331 -- .../core/ObjectBuilderSettingsTest.java | 1527 --------- .../core/OptInTemplateClassResolverTest.java | 207 -- .../java/freemarker/core/OutputFormatTest.java | 1045 ------ .../ParseTimeParameterBIErrorMessagesTest.java | 47 - .../core/ParsingErrorMessagesTest.java | 119 - .../PrintfGTemplateNumberFormatFactory.java | 131 - .../freemarker/core/RTFOutputFormatTest.java | 129 - .../java/freemarker/core/SQLTimeZoneTest.java | 362 -- .../core/SeldomEscapedOutputFormat.java | 70 - .../freemarker/core/SettingDirectiveTest.java | 40 - .../freemarker/core/SpecialVariableTest.java | 102 - .../core/StringLiteralInterpolationTest.java | 129 - src/test/java/freemarker/core/TabSizeTest.java | 97 - .../core/TagSyntaxVariationsTest.java | 234 -- .../freemarker/core/TemplatGetEncodingTest.java | 89 - .../core/TemplateConfigurationTest.java | 951 ------ ...plateConfigurationWithTemplateCacheTest.java | 325 -- .../core/TemplateDummyOutputModel.java | 32 - .../freemarker/core/TemplateLevelSettings.java | 115 - .../core/TemplateNameSpecialVariablesTest.java | 212 -- .../core/TemplateSeldomEscapedOutputModel.java | 32 - .../core/TheadInterruptingSupportTest.java | 162 - .../freemarker/core/TypeErrorMessagesTest.java | 106 - .../freemarker/core/UnclosedCommentTest.java | 68 - .../core/WhitespaceStrippingTest.java | 71 - .../freemarker/core/XHTMLOutputFormatTest.java | 60 - .../freemarker/core/XMLOutputFormatTest.java | 60 - .../core/subpkg/PackageVisibleAll.java | 26 - .../subpkg/PackageVisibleAllWithBuilder.java | 26 - .../PackageVisibleAllWithBuilderBuilder.java | 28 - .../PackageVisibleWithPublicConstructor.java | 27 - .../java/freemarker/core/subpkg/PublicAll.java | 24 - .../subpkg/PublicWithMixedConstructors.java | 38 - .../PublicWithPackageVisibleConstructor.java | 26 - .../AbstractParallelIntrospectionTest.java | 123 - .../ext/beans/AlphabeticalMethodSorter.java | 47 - .../ext/beans/BeansAPINewInstanceTest.java | 133 - .../ext/beans/BeansWrapperBasics.java | 63 - .../ext/beans/BeansWrapperCachesTest.java | 98 - .../ext/beans/BeansWrapperDesc2003020.java | 30 - .../ext/beans/BeansWrapperDesc2003021.java | 30 - .../ext/beans/BeansWrapperInc2003020.java | 30 - .../ext/beans/BeansWrapperInc2003021.java | 30 - .../ext/beans/BeansWrapperMiscTest.java | 57 - .../ext/beans/BeansWrapperReadOnlyTest.java | 93 - .../ext/beans/BeansWrapperSingletonsTest.java | 796 ----- .../beans/BeansWrapperWithShortedMethods.java | 39 - .../CommonSupertypeForUnwrappingHintTest.java | 180 - .../beans/DefaultObjectWrapperDesc2003020.java | 30 - .../beans/DefaultObjectWrapperDesc2003021.java | 30 - .../beans/DefaultObjectWrapperDesc2003022.java | 30 - .../beans/DefaultObjectWrapperInc2003020.java | 30 - .../beans/DefaultObjectWrapperInc2003021.java | 30 - .../beans/DefaultObjectWrapperInc2003022.java | 30 - .../DefaultObjectWrapperWithSortedMethods.java | 40 - .../freemarker/ext/beans/EnumModelsTest.java | 85 - .../freemarker/ext/beans/ErrorMessagesTest.java | 173 - .../ext/beans/FineTuneMethodAppearanceTest.java | 101 - .../GetlessMethodsAsPropertyGettersRule.java | 69 - .../freemarker/ext/beans/IsApplicableTest.java | 171 - .../beans/IsMoreSpecificParameterTypeTest.java | 98 - .../ext/beans/Java7MembersOnlyBeansWrapper.java | 101 - .../beans/ManyObjectsOfDifferentClasses.java | 249 -- .../beans/ManyStaticsOfDifferentClasses.java | 236 -- .../ext/beans/MiscNumericalOperationsTest.java | 120 - .../freemarker/ext/beans/ModelCacheTest.java | 66 - .../ext/beans/OverloadedNumberUtilTest.java | 585 ---- .../beans/ParameterListPreferabilityTest.java | 444 --- .../beans/PrallelObjectIntrospectionTest.java | 43 - .../beans/PrallelStaticIntrospectionTest.java | 47 - .../freemarker/ext/beans/RationalNumber.java | 90 - .../freemarker/ext/beans/StaticModelsTest.java | 91 - .../freemarker/ext/beans/TypeFlagsTest.java | 657 ---- .../ext/dom/DOMConvenienceStaticsTest.java | 215 -- .../java/freemarker/ext/dom/DOMSiblingTest.java | 99 - src/test/java/freemarker/ext/dom/DOMTest.java | 161 - .../ext/jsp/JspTestFreemarkerServlet.java | 50 - ...estFreemarkerServletWithDefaultOverride.java | 47 - .../ext/jsp/RealServletContainertTest.java | 497 --- .../java/freemarker/ext/jsp/TLDParsingTest.java | 137 - .../ext/jsp/TaglibMethodUtilTest.java | 107 - .../jsp/taglibmembers/AttributeAccessorTag.java | 68 - .../ext/jsp/taglibmembers/AttributeInfoTag.java | 59 - .../ext/jsp/taglibmembers/EnclosingClass.java | 32 - .../ext/jsp/taglibmembers/GetAndSetTag.java | 66 - .../ext/jsp/taglibmembers/TestFunctions.java | 79 - .../ext/jsp/taglibmembers/TestSimpleTag.java | 54 - .../ext/jsp/taglibmembers/TestSimpleTag2.java | 32 - .../ext/jsp/taglibmembers/TestSimpleTag3.java | 32 - .../ext/jsp/taglibmembers/TestTag.java | 98 - .../ext/jsp/taglibmembers/TestTag2.java | 50 - .../ext/jsp/taglibmembers/TestTag3.java | 50 - .../config/WebappLocalFreemarkerServlet.java | 25 - .../ext/servlet/FreemarkerServletTest.java | 631 ---- .../ext/servlet/InitParamParserTest.java | 174 - .../freemarker/manual/AutoEscapingExample.java | 65 - .../manual/ConfigureOutputFormatExamples.java | 117 - .../freemarker/manual/CustomFormatsExample.java | 92 - .../java/freemarker/manual/ExamplesTest.java | 60 - .../manual/GettingStartedExample.java | 67 - src/test/java/freemarker/manual/Product.java | 49 - .../manual/TemplateConfigurationExamples.java | 186 - .../UnitAwareTemplateNumberFormatFactory.java | 80 - .../manual/UnitAwareTemplateNumberModel.java | 42 - .../template/ActualNamingConvetionTest.java | 65 - .../template/ActualTagSyntaxTest.java | 66 - .../freemarker/template/ConfigurationTest.java | 1795 ---------- .../template/CustomAttributeTest.java | 227 -- .../template/DefaultObjectWrapperTest.java | 1171 ------- .../java/freemarker/template/ExceptionTest.java | 117 - .../java/freemarker/template/GetSourceTest.java | 53 - .../template/IncudeFromNamelessTest.java | 56 - .../template/JavaCCExceptionAsEOFFixTest.java | 125 - .../MistakenlyPublicImportAPIsTest.java | 106 - .../template/MistakenlyPublicMacroAPIsTest.java | 89 - .../freemarker/template/MockServletContext.java | 132 - .../template/NullConfigurationTest.java | 34 - .../template/SimpleObjetWrapperTest.java | 103 - .../template/StaticObjectWrappersTest.java | 36 - .../template/TemplateConstructorsTest.java | 112 - .../template/TemplateLanguageVersionTest.java | 64 - .../template/TemplateLookupStrategyTest.java | 647 ---- .../template/TemplateNotFoundMessageTest.java | 202 -- .../java/freemarker/template/VersionTest.java | 227 -- .../template/utility/DateUtilTest.java | 1084 ------ .../template/utility/NumberUtilTest.java | 215 -- .../template/utility/StringUtilTest.java | 429 --- .../CopyrightCommentRemoverTemplateLoader.java | 106 - .../test/MonitoredTemplateLoader.java | 327 -- .../freemarker/test/ResourcesExtractor.java | 296 -- src/test/java/freemarker/test/TemplateTest.java | 316 -- src/test/java/freemarker/test/TreeView.java | 70 - .../java/freemarker/test/hamcerst/Matchers.java | 34 - .../hamcerst/StringContainsIgnoringCase.java | 47 - src/test/java/freemarker/test/package.html | 28 - .../test/servlet/DefaultModel2TesterAction.java | 91 - .../freemarker/test/servlet/Model2Action.java | 37 - .../test/servlet/Model2TesterServlet.java | 139 - .../freemarker/test/servlet/WebAppTestCase.java | 353 -- src/test/java/freemarker/test/servlet/web.xml | 101 - .../test/templatesuite/TemplateTestCase.java | 570 ---- .../test/templatesuite/TemplateTestSuite.java | 301 -- .../templatesuite/models/AllTemplateModels.java | 113 - .../templatesuite/models/BeanTestClass.java | 89 - .../templatesuite/models/BeanTestInterface.java | 25 - .../models/BeanTestSuperclass.java | 30 - .../models/BooleanAndScalarModel.java | 38 - .../models/BooleanAndStringTemplateModel.java | 36 - .../test/templatesuite/models/BooleanHash1.java | 56 - .../test/templatesuite/models/BooleanHash2.java | 48 - .../test/templatesuite/models/BooleanList1.java | 86 - .../test/templatesuite/models/BooleanList2.java | 49 - .../models/BooleanVsStringMethods.java | 40 - .../templatesuite/models/EnumTestClass.java | 34 - .../templatesuite/models/ExceptionModel.java | 38 - .../models/HashAndScalarModel.java | 75 - .../templatesuite/models/JavaObjectInfo.java | 35 - .../test/templatesuite/models/LegacyList.java | 73 - .../test/templatesuite/models/Listables.java | 201 -- .../test/templatesuite/models/MultiModel1.java | 106 - .../test/templatesuite/models/MultiModel2.java | 61 - .../test/templatesuite/models/MultiModel3.java | 66 - .../test/templatesuite/models/MultiModel4.java | 67 - .../test/templatesuite/models/MultiModel5.java | 74 - .../test/templatesuite/models/NewTestModel.java | 51 - .../templatesuite/models/NewTestModel2.java | 51 - .../models/NumberAndStringModel.java | 45 - .../models/OverloadedConstructor.java | 45 - .../templatesuite/models/OverloadedMethods.java | 191 -- .../models/OverloadedMethods2.java | 1098 ------ .../templatesuite/models/SimpleTestMethod.java | 48 - .../models/TransformHashWrapper.java | 72 - .../models/TransformMethodWrapper1.java | 48 - .../models/TransformMethodWrapper2.java | 63 - .../templatesuite/models/TransformModel1.java | 174 - .../templatesuite/models/VarArgTestModel.java | 63 - .../freemarker/test/templatesuite/package.html | 42 - .../test/utility/AssertDirective.java | 72 - .../test/utility/AssertEqualsDirective.java | 90 - .../test/utility/AssertFailsDirective.java | 151 - .../AssertationFailedInTemplateException.java | 46 - .../test/utility/BadParameterTypeException.java | 60 - .../freemarker/test/utility/FileTestCase.java | 185 - .../MissingRequiredParameterException.java | 51 - .../test/utility/NoOutputDirective.java | 49 - .../test/utility/ParameterException.java | 54 - .../java/freemarker/test/utility/TestUtil.java | 266 -- .../utility/UnsupportedParameterException.java | 50 - .../core/ActualNamingConvetionTest.java | 67 + .../freemarker/core/ActualTagSyntaxTest.java | 68 + .../freemarker/core/ConfigurationTest.java | 1801 ++++++++++ .../freemarker/core/CustomAttributeTest.java | 228 ++ .../apache/freemarker/core/ExceptionTest.java | 121 + .../apache/freemarker/core/GetSourceTest.java | 55 + .../freemarker/core/IncudeFromNamelessTest.java | 60 + .../core/JavaCCExceptionAsEOFFixTest.java | 127 + .../core/MistakenlyPublicImportAPIsTest.java | 109 + .../core/MistakenlyPublicMacroAPIsTest.java | 92 + .../freemarker/core/MockServletContext.java | 132 + .../freemarker/core/NullConfigurationTest.java | 35 + .../freemarker/core/SimpleObjetWrapperTest.java | 116 + .../core/TemplateConstructorsTest.java | 114 + .../core/TemplateLanguageVersionTest.java | 66 + .../core/TemplateLookupStrategyTest.java | 650 ++++ .../core/TemplateNotFoundMessageTest.java | 203 ++ .../org/apache/freemarker/core/VersionTest.java | 228 ++ .../core/ast/ASTBasedErrorMessagesTest.java | 79 + .../apache/freemarker/core/ast/ASTPrinter.java | 445 +++ .../org/apache/freemarker/core/ast/ASTTest.java | 98 + .../ast/AppMetaTemplateDateFormatFactory.java | 127 + .../ast/BaseNTemplateNumberFormatFactory.java | 128 + .../freemarker/core/ast/BreakPlacementTest.java | 67 + .../freemarker/core/ast/CamelCaseTest.java | 489 +++ .../freemarker/core/ast/CanonicalFormTest.java | 71 + .../core/ast/CoercionToTextualTest.java | 137 + .../ast/CombinedMarkupOutputFormatTest.java | 198 ++ .../freemarker/core/ast/ConfigurableTest.java | 179 + .../core/ast/CoreLocaleUtilsTest.java | 73 + .../core/ast/CustomHTMLOutputFormat.java | 72 + .../core/ast/CustomTemplateHTMLModel.java | 34 + .../freemarker/core/ast/DateFormatTest.java | 462 +++ .../core/ast/DirectiveCallPlaceTest.java | 255 ++ .../freemarker/core/ast/DummyOutputFormat.java | 65 + .../core/ast/EncodingOverrideTest.java | 69 + .../core/ast/EnvironmentCustomStateTest.java | 50 + .../ast/EnvironmentGetTemplateVariantsTest.java | 224 ++ ...EpochMillisDivTemplateDateFormatFactory.java | 102 + .../EpochMillisTemplateDateFormatFactory.java | 92 + .../core/ast/ExtendedDecimalFormatTest.java | 341 ++ .../ast/HTMLISOTemplateDateFormatFactory.java | 114 + .../core/ast/HTMLOutputFormatTest.java | 187 + .../freemarker/core/ast/HeaderParsingTest.java | 64 + .../ast/HexTemplateNumberFormatFactory.java | 77 + .../IncludeAndImportConfigurableLayersTest.java | 336 ++ .../core/ast/IncludeAndImportTest.java | 261 ++ .../ast/InterpretAndEvalTemplateNameTest.java | 70 + .../ast/InterpretSettingInheritanceTest.java | 95 + .../freemarker/core/ast/IteratorIssuesTest.java | 147 + .../freemarker/core/ast/ListErrorsTest.java | 136 + ...AndTZSensitiveTemplateDateFormatFactory.java | 97 + ...aleSensitiveTemplateNumberFormatFactory.java | 78 + .../core/ast/MiscErrorMessagesTest.java | 47 + .../freemarker/core/ast/NumberFormatTest.java | 336 ++ .../core/ast/ObjectBuilderSettingsTest.java | 1527 +++++++++ .../ast/OptInTemplateClassResolverTest.java | 210 ++ .../freemarker/core/ast/OutputFormatTest.java | 1053 ++++++ .../ParseTimeParameterBIErrorMessagesTest.java | 46 + .../core/ast/ParsingErrorMessagesTest.java | 119 + .../ast/PrintfGTemplateNumberFormatFactory.java | 138 + .../core/ast/RTFOutputFormatTest.java | 129 + .../freemarker/core/ast/SQLTimeZoneTest.java | 361 ++ .../core/ast/SeldomEscapedOutputFormat.java | 71 + .../core/ast/SettingDirectiveTest.java | 41 + .../core/ast/SpecialVariableTest.java | 105 + .../ast/StringLiteralInterpolationTest.java | 130 + .../apache/freemarker/core/ast/TabSizeTest.java | 97 + .../core/ast/TagSyntaxVariationsTest.java | 236 ++ .../core/ast/TemplatGetEncodingTest.java | 89 + .../core/ast/TemplateConfigurationTest.java | 962 ++++++ ...plateConfigurationWithTemplateCacheTest.java | 326 ++ .../core/ast/TemplateDummyOutputModel.java | 34 + .../core/ast/TemplateLevelSettings.java | 114 + .../ast/TemplateNameSpecialVariablesTest.java | 211 ++ .../ast/TemplateSeldomEscapedOutputModel.java | 34 + .../core/ast/TheadInterruptingSupportTest.java | 163 + .../core/ast/TypeErrorMessagesTest.java | 105 + .../core/ast/UnclosedCommentTest.java | 67 + .../core/ast/WhitespaceStrippingTest.java | 70 + .../core/ast/XHTMLOutputFormatTest.java | 59 + .../core/ast/XMLOutputFormatTest.java | 59 + .../model/impl/DefaultObjectWrapperTest.java | 1205 +++++++ .../AbstractParallelIntrospectionTest.java | 125 + .../impl/beans/AlphabeticalMethodSorter.java | 49 + .../impl/beans/BeansAPINewInstanceTest.java | 137 + .../model/impl/beans/BeansWrapperBasics.java | 71 + .../impl/beans/BeansWrapperCachesTest.java | 100 + .../impl/beans/BeansWrapperDesc2003020.java | 30 + .../impl/beans/BeansWrapperDesc2003021.java | 30 + .../impl/beans/BeansWrapperInc2003020.java | 30 + .../impl/beans/BeansWrapperInc2003021.java | 30 + .../model/impl/beans/BeansWrapperMiscTest.java | 57 + .../impl/beans/BeansWrapperReadOnlyTest.java | 95 + .../impl/beans/BeansWrapperSingletonsTest.java | 799 +++++ .../beans/BeansWrapperWithShortedMethods.java | 40 + .../CommonSupertypeForUnwrappingHintTest.java | 185 + .../beans/DefaultObjectWrapperDesc2003020.java | 30 + .../beans/DefaultObjectWrapperDesc2003021.java | 30 + .../beans/DefaultObjectWrapperDesc2003022.java | 30 + .../beans/DefaultObjectWrapperInc2003020.java | 30 + .../beans/DefaultObjectWrapperInc2003021.java | 30 + .../beans/DefaultObjectWrapperInc2003022.java | 30 + .../DefaultObjectWrapperWithSortedMethods.java | 41 + .../core/model/impl/beans/EnumModelsTest.java | 85 + .../model/impl/beans/ErrorMessagesTest.java | 174 + .../beans/FineTuneMethodAppearanceTest.java | 100 + .../GetlessMethodsAsPropertyGettersRule.java | 71 + .../core/model/impl/beans/IsApplicableTest.java | 175 + .../beans/IsMoreSpecificParameterTypeTest.java | 100 + .../beans/Java7MembersOnlyBeansWrapper.java | 103 + .../beans/ManyObjectsOfDifferentClasses.java | 249 ++ .../beans/ManyStaticsOfDifferentClasses.java | 236 ++ .../impl/beans/MiscNumericalOperationsTest.java | 123 + .../core/model/impl/beans/ModelCacheTest.java | 67 + .../impl/beans/OverloadedNumberUtilTest.java | 588 ++++ .../beans/ParameterListPreferabilityTest.java | 447 +++ .../beans/PrallelObjectIntrospectionTest.java | 43 + .../beans/PrallelStaticIntrospectionTest.java | 47 + .../core/model/impl/beans/RationalNumber.java | 90 + .../core/model/impl/beans/StaticModelsTest.java | 91 + .../core/model/impl/beans/TypeFlagsTest.java | 664 ++++ .../impl/dom/DOMConvenienceStaticsTest.java | 216 ++ .../core/model/impl/dom/DOMSiblingTest.java | 99 + .../freemarker/core/model/impl/dom/DOMTest.java | 161 + .../core/subpkg/PackageVisibleAll.java | 26 + .../subpkg/PackageVisibleAllWithBuilder.java | 26 + .../PackageVisibleAllWithBuilderBuilder.java | 28 + .../PackageVisibleWithPublicConstructor.java | 27 + .../freemarker/core/subpkg/PublicAll.java | 24 + .../subpkg/PublicWithMixedConstructors.java | 38 + .../PublicWithPackageVisibleConstructor.java | 26 + .../FileTemplateLoaderTest.java | 121 + .../MultiTemplateLoaderTest.java | 105 + .../templateresolver/TemplateCacheTest.java | 488 +++ .../TemplateConfigurationFactoryTest.java | 246 ++ .../TemplateNameFormatTest.java | 329 ++ .../TemplateSourceMatcherTest.java | 195 ++ .../freemarker/core/util/DateUtilTest.java | 1087 ++++++ .../freemarker/core/util/NumberUtilTest.java | 216 ++ .../freemarker/core/util/StringUtilTest.java | 431 +++ .../manualtest/AutoEscapingExample.java | 65 + .../ConfigureOutputFormatExamples.java | 116 + .../manualtest/CustomFormatsExample.java | 91 + .../freemarker/manualtest/ExamplesTest.java | 59 + .../manualtest/GettingStartedExample.java | 66 + .../apache/freemarker/manualtest/Product.java | 49 + .../TemplateConfigurationExamples.java | 185 + .../UnitAwareTemplateNumberFormatFactory.java | 80 + .../UnitAwareTemplateNumberModel.java | 42 + .../servlet/FreemarkerServletTest.java | 631 ++++ .../freemarker/servlet/InitParamParserTest.java | 173 + .../servlet/jsp/JspTestFreemarkerServlet.java | 51 + ...estFreemarkerServletWithDefaultOverride.java | 47 + .../servlet/jsp/RealServletContainertTest.java | 497 +++ .../freemarker/servlet/jsp/TLDParsingTest.java | 138 + .../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 | 98 + .../servlet/jsp/taglibmembers/TestTag2.java | 50 + .../servlet/jsp/taglibmembers/TestTag3.java | 50 + .../config/WebappLocalFreemarkerServlet.java | 25 + .../CopyrightCommentRemoverTemplateLoader.java | 105 + .../test/MonitoredTemplateLoader.java | 327 ++ .../freemarker/test/ResourcesExtractor.java | 295 ++ .../apache/freemarker/test/TemplateTest.java | 316 ++ .../org/apache/freemarker/test/TreeView.java | 70 + .../freemarker/test/hamcerst/Matchers.java | 34 + .../hamcerst/StringContainsIgnoringCase.java | 47 + .../org/apache/freemarker/test/package.html | 28 + .../test/servlet/DefaultModel2TesterAction.java | 91 + .../freemarker/test/servlet/Model2Action.java | 37 + .../test/servlet/Model2TesterServlet.java | 138 + .../freemarker/test/servlet/WebAppTestCase.java | 353 ++ .../org/apache/freemarker/test/servlet/web.xml | 101 + .../test/templatesuite/TemplateTestCase.java | 574 ++++ .../test/templatesuite/TemplateTestSuite.java | 300 ++ .../templatesuite/models/AllTemplateModels.java | 113 + .../templatesuite/models/BeanTestClass.java | 89 + .../templatesuite/models/BeanTestInterface.java | 25 + .../models/BeanTestSuperclass.java | 30 + .../models/BooleanAndScalarModel.java | 38 + .../models/BooleanAndStringTemplateModel.java | 36 + .../test/templatesuite/models/BooleanHash1.java | 56 + .../test/templatesuite/models/BooleanHash2.java | 48 + .../test/templatesuite/models/BooleanList1.java | 86 + .../test/templatesuite/models/BooleanList2.java | 49 + .../models/BooleanVsStringMethods.java | 40 + .../templatesuite/models/EnumTestClass.java | 34 + .../templatesuite/models/ExceptionModel.java | 38 + .../models/HashAndScalarModel.java | 75 + .../templatesuite/models/JavaObjectInfo.java | 35 + .../test/templatesuite/models/LegacyList.java | 73 + .../test/templatesuite/models/Listables.java | 201 ++ .../test/templatesuite/models/MultiModel1.java | 106 + .../test/templatesuite/models/MultiModel2.java | 61 + .../test/templatesuite/models/MultiModel3.java | 66 + .../test/templatesuite/models/MultiModel4.java | 67 + .../test/templatesuite/models/MultiModel5.java | 74 + .../test/templatesuite/models/NewTestModel.java | 51 + .../templatesuite/models/NewTestModel2.java | 51 + .../models/NumberAndStringModel.java | 45 + .../models/OverloadedConstructor.java | 45 + .../templatesuite/models/OverloadedMethods.java | 191 ++ .../models/OverloadedMethods2.java | 1098 ++++++ .../templatesuite/models/SimpleTestMethod.java | 48 + .../models/TransformHashWrapper.java | 72 + .../models/TransformMethodWrapper1.java | 48 + .../models/TransformMethodWrapper2.java | 63 + .../templatesuite/models/TransformModel1.java | 174 + .../templatesuite/models/VarArgTestModel.java | 63 + .../freemarker/test/templatesuite/package.html | 42 + .../freemarker/test/util/AssertDirective.java | 72 + .../test/util/AssertEqualsDirective.java | 90 + .../test/util/AssertFailsDirective.java | 151 + .../AssertationFailedInTemplateException.java | 46 + .../test/util/BadParameterTypeException.java | 60 + .../freemarker/test/util/FileTestCase.java | 186 + .../util/MissingRequiredParameterException.java | 51 + .../freemarker/test/util/NoOutputDirective.java | 49 + .../test/util/ParameterException.java | 54 + .../apache/freemarker/test/util/TestUtil.java | 266 ++ .../util/UnsupportedParameterException.java | 50 + src/test/resources/META-INF/malformed.tld | 2 +- .../tldDiscovery MetaInfTldSources-1.tld | 2 +- src/test/resources/freemarker/cache/test.ftl | 19 - src/test/resources/freemarker/core/ast-1.ast | 187 - src/test/resources/freemarker/core/ast-1.ftl | 29 - .../freemarker/core/ast-assignments.ast | 172 - .../freemarker/core/ast-assignments.ftl | 29 - .../resources/freemarker/core/ast-builtins.ast | 59 - .../resources/freemarker/core/ast-builtins.ftl | 23 - .../resources/freemarker/core/ast-locations.ast | 155 - .../resources/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 - .../resources/freemarker/core/ast-range.ast | 281 -- .../resources/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 - .../freemarker/core/cano-assignments.ftl | 35 - .../freemarker/core/cano-assignments.ftl.out | 34 - .../resources/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 - .../resources/freemarker/core/cano-macros.ftl | 29 - .../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/ext/dom/DOMSiblingTest.xml | 31 - .../freemarker/ext/jsp/TLDParsingTest.tld | 89 - .../ext/jsp/templates/classpath-test.ftl | 19 - .../ext/jsp/tldDiscovery-ClassPathTlds-1.tld | 31 - .../ext/jsp/tldDiscovery-ClassPathTlds-2.tld | 31 - .../ext/jsp/webapps/basic/CONTENTS.txt | 36 - .../WEB-INF/el-function-tag-name-clash.tld | 50 - .../jsp/webapps/basic/WEB-INF/el-functions.tld | 84 - .../basic/WEB-INF/expected/attributes-2.3.0.txt | 68 - .../expected/attributes-2.3.22-future.txt | 73 - .../basic/WEB-INF/expected/attributes.txt | 73 - .../basic/WEB-INF/expected/customTags1.txt | 106 - .../ext/jsp/webapps/basic/WEB-INF/test.tld | 75 - .../ext/jsp/webapps/basic/WEB-INF/web.xml | 172 - .../ext/jsp/webapps/basic/attributes.ftl | 90 - .../jsp/webapps/basic/customELFunctions1.ftl | 30 - .../jsp/webapps/basic/customELFunctions1.jsp | 31 - .../ext/jsp/webapps/basic/customTags1.ftl | 59 - .../webapps/basic/elFunctionsTagNameClash.ftl | 25 - .../webapps/basic/elFunctionsTagNameClash.jsp | 26 - .../jsp/webapps/basic/[email protected] | 48 - .../ext/jsp/webapps/basic/trivial.ftl | 37 - .../ext/jsp/webapps/basic/trivial.jsp | 45 - .../ext/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 - .../ext/jsp/webapps/config/WEB-INF/web.xml | 113 - .../freemarker/ext/jsp/webapps/config/test.ftl | 19 - .../ext/jsp/webapps/errors/CONTENTS.txt | 28 - .../ext/jsp/webapps/errors/WEB-INF/web.xml | 92 - .../jsp/webapps/errors/failing-parsetime.ftlnv | 20 - .../jsp/webapps/errors/failing-parsetime.jsp | 19 - .../ext/jsp/webapps/errors/failing-runtime.ftl | 26 - .../ext/jsp/webapps/errors/failing-runtime.jsp | 23 - .../ext/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 - .../ext/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 - .../ext/jsp/webapps/tldDiscovery/test1.ftl | 55 - .../manual/AutoEscapingExample-capture.ftlh | 21 - .../manual/AutoEscapingExample-capture.ftlh.out | 20 - .../manual/AutoEscapingExample-convert.ftlh | 27 - .../manual/AutoEscapingExample-convert.ftlh.out | 25 - .../manual/AutoEscapingExample-convert2.ftl | 25 - .../manual/AutoEscapingExample-convert2.ftl.out | 21 - .../manual/AutoEscapingExample-infoBox.ftlh | 26 - .../manual/AutoEscapingExample-infoBox.ftlh.out | 25 - .../manual/AutoEscapingExample-markup.ftlh | 28 - .../manual/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 - .../manual/CustomFormatsExample-alias1.ftlh | 22 - .../manual/CustomFormatsExample-alias1.ftlh.out | 22 - .../manual/CustomFormatsExample-alias2.ftlh | 19 - .../manual/CustomFormatsExample-alias2.ftlh.out | 19 - .../manual/CustomFormatsExample-modelAware.ftlh | 20 - .../CustomFormatsExample-modelAware.ftlh.out | 20 - .../TemplateConfigurationExamples1.properties | 25 - .../TemplateConfigurationExamples2.properties | 32 - .../TemplateConfigurationExamples3.properties | 47 - src/test/resources/freemarker/manual/test.ftlh | 28 - .../template/SimpleObjectWrapperTest.java | 72 - .../resources/freemarker/template/toCache1.ftl | 19 - .../resources/freemarker/template/toCache2.ftl | 19 - .../test/templatesuite/expected/arithmetic.txt | 46 - .../test/templatesuite/expected/bean-maps.txt | 115 - .../test/templatesuite/expected/beans.txt | 56 - .../expected/boolean-formatting.txt | 32 - .../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 - .../templatesuite/expected/default-xmlns.txt | 25 - .../test/templatesuite/expected/default.txt | 26 - .../expected/encoding-builtins-ici-2.3.20.txt | 44 - .../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 | 80 - .../test/templatesuite/expected/include2.txt | 44 - .../test/templatesuite/expected/interpret.txt | 23 - .../test/templatesuite/expected/iterators.txt | 86 - .../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 | 201 -- .../expected/listhashliteral-ici-2.3.20.txt | 39 - .../expected/listhashliteral-ici-2.3.21.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 1976 -> 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 1552 -> 0 bytes .../test/templatesuite/expected/switch.txt | 80 - .../test/templatesuite/expected/transforms.txt | 68 - .../expected/type-builtins-ici-2.3.21.txt | 33 - .../expected/type-builtins-ici-2.3.24.txt | 33 - .../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 | 46 - .../test/templatesuite/templates/arithmetic.ftl | 50 - .../templatesuite/templates/assignments.ftl | 108 - .../test/templatesuite/templates/bean-maps.ftl | 58 - .../test/templatesuite/templates/beans.ftl | 60 - .../templates/boolean-formatting.ftl | 83 - .../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-common.ftl | 159 - .../templates/dateformat-iso-bi-ici-2.3.21.ftl | 23 - .../templates/dateformat-iso-bi.ftl | 23 - .../templates/dateformat-iso-like.ftl | 155 - .../templatesuite/templates/dateformat-java.ftl | 71 - .../templatesuite/templates/dateparsing.ftl | 84 - .../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/exthash.ftl | 48 - .../test/templatesuite/templates/hashconcat.ftl | 60 - .../templatesuite/templates/hashliteral.ftl | 107 - .../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 | 49 - .../templates/include2-included-encoding.ftl | 20 - .../templates/include2-included.ftl | 19 - .../test/templatesuite/templates/include2.ftl | 51 - .../test/templatesuite/templates/included.ftl | 30 - .../test/templatesuite/templates/interpret.ftl | 25 - .../test/templatesuite/templates/iterators.ftl | 73 - .../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 | 50 - .../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 - .../overloaded-methods-2-bwici-2.3.20.ftl | 285 -- .../overloaded-methods-2-bwici-2.3.21.ftl | 349 -- .../templates/overloaded-methods-2-common.ftl | 89 - .../overloaded-methods-2-desc-bwici-2.3.20.ftl | 43 - .../overloaded-methods-2-inc-bwici-2.3.20.ftl | 47 - .../templates/overloaded-methods-23bc.ftl | 69 - .../test/templatesuite/templates/precedence.ftl | 61 - .../templatesuite/templates/range-common.ftl | 314 -- .../templates/range-ici-2.3.20.ftl | 37 - .../templates/range-ici-2.3.21.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 - .../templates/string-builtins-ici-2.3.19.ftl | 22 - .../templates/string-builtins-ici-2.3.20.ftl | 21 - .../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 | 296 -- .../core/SimpleObjectWrapperTest.java | 83 + .../org/apache/freemarker/core/ast/ast-1.ast | 187 + .../org/apache/freemarker/core/ast/ast-1.ftl | 29 + .../freemarker/core/ast/ast-assignments.ast | 172 + .../freemarker/core/ast/ast-assignments.ftl | 29 + .../apache/freemarker/core/ast/ast-builtins.ast | 59 + .../apache/freemarker/core/ast/ast-builtins.ftl | 23 + .../freemarker/core/ast/ast-locations.ast | 155 + .../freemarker/core/ast/ast-locations.ftl | 36 + .../ast/ast-mixedcontentsimplifications.ast | 38 + .../ast/ast-mixedcontentsimplifications.ftl | 26 + .../core/ast/ast-multipleignoredchildren.ast | 30 + .../core/ast/ast-multipleignoredchildren.ftl | 33 + .../core/ast/ast-nestedignoredchildren.ast | 20 + .../core/ast/ast-nestedignoredchildren.ftl | 19 + .../apache/freemarker/core/ast/ast-range.ast | 281 ++ .../apache/freemarker/core/ast/ast-range.ftl | 47 + .../core/ast/ast-strlitinterpolation.ast | 82 + .../core/ast/ast-strlitinterpolation.ftl | 25 + .../core/ast/ast-whitespacestripping.ast | 70 + .../core/ast/ast-whitespacestripping.ftl | 40 + .../freemarker/core/ast/cano-assignments.ftl | 35 + .../core/ast/cano-assignments.ftl.out | 34 + .../freemarker/core/ast/cano-builtins.ftl | 23 + .../freemarker/core/ast/cano-builtins.ftl.out | 23 + .../core/ast/cano-identifier-escaping.ftl | 76 + .../core/ast/cano-identifier-escaping.ftl.out | 44 + .../apache/freemarker/core/ast/cano-macros.ftl | 29 + .../freemarker/core/ast/cano-macros.ftl.out | 28 + .../core/ast/cano-strlitinterpolation.ftl | 19 + .../core/ast/cano-strlitinterpolation.ftl.out | 19 + .../core/ast/encodingOverride-ISO-8859-1.ftl | 20 + .../core/ast/encodingOverride-UTF-8.ftl | 20 + .../core/model/impl/dom/DOMSiblingTest.xml | 31 + .../freemarker/core/templateresolver/test.ftl | 19 + .../org/apache/freemarker/core/toCache1.ftl | 19 + .../org/apache/freemarker/core/toCache2.ftl | 19 + .../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 + .../basic/WEB-INF/expected/attributes-2.3.0.txt | 68 + .../expected/attributes-2.3.22-future.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 | 172 + .../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/[email protected] | 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 | 113 + .../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 + .../test/templatesuite/expected/arithmetic.txt | 46 + .../test/templatesuite/expected/bean-maps.txt | 115 + .../test/templatesuite/expected/beans.txt | 56 + .../expected/boolean-formatting.txt | 32 + .../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 + .../templatesuite/expected/default-xmlns.txt | 25 + .../test/templatesuite/expected/default.txt | 26 + .../expected/encoding-builtins-ici-2.3.20.txt | 44 + .../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 | 80 + .../test/templatesuite/expected/include2.txt | 44 + .../test/templatesuite/expected/interpret.txt | 23 + .../test/templatesuite/expected/iterators.txt | 86 + .../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 | 201 ++ .../expected/listhashliteral-ici-2.3.20.txt | 39 + .../expected/listhashliteral-ici-2.3.21.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 -> 1976 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 -> 1552 bytes .../test/templatesuite/expected/switch.txt | 80 + .../test/templatesuite/expected/transforms.txt | 68 + .../expected/type-builtins-ici-2.3.21.txt | 33 + .../expected/type-builtins-ici-2.3.24.txt | 33 + .../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 | 46 + .../test/templatesuite/templates/arithmetic.ftl | 50 + .../templatesuite/templates/assignments.ftl | 108 + .../test/templatesuite/templates/bean-maps.ftl | 58 + .../test/templatesuite/templates/beans.ftl | 60 + .../templates/boolean-formatting.ftl | 83 + .../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-common.ftl | 159 + .../templates/dateformat-iso-bi-ici-2.3.21.ftl | 23 + .../templates/dateformat-iso-bi.ftl | 23 + .../templates/dateformat-iso-like.ftl | 155 + .../templatesuite/templates/dateformat-java.ftl | 71 + .../templatesuite/templates/dateparsing.ftl | 84 + .../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/exthash.ftl | 48 + .../test/templatesuite/templates/hashconcat.ftl | 60 + .../templatesuite/templates/hashliteral.ftl | 107 + .../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 | 49 + .../templates/include2-included-encoding.ftl | 20 + .../templates/include2-included.ftl | 19 + .../test/templatesuite/templates/include2.ftl | 51 + .../test/templatesuite/templates/included.ftl | 30 + .../test/templatesuite/templates/interpret.ftl | 25 + .../test/templatesuite/templates/iterators.ftl | 73 + .../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 | 50 + .../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 + .../overloaded-methods-2-bwici-2.3.20.ftl | 285 ++ .../overloaded-methods-2-bwici-2.3.21.ftl | 349 ++ .../templates/overloaded-methods-2-common.ftl | 89 + .../overloaded-methods-2-desc-bwici-2.3.20.ftl | 43 + .../overloaded-methods-2-inc-bwici-2.3.20.ftl | 47 + .../templates/overloaded-methods-23bc.ftl | 69 + .../test/templatesuite/templates/precedence.ftl | 61 + .../templatesuite/templates/range-common.ftl | 314 ++ .../templates/range-ici-2.3.20.ftl | 37 + .../templates/range-ici-2.3.21.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 + .../templates/string-builtins-ici-2.3.19.ftl | 22 + .../templates/string-builtins-ici-2.3.20.ftl | 21 + .../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 | 296 ++ 2141 files changed, 138100 insertions(+), 138763 deletions(-) ----------------------------------------------------------------------
