[libfreemarker-java] 01/05: Merge tag 'upstream/2.3.22'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Apr 30 13:38:39 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libfreemarker-java.

commit 3d600e9410609d07b4a261c653f8b96bd31e4b1a
Merge: 8d6db03 f7d2039
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Apr 30 10:38:26 2015 +0200

    Merge tag 'upstream/2.3.22'
    
    Upstream version 2.3.22

 .gitattributes                                     |     1 +
 .gitignore                                         |     9 +
 LICENSE.txt                                        |    45 +
 NOTICE.txt                                         |     4 +
 README.txt                                         |   113 +
 build.properties.sample                            |     5 +
 build.xml                                          |  1128 +
 codestyle.xml                                      |   295 +
 ivy.xml                                            |   169 +
 ivysettings.xml                                    |    35 +
 osgi.bnd                                           |    48 +
 src/dist/index.html                                |    80 +
 src/examples/README.txt                            |    20 +
 src/examples/ant/README.txt                        |     5 +
 src/examples/ant/build.xml                         |    16 +
 src/examples/ant/src/template/faq2html.ftl         |    33 +
 src/examples/ant/src/xml/faq.xml                   |   203 +
 .../WEB-INF/classes/example/AddAction.java         |    42 +
 .../example/ApplicationResources.properties        |     5 +
 .../WEB-INF/classes/example/FormAction.java        |    34 +
 .../WEB-INF/classes/example/GuestbookAction.java   |    31 +
 .../classes/example/GuestbookActionServlet.java    |    36 +
 .../WEB-INF/classes/example/GuestbookEntry.java    |    42 +
 .../classes/example/GuestbookEntryForm.java        |    70 +
 .../WEB-INF/classes/example/IndexAction.java       |    39 +
 .../struts-webapp/WEB-INF/struts-config.xml        |    42 +
 src/examples/struts-webapp/WEB-INF/struts-html.tld |  2916 ++
 src/examples/struts-webapp/WEB-INF/web.xml         |   107 +
 src/examples/struts-webapp/add.ftl                 |    14 +
 src/examples/struts-webapp/form.ftl                |    21 +
 src/examples/struts-webapp/help.html               |    25 +
 src/examples/struts-webapp/index.ftl               |    23 +
 src/examples/struts-webapp/lib/common.ftl          |    21 +
 src/examples/struts-webapp/poweredby_ffffff.png    |   Bin 0 -> 2775 bytes
 .../WEB-INF/classes/example/HelloServlet.java      |    77 +
 src/examples/webapp1/WEB-INF/templates/test.ftl    |     8 +
 src/examples/webapp1/WEB-INF/web.xml               |    20 +
 src/examples/webapp1/help.html                     |    21 +
 .../WEB-INF/classes/example/ControllerServlet.java |   145 +
 .../WEB-INF/classes/example/GuestbookEntry.java    |    42 +
 .../WEB-INF/classes/example/GuestbookServlet.java  |    94 +
 .../webapp2/WEB-INF/classes/example/Page.java      |    64 +
 src/examples/webapp2/WEB-INF/templates/add.ftl     |    14 +
 src/examples/webapp2/WEB-INF/templates/form.ftl    |    26 +
 src/examples/webapp2/WEB-INF/templates/index.ftl   |    24 +
 .../webapp2/WEB-INF/templates/lib/common.ftl       |    21 +
 src/examples/webapp2/WEB-INF/web.xml               |    20 +
 src/examples/webapp2/help.html                     |    66 +
 src/examples/webapp2/poweredby_ffffff.png          |   Bin 0 -> 2775 bytes
 src/main/java/freemarker/cache/CacheStorage.java   |    35 +
 .../freemarker/cache/CacheStorageWithGetSize.java  |    33 +
 .../java/freemarker/cache/ClassTemplateLoader.java |   213 +
 .../freemarker/cache/ConcurrentCacheStorage.java   |    32 +
 .../java/freemarker/cache/FileTemplateLoader.java  |   221 +
 .../java/freemarker/cache/MruCacheStorage.java     |   328 +
 .../java/freemarker/cache/MultiTemplateLoader.java |   197 +
 .../java/freemarker/cache/NullCacheStorage.java    |    63 +
 .../java/freemarker/cache/SoftCacheStorage.java    |   140 +
 .../freemarker/cache/StatefulTemplateLoader.java   |    33 +
 .../freemarker/cache/StringTemplateLoader.java     |   169 +
 .../java/freemarker/cache/StrongCacheStorage.java  |    68 +
 src/main/java/freemarker/cache/TemplateCache.java  |   961 +
 src/main/java/freemarker/cache/TemplateLoader.java |   144 +
 .../java/freemarker/cache/TemplateLoaderUtils.java |    41 +
 .../freemarker/cache/TemplateLookupContext.java    |   103 +
 .../freemarker/cache/TemplateLookupResult.java     |   128 +
 .../freemarker/cache/TemplateLookupStrategy.java   |   107 +
 .../java/freemarker/cache/TemplateNameFormat.java  |   423 +
 .../java/freemarker/cache/URLTemplateLoader.java   |   126 +
 .../java/freemarker/cache/URLTemplateSource.java   |   138 +
 .../freemarker/cache/WebappTemplateLoader.java     |   190 +
 src/main/java/freemarker/cache/_CacheAPI.java      |    37 +
 src/main/java/freemarker/cache/package.html        |    12 +
 .../core/APINotSupportedTemplateException.java     |    75 +
 .../java/freemarker/core/AddConcatExpression.java  |   262 +
 src/main/java/freemarker/core/AndExpression.java   |    70 +
 .../java/freemarker/core/ArithmeticEngine.java     |   538 +
 .../java/freemarker/core/ArithmeticExpression.java |   112 +
 src/main/java/freemarker/core/Assignment.java      |   166 +
 .../freemarker/core/AssignmentInstruction.java     |   119 +
 src/main/java/freemarker/core/AttemptBlock.java    |    89 +
 src/main/java/freemarker/core/BlockAssignment.java |   162 +
 src/main/java/freemarker/core/BodyInstruction.java |   142 +
 .../java/freemarker/core/BooleanExpression.java    |    29 +
 src/main/java/freemarker/core/BooleanLiteral.java  |    75 +
 .../java/freemarker/core/BoundedRangeModel.java    |    62 +
 .../java/freemarker/core/BreakInstruction.java     |    60 +
 src/main/java/freemarker/core/BugException.java    |    49 +
 src/main/java/freemarker/core/BuiltIn.java         |   419 +
 src/main/java/freemarker/core/BuiltInForDate.java  |    54 +
 .../java/freemarker/core/BuiltInForHashEx.java     |    52 +
 src/main/java/freemarker/core/BuiltInForNode.java  |    37 +
 .../java/freemarker/core/BuiltInForNumber.java     |    33 +
 .../java/freemarker/core/BuiltInForSequence.java   |    37 +
 .../java/freemarker/core/BuiltInForString.java     |    29 +
 .../java/freemarker/core/BuiltInsForDates.java     |   209 +
 .../java/freemarker/core/BuiltInsForHashes.java    |    53 +
 .../freemarker/core/BuiltInsForMultipleTypes.java  |   648 +
 .../java/freemarker/core/BuiltInsForNodes.java     |   128 +
 .../java/freemarker/core/BuiltInsForNumbers.java   |   307 +
 .../java/freemarker/core/BuiltInsForSequences.java |   833 +
 .../freemarker/core/BuiltInsForStringsBasic.java   |   660 +
 .../core/BuiltInsForStringsEncoding.java           |   185 +
 .../freemarker/core/BuiltInsForStringsMisc.java    |   100 +
 .../freemarker/core/BuiltInsForStringsRegexp.java  |   300 +
 src/main/java/freemarker/core/BuiltinVariable.java |   212 +
 ...CallPlaceCustomDataInitializationException.java |    30 +
 src/main/java/freemarker/core/Case.java            |    90 +
 .../freemarker/core/CollectionAndSequence.java     |   103 +
 src/main/java/freemarker/core/CommandLine.java     |    64 +
 src/main/java/freemarker/core/Comment.java         |    78 +
 .../java/freemarker/core/ComparisonExpression.java |    99 +
 src/main/java/freemarker/core/CompressedBlock.java |    74 +
 .../java/freemarker/core/ConditionalBlock.java     |   109 +
 src/main/java/freemarker/core/Configurable.java    |  1952 ++
 src/main/java/freemarker/core/CustomAttribute.java |   238 +
 src/main/java/freemarker/core/DebugBreak.java      |    89 +
 .../java/freemarker/core/DefaultToExpression.java  |   127 +
 .../java/freemarker/core/DirectiveCallPlace.java   |   138 +
 src/main/java/freemarker/core/DollarVariable.java  |    84 +
 src/main/java/freemarker/core/Dot.java             |    86 +
 src/main/java/freemarker/core/DynamicKeyName.java  |   300 +
 src/main/java/freemarker/core/Environment.java     |  2353 ++
 src/main/java/freemarker/core/EscapeBlock.java     |   104 +
 src/main/java/freemarker/core/EvalUtil.java        |   386 +
 .../java/freemarker/core/ExistenceBuiltins.java    |   125 +
 .../java/freemarker/core/ExistsExpression.java     |    79 +
 src/main/java/freemarker/core/Expression.java      |   191 +
 .../java/freemarker/core/FallbackInstruction.java  |    53 +
 .../java/freemarker/core/FlushInstruction.java     |    54 +
 src/main/java/freemarker/core/FreeMarkerTree.java  |    50 +
 src/main/java/freemarker/core/HashLiteral.java     |   193 +
 src/main/java/freemarker/core/ICIChainMember.java  |    38 +
 .../freemarker/core/ISOLikeTemplateDateFormat.java |   237 +
 .../core/ISOLikeTemplateDateFormatFactory.java     |    57 +
 .../freemarker/core/ISOTemplateDateFormat.java     |    76 +
 .../core/ISOTemplateDateFormatFactory.java         |    36 +
 src/main/java/freemarker/core/Identifier.java      |    94 +
 src/main/java/freemarker/core/IfBlock.java         |   107 +
 src/main/java/freemarker/core/Include.java         |   241 +
 src/main/java/freemarker/core/Interpret.java       |   159 +
 .../freemarker/core/InvalidReferenceException.java |   128 +
 src/main/java/freemarker/core/IteratorBlock.java   |   208 +
 .../freemarker/core/JavaTemplateDateFormat.java    |    56 +
 .../core/JavaTemplateDateFormatFactory.java        |   169 +
 src/main/java/freemarker/core/LibraryLoad.java     |   115 +
 src/main/java/freemarker/core/ListLiteral.java     |   189 +
 .../core/ListableRightUnboundedRangeModel.java     |    90 +
 src/main/java/freemarker/core/LocalContext.java    |    35 +
 src/main/java/freemarker/core/Macro.java           |   331 +
 src/main/java/freemarker/core/MessageUtil.java     |   327 +
 src/main/java/freemarker/core/MethodCall.java      |   141 +
 src/main/java/freemarker/core/MiscUtil.java        |    65 +
 src/main/java/freemarker/core/MixedContent.java    |   118 +
 .../core/NestedContentNotSupportedException.java   |    64 +
 src/main/java/freemarker/core/NewBI.java           |    83 +
 src/main/java/freemarker/core/NoEscapeBlock.java   |    69 +
 .../java/freemarker/core/NonBooleanException.java  |    59 +
 .../java/freemarker/core/NonDateException.java     |    55 +
 .../freemarker/core/NonExtendedHashException.java  |    59 +
 .../java/freemarker/core/NonHashException.java     |    61 +
 .../core/NonListableRightUnboundedRangeModel.java  |    36 +
 .../java/freemarker/core/NonMethodException.java   |    61 +
 .../freemarker/core/NonNamespaceException.java     |    60 +
 .../java/freemarker/core/NonNodeException.java     |    61 +
 .../freemarker/core/NonNumericalException.java     |    68 +
 .../java/freemarker/core/NonSequenceException.java |    61 +
 .../core/NonSequenceOrCollectionException.java     |    65 +
 .../java/freemarker/core/NonStringException.java   |    71 +
 .../core/NonUserDefinedDirectiveLikeException.java |    64 +
 src/main/java/freemarker/core/NotExpression.java   |    64 +
 src/main/java/freemarker/core/NumberLiteral.java   |    80 +
 src/main/java/freemarker/core/NumericalOutput.java |   143 +
 .../core/OptInTemplateClassResolver.java           |   154 +
 src/main/java/freemarker/core/OrExpression.java    |    70 +
 src/main/java/freemarker/core/ParameterRole.java   |    87 +
 .../freemarker/core/ParentheticalExpression.java   |    75 +
 src/main/java/freemarker/core/ParseException.java  |   544 +
 src/main/java/freemarker/core/PropertySetting.java |   145 +
 src/main/java/freemarker/core/Range.java           |   110 +
 src/main/java/freemarker/core/RangeModel.java      |    56 +
 src/main/java/freemarker/core/RecoveryBlock.java   |    70 +
 src/main/java/freemarker/core/RecurseNode.java     |   118 +
 src/main/java/freemarker/core/RegexpHelper.java    |   201 +
 .../java/freemarker/core/ReturnInstruction.java    |    86 +
 .../freemarker/core/RightUnboundedRangeModel.java  |    41 +
 src/main/java/freemarker/core/StopException.java   |    61 +
 src/main/java/freemarker/core/StopInstruction.java |    73 +
 .../java/freemarker/core/StringArraySequence.java  |    55 +
 src/main/java/freemarker/core/StringLiteral.java   |   125 +
 src/main/java/freemarker/core/SwitchBlock.java     |   124 +
 .../freemarker/core/TemplateClassResolver.java     |   103 +
 .../java/freemarker/core/TemplateDateFormat.java   |    79 +
 .../freemarker/core/TemplateDateFormatFactory.java |    90 +
 src/main/java/freemarker/core/TemplateElement.java |   430 +
 src/main/java/freemarker/core/TemplateObject.java  |   246 +
 .../freemarker/core/TemplatePostProcessor.java     |    31 +
 .../core/TemplatePostProcessorException.java       |    32 +
 src/main/java/freemarker/core/TextBlock.java       |   391 +
 ...adInterruptionSupportTemplatePostProcessor.java |   160 +
 src/main/java/freemarker/core/TokenMgrError.java   |   250 +
 src/main/java/freemarker/core/TransformBlock.java  |   156 +
 src/main/java/freemarker/core/TrimInstruction.java |    97 +
 .../freemarker/core/UnaryPlusMinusExpression.java  |   100 +
 .../freemarker/core/UnexpectedTypeException.java   |    80 +
 .../core/UnformattableDateException.java           |    36 +
 src/main/java/freemarker/core/UnifiedCall.java     |   343 +
 ...nownDateTypeFormattingUnsupportedException.java |    31 +
 src/main/java/freemarker/core/VisitNode.java       |   114 +
 .../java/freemarker/core/XSTemplateDateFormat.java |    80 +
 .../core/XSTemplateDateFormatFactory.java          |    36 +
 src/main/java/freemarker/core/_ArrayIterator.java  |    48 +
 .../freemarker/core/_ConcurrentMapFactory.java     |   123 +
 src/main/java/freemarker/core/_CoreAPI.java        |   129 +
 .../java/freemarker/core/_CoreStringUtils.java     |    99 +
 src/main/java/freemarker/core/_DelayedAOrAn.java   |    31 +
 .../core/_DelayedConversionToString.java           |    42 +
 .../core/_DelayedFTLTypeDescription.java           |    33 +
 .../java/freemarker/core/_DelayedGetMessage.java   |    31 +
 .../core/_DelayedGetMessageWithoutStackTop.java    |    32 +
 src/main/java/freemarker/core/_DelayedJQuote.java  |    32 +
 src/main/java/freemarker/core/_DelayedOrdinal.java |    43 +
 .../freemarker/core/_DelayedShortClassName.java    |    31 +
 .../java/freemarker/core/_DelayedToString.java     |    33 +
 .../freemarker/core/_ErrorDescriptionBuilder.java  |   348 +
 .../freemarker/core/_MiscTemplateException.java    |   126 +
 .../_ObjectBuilderSettingEvaluationException.java  |    43 +
 .../core/_ObjectBuilderSettingEvaluator.java       |   676 +
 .../core/_SettingEvaluationEnvironment.java        |    59 +
 src/main/java/freemarker/core/_SortedArraySet.java |    69 +
 .../freemarker/core/_TemplateModelException.java   |   130 +
 ..._UnexpectedTypeErrorExplainerTemplateModel.java |    33 +
 .../freemarker/core/_UnmodifiableCompositeSet.java |    90 +
 .../java/freemarker/core/_UnmodifiableSet.java     |    42 +
 src/main/java/freemarker/core/package.html         |     8 +
 src/main/java/freemarker/debug/Breakpoint.java     |    86 +
 src/main/java/freemarker/debug/DebugModel.java     |   116 +
 .../java/freemarker/debug/DebuggedEnvironment.java |    54 +
 src/main/java/freemarker/debug/Debugger.java       |   102 +
 src/main/java/freemarker/debug/DebuggerClient.java |   164 +
 .../java/freemarker/debug/DebuggerListener.java    |    35 +
 .../debug/EnvironmentSuspendedEvent.java           |    69 +
 .../java/freemarker/debug/impl/DebuggerServer.java |   147 +
 .../freemarker/debug/impl/DebuggerService.java     |    99 +
 .../freemarker/debug/impl/RmiDebugModelImpl.java   |   171 +
 .../debug/impl/RmiDebuggedEnvironmentImpl.java     |   395 +
 .../freemarker/debug/impl/RmiDebuggerImpl.java     |    89 +
 .../debug/impl/RmiDebuggerListenerImpl.java        |    68 +
 .../freemarker/debug/impl/RmiDebuggerService.java  |   481 +
 src/main/java/freemarker/debug/package.html        |     9 +
 .../java/freemarker/ext/ant/FreemarkerXmlTask.java |   675 +
 .../java/freemarker/ext/ant/JythonAntTask.java     |    89 +
 .../ext/ant/UnlinkedJythonOperations.java          |    36 +
 .../ext/ant/UnlinkedJythonOperationsImpl.java      |    56 +
 src/main/java/freemarker/ext/ant/package.html      |     9 +
 src/main/java/freemarker/ext/beans/APIModel.java   |    42 +
 .../java/freemarker/ext/beans/ArgumentTypes.java   |   726 +
 src/main/java/freemarker/ext/beans/ArrayModel.java |   132 +
 src/main/java/freemarker/ext/beans/BeanModel.java  |   399 +
 .../java/freemarker/ext/beans/BeansModelCache.java |    73 +
 .../java/freemarker/ext/beans/BeansWrapper.java    |  1828 ++
 .../freemarker/ext/beans/BeansWrapperBuilder.java  |   151 +
 .../ext/beans/BeansWrapperConfiguration.java       |   229 +
 .../ext/beans/BeansWrapperSingletonHolder.java     |    29 +
 .../java/freemarker/ext/beans/BooleanModel.java    |    39 +
 .../ext/beans/CallableMemberDescriptor.java        |    53 +
 .../freemarker/ext/beans/CharacterOrString.java    |    42 +
 .../ext/beans/ClassBasedModelFactory.java          |   146 +
 .../freemarker/ext/beans/ClassChangeNotifier.java  |    29 +
 .../freemarker/ext/beans/ClassIntrospector.java    |   812 +
 .../ext/beans/ClassIntrospectorBuilder.java        |   193 +
 .../freemarker/ext/beans/CollectionAdapter.java    |    82 +
 .../java/freemarker/ext/beans/CollectionModel.java |   116 +
 src/main/java/freemarker/ext/beans/DateModel.java  |    80 +
 .../ext/beans/EmptyCallableMemberDescriptor.java   |    32 +
 .../ext/beans/EmptyMemberAndArguments.java         |    90 +
 .../freemarker/ext/beans/EnumerationModel.java     |   108 +
 .../java/freemarker/ext/beans/HashAdapter.java     |   168 +
 .../ext/beans/InvalidPropertyException.java        |    31 +
 .../java/freemarker/ext/beans/IteratorModel.java   |   112 +
 .../ext/beans/JRebelClassChangeNotifier.java       |    53 +
 src/main/java/freemarker/ext/beans/MapModel.java   |   122 +
 .../beans/MaybeEmptyCallableMemberDescriptor.java  |    22 +
 .../ext/beans/MaybeEmptyMemberAndArguments.java    |    19 +
 .../freemarker/ext/beans/MemberAndArguments.java   |    61 +
 .../ext/beans/MethodAppearanceFineTuner.java       |    92 +
 .../java/freemarker/ext/beans/MethodSorter.java    |    29 +
 .../beans/NonPrimitiveArrayBackedReadOnlyList.java |    37 +
 .../java/freemarker/ext/beans/NumberModel.java     |    60 +
 .../ext/beans/OverloadedFixArgsMethods.java        |    97 +
 .../freemarker/ext/beans/OverloadedMethods.java    |   232 +
 .../ext/beans/OverloadedMethodsModel.java          |    85 +
 .../ext/beans/OverloadedMethodsSubset.java         |   424 +
 .../freemarker/ext/beans/OverloadedNumberUtil.java |  1234 +
 .../ext/beans/OverloadedVarArgsMethods.java        |   246 +
 .../ext/beans/PrimtiveArrayBackedReadOnlyList.java |    42 +
 .../beans/ReflectionCallableMemberDescriptor.java  |    84 +
 .../freemarker/ext/beans/ResourceBundleModel.java  |   206 +
 .../java/freemarker/ext/beans/SequenceAdapter.java |    64 +
 src/main/java/freemarker/ext/beans/SetAdapter.java |    29 +
 .../java/freemarker/ext/beans/SimpleMapModel.java  |   118 +
 .../java/freemarker/ext/beans/SimpleMethod.java    |   166 +
 .../freemarker/ext/beans/SimpleMethodModel.java    |   136 +
 .../freemarker/ext/beans/SingletonCustomizer.java  |    48 +
 .../java/freemarker/ext/beans/StaticModel.java     |   200 +
 .../java/freemarker/ext/beans/StaticModels.java    |    39 +
 .../java/freemarker/ext/beans/StringModel.java     |    63 +
 src/main/java/freemarker/ext/beans/TypeFlags.java  |   127 +
 .../java/freemarker/ext/beans/UnsafeMethods.java   |   127 +
 src/main/java/freemarker/ext/beans/_BeansAPI.java  |   213 +
 .../java/freemarker/ext/beans/_EnumModels.java     |    50 +
 .../java/freemarker/ext/beans/_MethodUtil.java     |   317 +
 src/main/java/freemarker/ext/beans/package.html    |    22 +
 .../freemarker/ext/dom/AttributeNodeModel.java     |    63 +
 .../freemarker/ext/dom/CharacterDataNodeModel.java |    41 +
 .../java/freemarker/ext/dom/DocumentModel.java     |    74 +
 .../java/freemarker/ext/dom/DocumentTypeModel.java |    51 +
 src/main/java/freemarker/ext/dom/ElementModel.java |   183 +
 .../java/freemarker/ext/dom/JaxenXPathSupport.java |   231 +
 .../java/freemarker/ext/dom/NodeListModel.java     |   200 +
 src/main/java/freemarker/ext/dom/NodeModel.java    |   688 +
 .../java/freemarker/ext/dom/NodeOutputter.java     |   262 +
 src/main/java/freemarker/ext/dom/PINodeModel.java  |    40 +
 .../ext/dom/SunInternalXalanXPathSupport.java      |   142 +
 src/main/java/freemarker/ext/dom/Transform.java    |   208 +
 src/main/java/freemarker/ext/dom/XPathSupport.java |    24 +
 .../java/freemarker/ext/dom/XalanXPathSupport.java |   156 +
 src/main/java/freemarker/ext/dom/package.html      |    13 +
 .../java/freemarker/ext/jdom/NodeListModel.java    |  1285 +
 src/main/java/freemarker/ext/jdom/package.html     |    11 +
 .../java/freemarker/ext/jsp/EventForwarding.java   |   229 +
 .../ext/jsp/FreeMarkerJspApplicationContext.java   |   158 +
 .../freemarker/ext/jsp/FreeMarkerJspFactory.java   |    57 +
 .../freemarker/ext/jsp/FreeMarkerJspFactory2.java  |    27 +
 .../freemarker/ext/jsp/FreeMarkerJspFactory21.java |    47 +
 .../freemarker/ext/jsp/FreeMarkerPageContext.java  |   472 +
 .../java/freemarker/ext/jsp/FreemarkerTag.java     |   152 +
 .../java/freemarker/ext/jsp/JspContextModel.java   |    55 +
 .../java/freemarker/ext/jsp/JspTagModelBase.java   |   173 +
 .../java/freemarker/ext/jsp/JspWriterAdapter.java  |   177 +
 .../freemarker/ext/jsp/PageContextFactory.java     |    72 +
 .../ext/jsp/SimpleTagDirectiveModel.java           |   108 +
 .../java/freemarker/ext/jsp/TagTransformModel.java |   414 +
 .../java/freemarker/ext/jsp/TaglibFactory.java     |  2032 ++
 .../java/freemarker/ext/jsp/TaglibMethodUtil.java  |   125 +
 .../ext/jsp/_FreeMarkerPageContext1.java           |    34 +
 .../ext/jsp/_FreeMarkerPageContext2.java           |    90 +
 .../ext/jsp/_FreeMarkerPageContext21.java          |   114 +
 src/main/java/freemarker/ext/jsp/package.html      |    11 +
 .../freemarker/ext/jython/JythonHashModel.java     |   128 +
 .../java/freemarker/ext/jython/JythonModel.java    |   204 +
 .../freemarker/ext/jython/JythonModelCache.java    |    98 +
 .../freemarker/ext/jython/JythonNumberModel.java   |    74 +
 .../freemarker/ext/jython/JythonSequenceModel.java |   101 +
 .../ext/jython/JythonVersionAdapter.java           |    45 +
 .../ext/jython/JythonVersionAdapterHolder.java     |    71 +
 .../java/freemarker/ext/jython/JythonWrapper.java  |   315 +
 .../ext/jython/_Jython20And21VersionAdapter.java   |    42 +
 .../ext/jython/_Jython22VersionAdapter.java        |    42 +
 .../ext/jython/_Jython25VersionAdapter.java        |    42 +
 src/main/java/freemarker/ext/jython/package.html   |    19 +
 src/main/java/freemarker/ext/package.html          |     7 +
 .../freemarker/ext/rhino/RhinoFunctionModel.java   |    54 +
 .../freemarker/ext/rhino/RhinoScriptableModel.java |   138 +
 .../java/freemarker/ext/rhino/RhinoWrapper.java    |    84 +
 src/main/java/freemarker/ext/rhino/package.html    |    10 +
 .../ext/servlet/AllHttpScopesHashModel.java        |   112 +
 .../freemarker/ext/servlet/FreemarkerServlet.java  |  1428 +
 .../ext/servlet/HttpRequestHashModel.java          |   111 +
 .../servlet/HttpRequestParametersHashModel.java    |    97 +
 .../ext/servlet/HttpSessionHashModel.java          |   118 +
 .../java/freemarker/ext/servlet/IncludePage.java   |   262 +
 .../ext/servlet/ServletContextHashModel.java       |    74 +
 src/main/java/freemarker/ext/servlet/package.html  |     7 +
 .../java/freemarker/ext/util/IdentityHashMap.java  |   906 +
 src/main/java/freemarker/ext/util/ModelCache.java  |   155 +
 .../java/freemarker/ext/util/ModelFactory.java     |    32 +
 .../freemarker/ext/util/WrapperTemplateModel.java  |    33 +
 src/main/java/freemarker/ext/util/package.html     |     5 +
 src/main/java/freemarker/ext/xml/Namespaces.java   |    83 +
 src/main/java/freemarker/ext/xml/Navigator.java    |   300 +
 .../java/freemarker/ext/xml/NodeListModel.java     |   573 +
 src/main/java/freemarker/ext/xml/NodeOperator.java |    25 +
 .../java/freemarker/ext/xml/_Dom4jNavigator.java   |   245 +
 .../java/freemarker/ext/xml/_DomNavigator.java     |   329 +
 .../java/freemarker/ext/xml/_JaxenNamespaces.java  |    26 +
 .../java/freemarker/ext/xml/_JdomNavigator.java    |   362 +
 src/main/java/freemarker/ext/xml/package.html      |    10 +
 .../log/CommonsLoggingLoggerFactory.java           |    92 +
 src/main/java/freemarker/log/Logger.java           |   575 +
 src/main/java/freemarker/log/LoggerFactory.java    |    21 +
 .../java/freemarker/log/SLF4JLoggerFactory.java    |   175 +
 .../java/freemarker/log/_AvalonLoggerFactory.java  |   108 +
 .../log/_CommonsLoggingLoggerFactory.java          |    25 +
 .../java/freemarker/log/_JULLoggerFactory.java     |   108 +
 .../java/freemarker/log/_Log4jLoggerFactory.java   |   108 +
 .../java/freemarker/log/_Log4jOverSLF4JTester.java |    40 +
 .../java/freemarker/log/_NullLoggerFactory.java    |    93 +
 .../java/freemarker/log/_SLF4JLoggerFactory.java   |    26 +
 src/main/java/freemarker/log/package.html          |     9 +
 .../freemarker/template/AdapterTemplateModel.java  |    46 +
 .../java/freemarker/template/Configuration.java    |  2239 ++
 .../freemarker/template/DefaultArrayAdapter.java   |   345 +
 .../template/DefaultIteratorAdapter.java           |   112 +
 .../freemarker/template/DefaultListAdapter.java    |   131 +
 .../freemarker/template/DefaultMapAdapter.java     |   154 +
 .../template/DefaultNonListCollectionAdapter.java  |   132 +
 .../freemarker/template/DefaultObjectWrapper.java  |   353 +
 .../template/DefaultObjectWrapperBuilder.java      |    77 +
 .../DefaultObjectWrapperConfiguration.java         |    76 +
 src/main/java/freemarker/template/EmptyMap.java    |    86 +
 .../template/FalseTemplateBooleanModel.java        |    32 +
 .../freemarker/template/GeneralPurposeNothing.java |    77 +
 .../java/freemarker/template/LocalizedString.java  |    51 +
 .../template/MalformedTemplateNameException.java   |    53 +
 .../java/freemarker/template/ObjectWrapper.java    |    91 +
 .../template/ObjectWrapperAndUnwrapper.java        |    89 +
 .../template/ResourceBundleLocalizedString.java    |    51 +
 .../template/SerializableTemplateBooleanModel.java |    21 +
 .../java/freemarker/template/SimpleCollection.java |   143 +
 src/main/java/freemarker/template/SimpleDate.java  |    76 +
 src/main/java/freemarker/template/SimpleHash.java  |   402 +
 src/main/java/freemarker/template/SimpleList.java  |    38 +
 .../java/freemarker/template/SimpleNumber.java     |    70 +
 .../freemarker/template/SimpleObjectWrapper.java   |    59 +
 .../java/freemarker/template/SimpleScalar.java     |    55 +
 .../java/freemarker/template/SimpleSequence.java   |   288 +
 src/main/java/freemarker/template/Template.java    |   869 +
 .../freemarker/template/TemplateBooleanModel.java  |    40 +
 .../template/TemplateCollectionModel.java          |    45 +
 .../template/TemplateCollectionModelEx.java        |    54 +
 .../freemarker/template/TemplateDateModel.java     |    68 +
 .../freemarker/template/TemplateDirectiveBody.java |    41 +
 .../template/TemplateDirectiveModel.java           |    66 +
 .../freemarker/template/TemplateException.java     |   650 +
 .../template/TemplateExceptionHandler.java         |   149 +
 .../freemarker/template/TemplateHashModel.java     |    38 +
 .../freemarker/template/TemplateHashModelEx.java   |    46 +
 .../freemarker/template/TemplateMethodModel.java   |    56 +
 .../freemarker/template/TemplateMethodModelEx.java |    50 +
 .../java/freemarker/template/TemplateModel.java    |    51 +
 .../freemarker/template/TemplateModelAdapter.java  |    31 +
 .../template/TemplateModelException.java           |   107 +
 .../freemarker/template/TemplateModelIterator.java |    36 +
 .../template/TemplateModelListSequence.java        |    49 +
 .../template/TemplateModelWithAPISupport.java      |    38 +
 .../freemarker/template/TemplateNodeModel.java     |    75 +
 .../template/TemplateNotFoundException.java        |    58 +
 .../freemarker/template/TemplateNumberModel.java   |    35 +
 .../freemarker/template/TemplateScalarModel.java   |    37 +
 .../freemarker/template/TemplateSequenceModel.java |    45 +
 .../template/TemplateTransformModel.java           |    51 +
 .../java/freemarker/template/TransformControl.java |    97 +
 .../template/TrueTemplateBooleanModel.java         |    32 +
 src/main/java/freemarker/template/Version.java     |   268 +
 .../freemarker/template/WrappingTemplateModel.java |   108 +
 .../java/freemarker/template/_TemplateAPI.java     |   100 +
 src/main/java/freemarker/template/package.html     |     9 +
 .../freemarker/template/utility/CaptureOutput.java |   141 +
 .../freemarker/template/utility/ClassUtil.java     |   374 +
 .../template/utility/CollectionUtils.java          |    33 +
 .../freemarker/template/utility/Collections12.java |    45 +
 .../freemarker/template/utility/Constants.java     |   119 +
 .../freemarker/template/utility/DOMNodeModel.java  |   281 +
 .../java/freemarker/template/utility/DateUtil.java |   908 +
 .../freemarker/template/utility/DeepUnwrap.java    |   159 +
 .../java/freemarker/template/utility/Execute.java  |   102 +
 .../freemarker/template/utility/HtmlEscape.java    |   107 +
 .../freemarker/template/utility/JythonRuntime.java |    70 +
 .../template/utility/NormalizeNewlines.java        |   109 +
 .../template/utility/NullArgumentException.java    |    48 +
 .../freemarker/template/utility/NullWriter.java    |    80 +
 .../freemarker/template/utility/NumberUtil.java    |   167 +
 .../template/utility/ObjectConstructor.java        |    56 +
 .../freemarker/template/utility/ObjectFactory.java |    28 +
 .../utility/ObjectWrapperWithAPISupport.java       |    48 +
 .../freemarker/template/utility/OptimizerUtil.java |   107 +
 .../template/utility/RichObjectWrapper.java        |    34 +
 .../template/utility/SecurityUtilities.java        |    88 +
 .../template/utility/StandardCompress.java         |   237 +
 .../freemarker/template/utility/StringUtil.java    |  1995 ++
 .../freemarker/template/utility/ToCanonical.java   |    75 +
 .../utility/UndeclaredThrowableException.java      |    43 +
 .../utility/UnrecognizedTimeZoneException.java     |    35 +
 .../utility/UnsupportedNumberClassException.java   |    35 +
 .../template/utility/WriteProtectable.java         |    34 +
 .../freemarker/template/utility/XmlEscape.java     |    90 +
 .../java/freemarker/template/utility/package.html  |     7 +
 src/main/javacc/FTL.jj                             |  3266 ++
 .../freemarker/adhoc/IdentifierCharGenerator.java  |   544 +
 src/main/misc/overloadedNumberRules/README.txt     |    15 +
 src/main/misc/overloadedNumberRules/config.fmpp    |    56 +
 src/main/misc/overloadedNumberRules/generator.ftl  |    62 +
 src/main/misc/overloadedNumberRules/prices.csv     |    48 +
 src/main/misc/overloadedNumberRules/prices.ods     |   Bin 0 -> 17855 bytes
 .../freemarker/ext/beans/unsafeMethods.txt         |    81 +
 .../resources/freemarker/ext/jsp/web-app_2_2.dtd   |   581 +
 .../resources/freemarker/ext/jsp/web-app_2_3.dtd   |  1003 +
 .../freemarker/ext/jsp/web-jsptaglibrary_1_1.dtd   |   207 +
 .../freemarker/ext/jsp/web-jsptaglibrary_1_2.dtd   |   478 +
 src/main/resources/freemarker/version.properties   |    83 +
 src/manual/book.xml                                | 32787 +++++++++++++++++++
 src/manual/docgen-help/editors-readme.txt          |   105 +
 src/manual/docgen-misc/googleAnalytics.html        |     9 +
 .../figures/model2sketch_with_alpha.png            |   Bin 0 -> 61463 bytes
 .../docgen-originals/figures/tree_with_alpha.png   |   Bin 0 -> 10304 bytes
 src/manual/docgen.cjson                            |    34 +
 src/manual/figures/model2sketch.png                |   Bin 0 -> 21425 bytes
 src/manual/figures/overview.png                    |   Bin 0 -> 4996 bytes
 src/manual/figures/tree.png                        |   Bin 0 -> 4699 bytes
 .../java/freemarker/cache/TemplateCacheTest.java   |   440 +
 .../freemarker/cache/TemplateNameFormatTest.java   |   325 +
 .../freemarker/core/ASTBasedErrorMessagesTest.java |    77 +
 src/test/java/freemarker/core/ASTPrinter.java      |   351 +
 src/test/java/freemarker/core/ASTTest.java         |    45 +
 .../java/freemarker/core/CanonicalFormTest.java    |    50 +
 .../java/freemarker/core/ConfigurableTest.java     |    76 +
 .../freemarker/core/DirectiveCallPlaceTest.java    |   251 +
 .../java/freemarker/core/EncodingOverrideTest.java |    67 +
 .../java/freemarker/core/HeaderParsingTest.java    |    62 +
 .../freemarker/core/MiscErrorMessagesTest.java     |    44 +
 .../freemarker/core/ObjectBuilderSettingsTest.java |   979 +
 .../core/OptInTemplateClassResolverTest.java       |   212 +
 .../freemarker/core/ParsingErrorMessagesTest.java  |   109 +
 src/test/java/freemarker/core/SQLTimeZoneTest.java |   369 +
 .../java/freemarker/core/SettingDirectiveTest.java |    37 +
 .../java/freemarker/core/SpecialVariableTest.java  |    37 +
 .../freemarker/core/TagSyntaxVariationsTest.java   |   231 +
 .../freemarker/core/TemplateLevelSettings.java     |   112 +
 .../core/TestEnvironmentGetTemplateVariants.java   |   221 +
 .../core/TheadInterruptingSupportTest.java         |   157 +
 .../freemarker/core/TypeErrorMessagesTest.java     |    98 +
 .../java/freemarker/core/UnclosedCommentTest.java  |    65 +
 .../freemarker/core/WhitespaceStrippingTest.java   |    68 +
 .../freemarker/core/subpkg/PackageVisibleAll.java  |    23 +
 .../core/subpkg/PackageVisibleAllWithBuilder.java  |    23 +
 .../PackageVisibleAllWithBuilderBuilder.java       |    25 +
 .../PackageVisibleWithPublicConstructor.java       |    24 +
 .../java/freemarker/core/subpkg/PublicAll.java     |    21 +
 .../core/subpkg/PublicWithMixedConstructors.java   |    35 +
 .../PublicWithPackageVisibleConstructor.java       |    23 +
 .../beans/AbstractParallelIntrospectionTest.java   |   120 +
 .../ext/beans/AlphabeticalMethodSorter.java        |    44 +
 .../ext/beans/BeansAPINewInstanceTest.java         |   130 +
 .../freemarker/ext/beans/BeansWrapperBasics.java   |    60 +
 .../ext/beans/BeansWrapperCachesTest.java          |    95 +
 .../ext/beans/BeansWrapperDesc2003020.java         |    27 +
 .../ext/beans/BeansWrapperDesc2003021.java         |    27 +
 .../ext/beans/BeansWrapperInc2003020.java          |    27 +
 .../ext/beans/BeansWrapperInc2003021.java          |    27 +
 .../freemarker/ext/beans/BeansWrapperMiscTest.java |    54 +
 .../ext/beans/BeansWrapperReadOnlyTest.java        |    90 +
 .../ext/beans/BeansWrapperSingletonsTest.java      |   792 +
 .../ext/beans/BeansWrapperWithShortedMethods.java  |    36 +
 .../CommonSupertypeForUnwrappingHintTest.java      |   177 +
 .../ext/beans/DefaultObjectWrapperDesc2003020.java |    27 +
 .../ext/beans/DefaultObjectWrapperDesc2003021.java |    27 +
 .../ext/beans/DefaultObjectWrapperDesc2003022.java |    27 +
 .../ext/beans/DefaultObjectWrapperInc2003020.java  |    27 +
 .../ext/beans/DefaultObjectWrapperInc2003021.java  |    27 +
 .../ext/beans/DefaultObjectWrapperInc2003022.java  |    27 +
 .../DefaultObjectWrapperWithSortedMethods.java     |    37 +
 .../java/freemarker/ext/beans/EnumModelsTest.java  |    82 +
 .../freemarker/ext/beans/ErrorMessagesTest.java    |    52 +
 .../ext/beans/FineTuneMethodAppearanceTest.java    |    98 +
 .../beans/GetlessMethodsAsPropertyGettersRule.java |    66 +
 .../freemarker/ext/beans/IsApplicableTest.java     |   168 +
 .../ext/beans/IsMoreSpecificParameterTypeTest.java |    95 +
 .../ext/beans/Java7MembersOnlyBeansWrapper.java    |    98 +
 .../ext/beans/ManyObjectsOfDifferentClasses.java   |   246 +
 .../ext/beans/ManyStaticsOfDifferentClasses.java   |   233 +
 .../ext/beans/MiscNumericalOperationsTest.java     |   117 +
 .../java/freemarker/ext/beans/ModelCacheTest.java  |    63 +
 .../ext/beans/OverloadedNumberUtilTest.java        |   582 +
 .../ext/beans/ParameterListPreferabilityTest.java  |   441 +
 .../ext/beans/PrallelObjectIntrospectionTest.java  |    39 +
 .../ext/beans/PrallelStaticIntrospectionTest.java  |    43 +
 .../java/freemarker/ext/beans/RationalNumber.java  |    87 +
 .../freemarker/ext/beans/StaticModelsTest.java     |    88 +
 .../java/freemarker/ext/beans/TypeFlagsTest.java   |   654 +
 .../ext/jsp/JspTestFreemarkerServlet.java          |    47 +
 ...spTestFreemarkerServletWithDefaultOverride.java |    44 +
 .../ext/jsp/RealServletContainertTest.java         |   483 +
 .../java/freemarker/ext/jsp/TLDParsingTest.java    |   132 +
 .../freemarker/ext/jsp/TaglibMethodUtilTest.java   |   104 +
 .../jsp/taglibmembers/AttributeAccessorTag.java    |    65 +
 .../ext/jsp/taglibmembers/AttributeInfoTag.java    |    56 +
 .../ext/jsp/taglibmembers/EnclosingClass.java      |    29 +
 .../ext/jsp/taglibmembers/GetAndSetTag.java        |    63 +
 .../ext/jsp/taglibmembers/TestFunctions.java       |    76 +
 .../ext/jsp/taglibmembers/TestSimpleTag.java       |    55 +
 .../ext/jsp/taglibmembers/TestSimpleTag2.java      |    30 +
 .../ext/jsp/taglibmembers/TestSimpleTag3.java      |    30 +
 .../freemarker/ext/jsp/taglibmembers/TestTag.java  |    97 +
 .../freemarker/ext/jsp/taglibmembers/TestTag2.java |    48 +
 .../freemarker/ext/jsp/taglibmembers/TestTag3.java |    48 +
 .../freemarker/template/ActualTagSyntaxTest.java   |    62 +
 .../freemarker/template/ConfigurationTest.java     |  1053 +
 .../freemarker/template/CustomAttributeTest.java   |   224 +
 .../template/DefaultObjectWrapperTest.java         |  1040 +
 .../java/freemarker/template/ExceptionTest.java    |   114 +
 .../template/IncudeFromNamelessTest.java           |    53 +
 .../template/MistakenlyPublicImportAPIsTest.java   |   103 +
 .../template/MistakenlyPublicMacroAPIsTest.java    |    86 +
 .../freemarker/template/NullConfigurationTest.java |    31 +
 .../template/SimpleObjetWrapperTest.java           |   100 +
 .../template/StaticObjectWrappersTest.java         |    33 +
 .../java/freemarker/template/StringUtilTest.java   |   155 +
 .../template/TemplateConstructorsTest.java         |   109 +
 .../template/TemplateLanguageVersionTest.java      |    60 +
 .../template/TemplateLookupStrategyTest.java       |   638 +
 .../template/TemplateNotFoundMessageTest.java      |   316 +
 src/test/java/freemarker/template/VersionTest.java |   192 +
 .../freemarker/template/utility/DateUtilTest.java  |  1081 +
 .../template/utility/NumberUtilTest.java           |   212 +
 .../template/utility/StringUtilTest.java           |    54 +
 .../freemarker/test/MonitoredTemplateLoader.java   |    43 +
 src/test/java/freemarker/test/TemplateTest.java    |   140 +
 src/test/java/freemarker/test/TreeView.java        |    66 +
 .../java/freemarker/test/hamcerst/Matchers.java    |    31 +
 .../test/hamcerst/StringContainsIgnoringCase.java  |    42 +
 src/test/java/freemarker/test/package.html         |    10 +
 .../test/servlet/DefaultModel2TesterAction.java    |    88 +
 .../java/freemarker/test/servlet/Model2Action.java |    34 +
 .../test/servlet/Model2TesterServlet.java          |   135 +
 .../freemarker/test/servlet/WebAppTestCase.java    |   296 +
 src/test/java/freemarker/test/servlet/web.xml      |    83 +
 .../test/templatesuite/TemplateTestCase.java       |   619 +
 .../test/templatesuite/TemplateTestSuite.java      |   298 +
 .../templatesuite/models/AllTemplateModels.java    |   110 +
 .../test/templatesuite/models/BeanTestClass.java   |    94 +
 .../templatesuite/models/BeanTestInterface.java    |    23 +
 .../templatesuite/models/BeanTestSuperclass.java   |    28 +
 .../models/BooleanAndScalarModel.java              |    35 +
 .../models/BooleanAndStringTemplateModel.java      |    33 +
 .../test/templatesuite/models/BooleanHash1.java    |    53 +
 .../test/templatesuite/models/BooleanHash2.java    |    45 +
 .../test/templatesuite/models/BooleanList1.java    |    83 +
 .../test/templatesuite/models/BooleanList2.java    |    46 +
 .../models/BooleanVsStringMethods.java             |    37 +
 .../test/templatesuite/models/EnumTestClass.java   |    32 +
 .../test/templatesuite/models/ExceptionModel.java  |    35 +
 .../templatesuite/models/HashAndScalarModel.java   |    72 +
 .../test/templatesuite/models/JavaObjectInfo.java  |    32 +
 .../test/templatesuite/models/LegacyList.java      |    70 +
 .../test/templatesuite/models/MultiModel1.java     |   103 +
 .../test/templatesuite/models/MultiModel2.java     |    58 +
 .../test/templatesuite/models/MultiModel3.java     |    63 +
 .../test/templatesuite/models/MultiModel4.java     |    64 +
 .../test/templatesuite/models/MultiModel5.java     |    71 +
 .../test/templatesuite/models/NewTestModel.java    |    49 +
 .../test/templatesuite/models/NewTestModel2.java   |    49 +
 .../templatesuite/models/NumberAndStringModel.java |    42 +
 .../models/OverloadedConstructor.java              |    42 +
 .../templatesuite/models/OverloadedMethods.java    |   188 +
 .../templatesuite/models/OverloadedMethods2.java   |  1095 +
 .../templatesuite/models/SimpleTestMethod.java     |    45 +
 .../templatesuite/models/TransformHashWrapper.java |    69 +
 .../models/TransformMethodWrapper1.java            |    45 +
 .../models/TransformMethodWrapper2.java            |    60 +
 .../test/templatesuite/models/TransformModel1.java |   170 +
 .../test/templatesuite/models/VarArgTestModel.java |    60 +
 .../freemarker/test/templatesuite/package.html     |    24 +
 .../freemarker/test/utility/AssertDirective.java   |    69 +
 .../test/utility/AssertEqualsDirective.java        |    87 +
 .../test/utility/AssertFailsDirective.java         |   148 +
 .../AssertationFailedInTemplateException.java      |    43 +
 .../test/utility/BadParameterTypeException.java    |    57 +
 .../java/freemarker/test/utility/FileTestCase.java |   182 +
 src/test/java/freemarker/test/utility/Helpers.java |   161 +
 .../utility/MissingRequiredParameterException.java |    48 +
 .../freemarker/test/utility/NoOutputDirective.java |    46 +
 .../test/utility/ParameterException.java           |    51 +
 .../utility/UnsupportedParameterException.java     |    47 +
 src/test/resources/META-INF/malformed.tld          |    13 +
 .../META-INF/tldDiscovery MetaInfTldSources-1.tld  |    13 +
 src/test/resources/freemarker/cache/test.ftl       |     1 +
 src/test/resources/freemarker/core/ast-1.ast       |   138 +
 src/test/resources/freemarker/core/ast-1.ftl       |     9 +
 src/test/resources/freemarker/core/ast-range.ast   |   248 +
 src/test/resources/freemarker/core/ast-range.ftl   |    29 +
 .../core/encodingOverride-ISO-8859-1.ftl           |     2 +
 .../freemarker/core/encodingOverride-UTF-8.ftl     |     2 +
 .../core/identifier-escaping-canonical.ftl         |    26 +
 .../freemarker/core/identifier-escaping.ftl        |    58 +
 .../freemarker/ext/jsp/TLDParsingTest.tld          |    86 +
 .../ext/jsp/templates/classpath-test.ftl           |     1 +
 .../ext/jsp/tldDiscovery-ClassPathTlds-1.tld       |    13 +
 .../ext/jsp/tldDiscovery-ClassPathTlds-2.tld       |    13 +
 .../ext/jsp/webapps/basic/WEB-INF/el-functions.tld |    66 +
 .../basic/WEB-INF/expected/attributes-2.3.0.txt    |    50 +
 .../WEB-INF/expected/attributes-2.3.22-future.txt  |    55 +
 .../webapps/basic/WEB-INF/expected/attributes.txt  |    55 +
 .../webapps/basic/WEB-INF/expected/customTags1.txt |    88 +
 .../ext/jsp/webapps/basic/WEB-INF/test.tld         |    57 +
 .../ext/jsp/webapps/basic/WEB-INF/web.xml          |   154 +
 .../ext/jsp/webapps/basic/attributes.ftl           |    72 +
 .../ext/jsp/webapps/basic/customELFunctions1.ftl   |    12 +
 .../ext/jsp/webapps/basic/customELFunctions1.jsp   |    13 +
 .../ext/jsp/webapps/basic/customTags1.ftl          |    41 +
 .../ext/jsp/webapps/basic/trivial-jstl- at Ignore.ftl |    30 +
 .../freemarker/ext/jsp/webapps/basic/trivial.ftl   |    19 +
 .../freemarker/ext/jsp/webapps/basic/trivial.jsp   |    27 +
 .../webapps/config/WEB-INF/classes/sub/test.ftl    |     1 +
 .../jsp/webapps/config/WEB-INF/classes/test.ftl    |     1 +
 .../WEB-INF/lib/WebappLocalFreemarkerServlet.jar   |   Bin 0 -> 936 bytes
 .../jsp/webapps/config/WEB-INF/lib/templates.jar   |   Bin 0 -> 579 bytes
 .../jsp/webapps/config/WEB-INF/templates/test.ftl  |     1 +
 .../ext/jsp/webapps/config/WEB-INF/web.xml         |    95 +
 .../freemarker/ext/jsp/webapps/config/test.ftl     |     1 +
 .../ext/jsp/webapps/errors/WEB-INF/web.xml         |    74 +
 .../ext/jsp/webapps/errors/failing-parsetime.ftlnv |     1 +
 .../ext/jsp/webapps/errors/failing-parsetime.jsp   |     1 +
 .../ext/jsp/webapps/errors/failing-runtime.ftl     |     8 +
 .../ext/jsp/webapps/errors/failing-runtime.jsp     |     5 +
 .../ext/jsp/webapps/errors/not-failing.ftl         |     1 +
 .../multipleLoaders/WEB-INF/templates/test.ftl     |     1 +
 .../jsp/webapps/multipleLoaders/WEB-INF/web.xml    |    65 +
 .../WEB-INF/expected/subdir/test-rel.txt           |     2 +
 .../WEB-INF/expected/test-noClasspath.txt          |    14 +
 .../tldDiscovery/WEB-INF/expected/test1.txt        |    55 +
 .../webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld   |    14 +
 .../webapps/tldDiscovery/WEB-INF/fmtesttag4.tld    |    14 +
 .../tldDiscovery/WEB-INF/lib/taglib-foo.jar        |   Bin 0 -> 791 bytes
 .../WEB-INF/subdir-with-tld/fmtesttag3.tld         |    14 +
 .../jsp/webapps/tldDiscovery/WEB-INF/taglib 2.jar  |   Bin 0 -> 752 bytes
 .../ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml   |   161 +
 .../tldDiscovery/not-auto-scanned/fmtesttag.tld    |    22 +
 .../jsp/webapps/tldDiscovery/subdir/test-rel.ftl   |     2 +
 .../jsp/webapps/tldDiscovery/test-noClasspath.ftl  |    14 +
 .../ext/jsp/webapps/tldDiscovery/test1.ftl         |    37 +
 .../template/SimpleObjectWrapperTest.java          |    69 +
 .../resources/freemarker/template/toCache1.ftl     |     1 +
 .../resources/freemarker/template/toCache2.ftl     |     1 +
 .../test/templatesuite/expected/arithmetic.txt     |    28 +
 .../test/templatesuite/expected/bean-maps.txt      |    97 +
 .../test/templatesuite/expected/beans.txt          |    38 +
 .../templatesuite/expected/boolean-formatting.txt  |    14 +
 .../test/templatesuite/expected/boolean.txt        |    84 +
 .../templatesuite/expected/charset-in-header.txt   |     8 +
 .../templatesuite/expected/classic-compatible.txt  |    13 +
 .../test/templatesuite/expected/comment.txt        |    13 +
 .../test/templatesuite/expected/comparisons.txt    |    75 +
 .../test/templatesuite/expected/compress.txt       |    22 +
 .../templatesuite/expected/dateformat-java.txt     |    37 +
 .../test/templatesuite/expected/default-xmlns.txt  |     7 +
 .../test/templatesuite/expected/default.txt        |     8 +
 .../expected/encoding-builtins-ici-2.3.20.txt      |    26 +
 .../templatesuite/expected/encoding-builtins.txt   |    26 +
 .../test/templatesuite/expected/escapes.txt        |    31 +
 .../test/templatesuite/expected/exception.txt      |    25 +
 .../test/templatesuite/expected/exception2.txt     |    29 +
 .../test/templatesuite/expected/exception3.txt     |     3 +
 .../test/templatesuite/expected/exthash.txt        |    58 +
 .../test/templatesuite/expected/hashconcat.txt     |   120 +
 .../test/templatesuite/expected/hashliteral.txt    |    56 +
 .../test/templatesuite/expected/helloworld.txt     |    13 +
 .../templatesuite/expected/identifier-escaping.txt |    39 +
 .../expected/identifier-non-ascii.txt              |     1 +
 .../freemarker/test/templatesuite/expected/if.txt  |    80 +
 .../test/templatesuite/expected/import.txt         |    22 +
 .../test/templatesuite/expected/include.txt        |    62 +
 .../test/templatesuite/expected/include2.txt       |    26 +
 .../test/templatesuite/expected/interpret.txt      |     3 +
 .../test/templatesuite/expected/iterators.txt      |    68 +
 .../test/templatesuite/expected/lastcharacter.txt  |    13 +
 .../test/templatesuite/expected/list.txt           |    16 +
 .../test/templatesuite/expected/listliteral.txt    |    57 +
 .../test/templatesuite/expected/localization.txt   |    14 +
 .../test/templatesuite/expected/logging.txt        |     9 +
 .../test/templatesuite/expected/loopvariable.txt   |    36 +
 .../test/templatesuite/expected/macros.txt         |    49 +
 .../test/templatesuite/expected/macros2.txt        |     4 +
 .../test/templatesuite/expected/multimodels.txt    |    75 +
 .../test/templatesuite/expected/nested.txt         |     7 +
 .../templatesuite/expected/new-allowsnothing.txt   |     1 +
 .../templatesuite/expected/new-defaultresolver.txt |     2 +
 .../test/templatesuite/expected/new-optin.txt      |    14 +
 .../test/templatesuite/expected/new-safer.txt      |     2 +
 .../templatesuite/expected/new-unrestricted.txt    |     2 +
 .../test/templatesuite/expected/newlines1.txt      |    11 +
 .../test/templatesuite/expected/newlines2.txt      |    12 +
 .../templatesuite/expected/non-strict-syntax.txt   |    19 +
 .../test/templatesuite/expected/noparse.txt        |    36 +
 .../test/templatesuite/expected/number-format.txt  |    15 +
 .../test/templatesuite/expected/number-literal.txt |    61 +
 .../test/templatesuite/expected/number-to-date.txt |    13 +
 .../test/templatesuite/expected/numerical-cast.txt |   444 +
 .../templatesuite/expected/output-encoding1.txt    |     9 +
 .../templatesuite/expected/output-encoding2.txt    |   Bin 0 -> 356 bytes
 .../templatesuite/expected/output-encoding3.txt    |     8 +
 .../test/templatesuite/expected/precedence.txt     |    30 +
 .../test/templatesuite/expected/recover.txt        |     8 +
 .../test/templatesuite/expected/root.txt           |    26 +
 .../templatesuite/expected/sequence-builtins.txt   |   379 +
 .../test/templatesuite/expected/specialvars.txt    |     7 +
 .../test/templatesuite/expected/strictinheader.txt |     3 +
 .../expected/string-builtins-regexps-matches.txt   |    81 +
 .../expected/string-builtins-regexps.txt           |    94 +
 .../templatesuite/expected/string-builtins1.txt    |    94 +
 .../templatesuite/expected/string-builtins2.txt    |   117 +
 .../templatesuite/expected/stringbimethods.txt     |    11 +
 .../test/templatesuite/expected/stringliteral.txt  |   Bin 0 -> 740 bytes
 .../test/templatesuite/expected/switch.txt         |    62 +
 .../test/templatesuite/expected/transforms.txt     |    57 +
 .../expected/type-builtins-ici-2.3.21.txt          |    15 +
 .../test/templatesuite/expected/type-builtins.txt  |    15 +
 .../test/templatesuite/expected/var-layers.txt     |    19 +
 .../test/templatesuite/expected/varargs.txt        |    26 +
 .../test/templatesuite/expected/variables.txt      |    44 +
 .../templatesuite/expected/whitespace-trim.txt     |    42 +
 .../templatesuite/expected/wstrip-in-header.txt    |     5 +
 .../test/templatesuite/expected/wstripping.txt     |    21 +
 .../test/templatesuite/expected/xml-fragment.txt   |     7 +
 .../templatesuite/expected/xml-ns_prefix-scope.txt |    11 +
 .../freemarker/test/templatesuite/expected/xml.txt |    47 +
 .../test/templatesuite/expected/xmlns1.txt         |    45 +
 .../test/templatesuite/expected/xmlns3.txt         |    29 +
 .../test/templatesuite/expected/xmlns4.txt         |    29 +
 .../test/templatesuite/expected/xmlns5.txt         |     8 +
 .../models/BeansTestResources.properties           |     2 +
 .../test/templatesuite/models/defaultxmlns1.xml    |     6 +
 .../templatesuite/models/xml-ns_prefix-scope.xml   |     8 +
 .../freemarker/test/templatesuite/models/xml.xml   |    13 +
 .../test/templatesuite/models/xmlfragment.xml      |     1 +
 .../freemarker/test/templatesuite/models/xmlns.xml |    14 +
 .../test/templatesuite/models/xmlns2.xml           |    14 +
 .../test/templatesuite/models/xmlns3.xml           |    14 +
 .../test/templatesuite/templates/api-builtins.ftl  |    28 +
 .../test/templatesuite/templates/arithmetic.ftl    |    32 +
 .../test/templatesuite/templates/bean-maps.ftl     |    40 +
 .../test/templatesuite/templates/beans.ftl         |    42 +
 .../templatesuite/templates/boolean-formatting.ftl |    65 +
 .../test/templatesuite/templates/boolean.ftl       |   124 +
 .../templatesuite/templates/charset-in-header.ftl  |     9 +
 .../templates/charset-in-header_inc1.ftl           |     2 +
 .../templates/charset-in-header_inc2.ftl           |     1 +
 .../templates/classic-compatible-mode2.ftl         |     8 +
 .../templatesuite/templates/classic-compatible.ftl |    17 +
 .../test/templatesuite/templates/comment.ftl       |    30 +
 .../test/templatesuite/templates/comparisons.ftl   |   200 +
 .../test/templatesuite/templates/compress.ftl      |    41 +
 .../templatesuite/templates/date-type-builtins.ftl |    29 +
 .../templates/dateformat-iso-bi-common.ftl         |   141 +
 .../templates/dateformat-iso-bi-ici-2.3.21.ftl     |     5 +
 .../templatesuite/templates/dateformat-iso-bi.ftl  |     5 +
 .../templates/dateformat-iso-like.ftl              |   137 +
 .../templatesuite/templates/dateformat-java.ftl    |    53 +
 .../test/templatesuite/templates/dateparsing.ftl   |    66 +
 .../test/templatesuite/templates/default-xmlns.ftl |    10 +
 .../test/templatesuite/templates/default.ftl       |    16 +
 .../templatesuite/templates/encoding-builtins.ftl  |    34 +
 .../test/templatesuite/templates/escapes.ftl       |    61 +
 .../test/templatesuite/templates/exception.ftl     |    13 +
 .../test/templatesuite/templates/exception2.ftl    |    13 +
 .../test/templatesuite/templates/exception3.ftl    |    13 +
 .../templates/existence-operators.ftl              |   123 +
 .../test/templatesuite/templates/exthash.ftl       |    30 +
 .../test/templatesuite/templates/hashconcat.ftl    |    42 +
 .../test/templatesuite/templates/hashliteral.ftl   |    89 +
 .../test/templatesuite/templates/helloworld.ftl    |    12 +
 .../templates/identifier-escaping.ftl              |    63 +
 .../templates/identifier-non-ascii.ftl             |     3 +
 .../freemarker/test/templatesuite/templates/if.ftl |    85 +
 .../test/templatesuite/templates/import.ftl        |    27 +
 .../test/templatesuite/templates/import_lib.ftl    |    13 +
 .../test/templatesuite/templates/include.ftl       |    31 +
 .../templates/include2-included-encoding.ftl       |     2 +
 .../templatesuite/templates/include2-included.ftl  |     1 +
 .../test/templatesuite/templates/include2.ftl      |    33 +
 .../test/templatesuite/templates/included.ftl      |    12 +
 .../test/templatesuite/templates/interpret.ftl     |     5 +
 .../test/templatesuite/templates/iterators.ftl     |    55 +
 .../test/templatesuite/templates/lastcharacter.ftl |    13 +
 .../test/templatesuite/templates/list.ftl          |    16 +
 .../test/templatesuite/templates/listliteral.ftl   |    66 +
 .../test/templatesuite/templates/localization.ftl  |    14 +
 .../templatesuite/templates/localization_en.ftl    |    14 +
 .../templatesuite/templates/localization_en_AU.ftl |    14 +
 .../test/templatesuite/templates/logging.ftl       |    24 +
 .../test/templatesuite/templates/loopvariable.ftl  |    31 +
 .../test/templatesuite/templates/macros.ftl        |    84 +
 .../test/templatesuite/templates/macros2.ftl       |    17 +
 .../test/templatesuite/templates/multimodels.ftl   |    66 +
 .../test/templatesuite/templates/nested.ftl        |    11 +
 .../test/templatesuite/templates/nestedinclude.ftl |     3 +
 .../templatesuite/templates/new-allowsnothing.ftl  |     5 +
 .../templates/new-defaultresolver.ftl              |     6 +
 .../test/templatesuite/templates/new-optin.ftl     |    12 +
 .../test/templatesuite/templates/new-safer.ftl     |     6 +
 .../templatesuite/templates/new-unrestricted.ftl   |     2 +
 .../test/templatesuite/templates/newlines1.ftl     |    11 +
 .../test/templatesuite/templates/newlines2.ftl     |    15 +
 .../templatesuite/templates/non-strict-syntax.ftl  |    20 +
 .../test/templatesuite/templates/noparse.ftl       |    45 +
 .../test/templatesuite/templates/number-format.ftl |    32 +
 .../templatesuite/templates/number-literal.ftl     |   115 +
 .../templates/number-math-builtins.ftl             |    60 +
 .../templatesuite/templates/number-to-date.ftl     |    17 +
 .../templatesuite/templates/numerical-cast.ftl     |    64 +
 .../templatesuite/templates/output-encoding1.ftl   |    12 +
 .../templatesuite/templates/output-encoding2.ftl   |    10 +
 .../templatesuite/templates/output-encoding3.ftl   |    10 +
 .../overloaded-methods-2-bwici-2.3.20.ftl          |   267 +
 .../overloaded-methods-2-bwici-2.3.21.ftl          |   331 +
 .../templates/overloaded-methods-2-common.ftl      |    71 +
 .../overloaded-methods-2-desc-bwici-2.3.20.ftl     |    25 +
 .../overloaded-methods-2-inc-bwici-2.3.20.ftl      |    29 +
 .../templates/overloaded-methods-23bc.ftl          |    51 +
 .../test/templatesuite/templates/precedence.ftl    |    43 +
 .../test/templatesuite/templates/range-common.ftl  |   296 +
 .../templatesuite/templates/range-ici-2.3.20.ftl   |    19 +
 .../templatesuite/templates/range-ici-2.3.21.ftl   |    32 +
 .../test/templatesuite/templates/recover.ftl       |    29 +
 .../test/templatesuite/templates/root.ftl          |    30 +
 .../templatesuite/templates/sequence-builtins.ftl  |   336 +
 .../test/templatesuite/templates/setting.ftl       |    39 +
 .../templates/simplehash-char-key.ftl              |    26 +
 .../test/templatesuite/templates/specialvars.ftl   |    20 +
 .../templatesuite/templates/strictinheader.ftl     |     5 +
 .../templates/strictinheader_inc1.ftl              |     3 +
 .../templates/strictinheader_inc2.ftl              |     2 +
 .../templates/string-builtin-coercion.ftl          |    16 +
 .../templates/string-builtins-ici-2.3.19.ftl       |     4 +
 .../templates/string-builtins-ici-2.3.20.ftl       |     3 +
 .../templates/string-builtins-regexps-matches.ftl  |   100 +
 .../templates/string-builtins-regexps.ftl          |   118 +
 .../templatesuite/templates/string-builtins1.ftl   |   111 +
 .../templatesuite/templates/string-builtins2.ftl   |   117 +
 .../templatesuite/templates/string-builtins3.ftl   |   207 +
 .../templatesuite/templates/stringbimethods.ftl    |    18 +
 .../test/templatesuite/templates/stringliteral.ftl |    51 +
 .../templates/subdir/include-subdir.ftl            |     9 +
 .../templates/subdir/include-subdir2.ftl           |     1 +
 .../templatesuite/templates/subdir/new-optin-2.ftl |     6 +
 .../templatesuite/templates/subdir/new-optin.ftl   |     8 +
 .../templates/subdir/subsub/new-optin.ftl          |     6 +
 .../test/templatesuite/templates/switch.ftl        |   121 +
 .../test/templatesuite/templates/transforms.ftl    |   102 +
 .../test/templatesuite/templates/type-builtins.ftl |    26 +
 .../test/templatesuite/templates/undefined.ftl     |     1 +
 .../test/templatesuite/templates/url.ftl           |     6 +
 .../test/templatesuite/templates/var-layers.ftl    |    21 +
 .../test/templatesuite/templates/varargs.ftl       |    27 +
 .../test/templatesuite/templates/variables.ftl     |    52 +
 .../test/templatesuite/templates/varlayers_lib.ftl |    10 +
 .../templatesuite/templates/whitespace-trim.ftl    |    84 +
 .../templates/wsstripinheader_inc.ftl              |     4 +
 .../templatesuite/templates/wstrip-in-header.ftl   |     8 +
 .../test/templatesuite/templates/xml-fragment.ftl  |     8 +
 .../templates/xml-ns_prefix-scope-lib.ftl          |     5 +
 .../templates/xml-ns_prefix-scope-main.ftl         |    18 +
 .../test/templatesuite/templates/xml.ftl           |    29 +
 .../test/templatesuite/templates/xmlns1.ftl        |    35 +
 .../test/templatesuite/templates/xmlns3.ftl        |    52 +
 .../test/templatesuite/templates/xmlns4.ftl        |    52 +
 .../test/templatesuite/templates/xmlns5.ftl        |    10 +
 .../freemarker/test/templatesuite/testcases.xml    |   269 +
 src/test/resources/logback-test.xml                |    16 +
 959 files changed, 153688 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libfreemarker-java.git



More information about the pkg-java-commits mailing list