[libfreemarker-java] branch master updated (f3d99a8 -> c4b81b7)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Sun Jul 12 21:23:16 UTC 2015


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

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

      from  f3d99a8   Upload to unstable
      adds  e24c46f   Imported Upstream version 2.3.23
       new  967acdb   Merge tag 'upstream/2.3.23'
       new  5dae352   Updated debian/pom.xml
       new  c4b81b7   Refreshed the patches

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.xml                                          |   13 +-
 debian/changelog                                   |    8 +
 debian/patches/ivy-configuration.patch             |    4 +-
 debian/pom.xml                                     |    2 +-
 debian/rules                                       |    2 +-
 ivy.xml                                            |    2 +-
 LICENSE.txt => src/dist/LICENSE.txt                |   22 +
 src/dist/NOTICE.txt                                |   15 +
 src/dist/{ => documentation}/index.html            |    0
 .../java/freemarker/cache/FileTemplateLoader.java  |  186 +-
 .../java/freemarker/cache/MultiTemplateLoader.java |  132 +-
 src/main/java/freemarker/cache/TemplateCache.java  |   54 +-
 src/main/java/freemarker/cache/TemplateLoader.java |   74 +-
 .../freemarker/cache/TemplateLookupContext.java    |    5 +-
 .../freemarker/cache/TemplateLookupStrategy.java   |   13 +-
 .../freemarker/cache/WebappTemplateLoader.java     |  118 +-
 .../java/freemarker/core/AddConcatExpression.java  |   44 +-
 .../java/freemarker/core/ArithmeticExpression.java |   34 +-
 src/main/java/freemarker/core/Assignment.java      |  201 +-
 .../freemarker/core/AssignmentInstruction.java     |   37 +-
 src/main/java/freemarker/core/AttemptBlock.java    |   12 +-
 src/main/java/freemarker/core/BlockAssignment.java |   12 +-
 src/main/java/freemarker/core/BuiltIn.java         |  389 +--
 .../freemarker/core/BuiltInForLoopVariable.java    |   48 +
 .../core/BuiltInWithParseTimeParameters.java       |  100 +
 .../freemarker/core/BuiltInsForLoopVariables.java  |  142 +
 .../java/freemarker/core/BuiltInsForSequences.java |    2 +-
 .../freemarker/core/BuiltInsForStringsMisc.java    |    8 +-
 .../core/BuiltInsWithParseTimeParameters.java      |  142 +
 src/main/java/freemarker/core/BuiltinVariable.java |   85 +-
 src/main/java/freemarker/core/Case.java            |    8 +-
 src/main/java/freemarker/core/CompressedBlock.java |   10 +-
 .../java/freemarker/core/ConditionalBlock.java     |   10 +-
 src/main/java/freemarker/core/Configurable.java    |  334 +-
 src/main/java/freemarker/core/DebugBreak.java      |   12 +-
 src/main/java/freemarker/core/DollarVariable.java  |    8 +-
 src/main/java/freemarker/core/DynamicKeyName.java  |    8 +-
 .../core/{RecoveryBlock.java => ElseOfList.java}   |   20 +-
 src/main/java/freemarker/core/Environment.java     |   80 +-
 src/main/java/freemarker/core/EscapeBlock.java     |   12 +-
 src/main/java/freemarker/core/EvalUtil.java        |   25 +-
 src/main/java/freemarker/core/Expression.java      |    8 +-
 src/main/java/freemarker/core/IfBlock.java         |   23 +-
 src/main/java/freemarker/core/Include.java         |   68 +-
 .../{_DelayedToString.java => Interpolation.java}  |   17 +-
 .../freemarker/core/InvalidReferenceException.java |   50 +-
 .../java/freemarker/core/{Case.java => Items.java} |   70 +-
 src/main/java/freemarker/core/IteratorBlock.java   |  281 +-
 .../{RecoveryBlock.java => ListElseContainer.java} |   44 +-
 src/main/java/freemarker/core/Macro.java           |   28 +-
 src/main/java/freemarker/core/MessageUtil.java     |    8 +-
 src/main/java/freemarker/core/MixedContent.java    |   37 +-
 src/main/java/freemarker/core/NoEscapeBlock.java   |    9 +-
 .../freemarker/core/NonNumericalException.java     |    6 +-
 src/main/java/freemarker/core/NumericalOutput.java |    8 +-
 src/main/java/freemarker/core/ParameterRole.java   |    1 +
 src/main/java/freemarker/core/ParseException.java  |    7 +-
 src/main/java/freemarker/core/PropertySetting.java |   93 +-
 src/main/java/freemarker/core/RecoveryBlock.java   |   11 +-
 .../java/freemarker/core/ReturnInstruction.java    |    2 +-
 .../core/{CompressedBlock.java => Sep.java}        |   55 +-
 .../java/freemarker/core/SpecialBuiltIn.java}      |    9 +-
 src/main/java/freemarker/core/StringLiteral.java   |   35 +-
 src/main/java/freemarker/core/SwitchBlock.java     |   17 +-
 src/main/java/freemarker/core/TemplateElement.java |  256 +-
 src/main/java/freemarker/core/TextBlock.java       |   60 +-
 ...adInterruptionSupportTemplatePostProcessor.java |   32 +-
 src/main/java/freemarker/core/TransformBlock.java  |    8 +-
 .../freemarker/core/UnaryPlusMinusExpression.java  |    5 -
 .../freemarker/core/UnexpectedTypeException.java   |   43 +-
 src/main/java/freemarker/core/UnifiedCall.java     |   19 +-
 ...{_ArrayIterator.java => _ArrayEnumeration.java} |   20 +-
 src/main/java/freemarker/core/_CoreAPI.java        |   10 +-
 .../java/freemarker/core/_CoreStringUtils.java     |   27 +-
 ...StackTop.java => _DelayedGetCanonicalForm.java} |   17 +-
 ...layedJQuote.java => _DelayedJoinWithComma.java} |   24 +-
 .../core/_ObjectBuilderSettingEvaluator.java       |  289 +-
 .../freemarker/ext/beans/BeansWrapperBuilder.java  |    2 +-
 .../java/freemarker/ext/dom/NodeListModel.java     |   23 +-
 .../java/freemarker/ext/jsp/TaglibFactory.java     |    2 +-
 .../freemarker/ext/servlet/FreemarkerServlet.java  |  110 +-
 .../freemarker/ext/servlet/InitParamParser.java    |  263 ++
 src/main/java/freemarker/log/Logger.java           |    2 +-
 .../java/freemarker/template/Configuration.java    |  426 ++-
 .../java/freemarker/template/SimpleScalar.java     |   13 +-
 src/main/java/freemarker/template/Template.java    |   91 +-
 .../freemarker/template/TemplateException.java     |    4 +-
 src/main/java/freemarker/template/Version.java     |    4 +-
 .../java/freemarker/template/_TemplateAPI.java     |    5 +-
 .../freemarker/template/utility/StringUtil.java    |   99 +-
 src/main/javacc/FTL.jj                             |  787 ++++-
 src/main/resources/freemarker/version.properties   |   10 +-
 src/manual/book.xml                                | 3231 ++++++++++++++------
 src/manual/docgen-help/editors-readme.txt          |   38 +-
 src/manual/docgen.cjson                            |  107 +-
 src/manual/favicon.png                             |  Bin 0 -> 1291 bytes
 src/manual/logo.png                                |  Bin 0 -> 10134 bytes
 .../freemarker/cache/FileTemplateLoaderTest.java   |  118 +
 src/test/java/freemarker/core/ASTPrinter.java      |   51 +
 src/test/java/freemarker/core/ASTTest.java         |   20 +
 .../java/freemarker/core/BreakPlacementTest.java   |   65 +
 src/test/java/freemarker/core/CamelCaseTest.java   |  504 +++
 .../java/freemarker/core/CanonicalFormTest.java    |   18 +-
 .../java/freemarker/core/ConfigurableTest.java     |  125 +-
 ...ava => EnvironmentGetTemplateVariantsTest.java} |    6 +-
 .../core/InterpretAndEvalTemplateNameTest.java     |   68 +
 .../core/InterpretSettingInheritanceTest.java      |   93 +
 .../java/freemarker/core/ListValidationsTest.java  |  108 +
 .../freemarker/core/MiscErrorMessagesTest.java     |    6 +-
 .../freemarker/core/ObjectBuilderSettingsTest.java |   49 +
 .../ParseTimeParameterBIErrorMessagesTest.java     |   44 +
 .../core/StringLiteralInterpolationTest.java       |   49 +
 .../freemarker/core/TemplatGetEncodingTest.java    |   82 +
 .../core/TemplateNameSpecialVariablesTest.java     |  209 ++
 .../core/TheadInterruptingSupportTest.java         |    2 +
 .../freemarker/core/TypeErrorMessagesTest.java     |   21 +-
 .../ext/beans/BeansWrapperSingletonsTest.java      |    2 +-
 .../ext/servlet/InitParamParserTest.java           |  166 +
 .../template/ActualNamingConvetionTest.java        |   62 +
 .../freemarker/template/ActualTagSyntaxTest.java   |   15 +-
 .../freemarker/template/ConfigurationTest.java     |  187 +-
 .../template/DefaultObjectWrapperTest.java         |    1 +
 .../template/JavaCCExceptionAsEOFFixTest.java      |  122 +
 .../freemarker/template/MockServletContext.java    |  129 +
 .../template/TemplateLanguageVersionTest.java      |    2 +-
 .../template/TemplateNotFoundMessageTest.java      |  112 -
 .../template/utility/StringUtilTest.java           |   16 +
 src/test/java/freemarker/test/TemplateTest.java    |    4 +-
 .../test/templatesuite/TemplateTestCase.java       |   27 +-
 .../test/templatesuite/models/Listables.java       |   94 +
 src/test/resources/freemarker/core/ast-1.ast       |   23 +
 src/test/resources/freemarker/core/ast-1.ftl       |    3 +-
 .../resources/freemarker/core/ast-assignments.ast  |  154 +
 .../resources/freemarker/core/ast-assignments.ftl  |   11 +
 .../resources/freemarker/core/ast-builtins.ast     |   44 +
 .../resources/freemarker/core/ast-builtins.ftl     |    5 +
 .../core/ast-mixedcontentsimplifications.ast       |   20 +
 .../core/ast-mixedcontentsimplifications.ftl       |    8 +
 src/test/resources/freemarker/core/ast-range.ast   |   17 +
 .../freemarker/core/ast-strlitinterpolation.ast    |   10 +
 .../freemarker/core/ast-strlitinterpolation.ftl    |    1 +
 .../freemarker/core/ast-whitesoacestripping.ast    |   52 +
 .../freemarker/core/ast-whitesoacestripping.ftl    |   22 +
 .../freemarker/core/cano-assignments-canonical.ftl |   16 +
 .../resources/freemarker/core/cano-assignments.ftl |   17 +
 .../freemarker/core/cano-builtins-canonical.ftl    |    5 +
 .../resources/freemarker/core/cano-builtins.ftl    |    5 +
 ....ftl => cano-identifier-escaping-canonical.ftl} |    6 +-
 ...r-escaping.ftl => cano-identifier-escaping.ftl} |    0
 .../freemarker/core/cano-macros-canonical.ftl      |   10 +
 src/test/resources/freemarker/core/cano-macros.ftl |   11 +
 .../core/cano-strlitinterpolation-canonical.ftl    |    1 +
 .../freemarker/core/cano-strlitinterpolation.ftl   |    1 +
 .../templatesuite/expected/classic-compatible.txt  |   10 +
 .../test/templatesuite/expected/comment.txt        |    3 +
 .../test/templatesuite/expected/list-bis.txt       |   33 +
 .../test/templatesuite/expected/list.txt           |   21 +-
 .../test/templatesuite/expected/list2.txt          |  193 ++
 .../test/templatesuite/expected/list3.txt          |   39 +
 .../test/templatesuite/templates/assignments.ftl   |   90 +
 .../templatesuite/templates/classic-compatible.ftl |   21 +-
 .../test/templatesuite/templates/comment.ftl       |    3 +
 .../freemarker/test/templatesuite/templates/if.ftl |    8 +-
 .../test/templatesuite/templates/list-bis.ftl      |   30 +
 .../test/templatesuite/templates/list.ftl          |   24 +-
 .../test/templatesuite/templates/list2.ftl         |   72 +
 .../test/templatesuite/templates/list3.ftl         |   52 +
 .../templatesuite/templates/switch-builtin.ftl     |   36 +
 .../test/templatesuite/templates/then-builtin.ftl  |   35 +
 .../freemarker/test/templatesuite/testcases.xml    |   15 +
 170 files changed, 10275 insertions(+), 2776 deletions(-)
 copy LICENSE.txt => src/dist/LICENSE.txt (63%)
 create mode 100644 src/dist/NOTICE.txt
 rename src/dist/{ => documentation}/index.html (100%)
 create mode 100644 src/main/java/freemarker/core/BuiltInForLoopVariable.java
 create mode 100644 src/main/java/freemarker/core/BuiltInWithParseTimeParameters.java
 create mode 100644 src/main/java/freemarker/core/BuiltInsForLoopVariables.java
 create mode 100644 src/main/java/freemarker/core/BuiltInsWithParseTimeParameters.java
 copy src/main/java/freemarker/core/{RecoveryBlock.java => ElseOfList.java} (78%)
 copy src/main/java/freemarker/core/{_DelayedToString.java => Interpolation.java} (68%)
 copy src/main/java/freemarker/core/{Case.java => Items.java} (50%)
 copy src/main/java/freemarker/core/{RecoveryBlock.java => ListElseContainer.java} (64%)
 copy src/main/java/freemarker/core/{CompressedBlock.java => Sep.java} (55%)
 copy src/{test/java/freemarker/core/subpkg/PackageVisibleAll.java => main/java/freemarker/core/SpecialBuiltIn.java} (80%)
 copy src/main/java/freemarker/core/{_ArrayIterator.java => _ArrayEnumeration.java} (74%)
 copy src/main/java/freemarker/core/{_DelayedGetMessageWithoutStackTop.java => _DelayedGetCanonicalForm.java} (71%)
 copy src/main/java/freemarker/core/{_DelayedJQuote.java => _DelayedJoinWithComma.java} (56%)
 create mode 100644 src/main/java/freemarker/ext/servlet/InitParamParser.java
 create mode 100644 src/manual/favicon.png
 create mode 100644 src/manual/logo.png
 create mode 100644 src/test/java/freemarker/cache/FileTemplateLoaderTest.java
 create mode 100644 src/test/java/freemarker/core/BreakPlacementTest.java
 create mode 100644 src/test/java/freemarker/core/CamelCaseTest.java
 rename src/test/java/freemarker/core/{TestEnvironmentGetTemplateVariants.java => EnvironmentGetTemplateVariantsTest.java} (97%)
 create mode 100644 src/test/java/freemarker/core/InterpretAndEvalTemplateNameTest.java
 create mode 100644 src/test/java/freemarker/core/InterpretSettingInheritanceTest.java
 create mode 100644 src/test/java/freemarker/core/ListValidationsTest.java
 create mode 100644 src/test/java/freemarker/core/ParseTimeParameterBIErrorMessagesTest.java
 create mode 100644 src/test/java/freemarker/core/StringLiteralInterpolationTest.java
 create mode 100644 src/test/java/freemarker/core/TemplatGetEncodingTest.java
 create mode 100644 src/test/java/freemarker/core/TemplateNameSpecialVariablesTest.java
 create mode 100644 src/test/java/freemarker/ext/servlet/InitParamParserTest.java
 create mode 100644 src/test/java/freemarker/template/ActualNamingConvetionTest.java
 create mode 100644 src/test/java/freemarker/template/JavaCCExceptionAsEOFFixTest.java
 create mode 100644 src/test/java/freemarker/template/MockServletContext.java
 create mode 100644 src/test/java/freemarker/test/templatesuite/models/Listables.java
 create mode 100644 src/test/resources/freemarker/core/ast-assignments.ast
 create mode 100644 src/test/resources/freemarker/core/ast-assignments.ftl
 create mode 100644 src/test/resources/freemarker/core/ast-builtins.ast
 create mode 100644 src/test/resources/freemarker/core/ast-builtins.ftl
 create mode 100644 src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ast
 create mode 100644 src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ftl
 create mode 100644 src/test/resources/freemarker/core/ast-strlitinterpolation.ast
 create mode 100644 src/test/resources/freemarker/core/ast-strlitinterpolation.ftl
 create mode 100644 src/test/resources/freemarker/core/ast-whitesoacestripping.ast
 create mode 100644 src/test/resources/freemarker/core/ast-whitesoacestripping.ftl
 create mode 100644 src/test/resources/freemarker/core/cano-assignments-canonical.ftl
 create mode 100644 src/test/resources/freemarker/core/cano-assignments.ftl
 create mode 100644 src/test/resources/freemarker/core/cano-builtins-canonical.ftl
 create mode 100644 src/test/resources/freemarker/core/cano-builtins.ftl
 rename src/test/resources/freemarker/core/{identifier-escaping-canonical.ftl => cano-identifier-escaping-canonical.ftl} (84%)
 rename src/test/resources/freemarker/core/{identifier-escaping.ftl => cano-identifier-escaping.ftl} (100%)
 create mode 100644 src/test/resources/freemarker/core/cano-macros-canonical.ftl
 create mode 100644 src/test/resources/freemarker/core/cano-macros.ftl
 create mode 100644 src/test/resources/freemarker/core/cano-strlitinterpolation-canonical.ftl
 create mode 100644 src/test/resources/freemarker/core/cano-strlitinterpolation.ftl
 create mode 100644 src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
 create mode 100644 src/test/resources/freemarker/test/templatesuite/expected/list2.txt
 create mode 100644 src/test/resources/freemarker/test/templatesuite/expected/list3.txt
 create mode 100644 src/test/resources/freemarker/test/templatesuite/templates/assignments.ftl
 create mode 100644 src/test/resources/freemarker/test/templatesuite/templates/list-bis.ftl
 create mode 100644 src/test/resources/freemarker/test/templatesuite/templates/list2.ftl
 create mode 100644 src/test/resources/freemarker/test/templatesuite/templates/list3.ftl
 create mode 100644 src/test/resources/freemarker/test/templatesuite/templates/switch-builtin.ftl
 create mode 100644 src/test/resources/freemarker/test/templatesuite/templates/then-builtin.ftl

-- 
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