Merge remote-tracking branch 'origin/2.3-gae'
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/e8fdf537 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e8fdf537 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e8fdf537 Branch: refs/heads/master Commit: e8fdf53722c94bdb647968ed0566243c46435e8e Parents: a99acd5 7d355e7 Author: ddekany <[email protected]> Authored: Thu Dec 31 17:23:28 2015 +0100 Committer: ddekany <[email protected]> Committed: Thu Dec 31 17:23:28 2015 +0100 ---------------------------------------------------------------------- build.properties.sample | 17 +++++++ build.xml | 35 +++++++++++++ ivy.xml | 27 +++++++++- ivysettings.xml | 19 +++++++ osgi.bnd | 17 +++++++ src/dist/documentation/index.html | 18 +++++++ src/examples/ant/build.xml | 18 +++++++ src/examples/ant/src/xml/faq.xml | 18 +++++++ .../example/ApplicationResources.properties | 17 +++++++ .../struts-webapp/WEB-INF/struts-config.xml | 18 +++++++ .../struts-webapp/WEB-INF/struts-html.tld | 18 +++++++ src/examples/struts-webapp/WEB-INF/web.xml | 18 +++++++ src/examples/struts-webapp/help.html | 18 +++++++ src/examples/webapp1/WEB-INF/web.xml | 18 +++++++ src/examples/webapp1/help.html | 18 +++++++ src/examples/webapp2/WEB-INF/web.xml | 18 +++++++ src/examples/webapp2/help.html | 18 +++++++ src/main/java/freemarker/cache/package.html | 18 +++++++ src/main/java/freemarker/core/package.html | 18 +++++++ src/main/java/freemarker/debug/package.html | 18 +++++++ src/main/java/freemarker/ext/ant/package.html | 18 +++++++ src/main/java/freemarker/ext/beans/package.html | 18 +++++++ src/main/java/freemarker/ext/dom/package.html | 18 +++++++ src/main/java/freemarker/ext/jdom/package.html | 18 +++++++ src/main/java/freemarker/ext/jsp/package.html | 18 +++++++ .../java/freemarker/ext/jython/package.html | 18 +++++++ src/main/java/freemarker/ext/package.html | 18 +++++++ src/main/java/freemarker/ext/rhino/package.html | 18 +++++++ .../java/freemarker/ext/servlet/package.html | 18 +++++++ src/main/java/freemarker/ext/util/package.html | 18 +++++++ src/main/java/freemarker/ext/xml/package.html | 18 +++++++ src/main/java/freemarker/log/package.html | 18 +++++++ src/main/java/freemarker/template/package.html | 18 +++++++ .../freemarker/template/utility/package.html | 18 +++++++ src/main/misc/overloadedNumberRules/config.fmpp | 17 +++++++ .../resources/freemarker/version.properties | 17 +++++++ src/manual/en_US/book.xml | 18 +++++++ .../en_US/docgen-misc/googleAnalytics.html | 5 ++ src/manual/en_US/docgen.cjson | 17 +++++++ src/test/java/freemarker/core/ASTTest.java | 2 +- src/test/java/freemarker/test/package.html | 18 +++++++ src/test/java/freemarker/test/servlet/web.xml | 18 +++++++ .../test/templatesuite/TemplateTestCase.java | 1 + .../freemarker/test/templatesuite/package.html | 18 +++++++ src/test/resources/META-INF/malformed.tld | 18 +++++++ .../tldDiscovery MetaInfTldSources-1.tld | 18 +++++++ .../freemarker/core/ast-whitesoacestripping.ast | 52 -------------------- .../freemarker/core/ast-whitesoacestripping.ftl | 40 --------------- .../freemarker/core/ast-whitespacestripping.ast | 52 ++++++++++++++++++++ .../freemarker/core/ast-whitespacestripping.ftl | 40 +++++++++++++++ .../ext/jsp/tldDiscovery-ClassPathTlds-1.tld | 18 +++++++ .../ext/jsp/tldDiscovery-ClassPathTlds-2.tld | 18 +++++++ .../jsp/webapps/basic/WEB-INF/el-functions.tld | 18 +++++++ .../ext/jsp/webapps/basic/WEB-INF/test.tld | 18 +++++++ .../ext/jsp/webapps/basic/WEB-INF/web.xml | 18 +++++++ .../jsp/webapps/basic/customELFunctions1.jsp | 18 +++++++ .../ext/jsp/webapps/basic/trivial.jsp | 18 +++++++ .../ext/jsp/webapps/config/WEB-INF/web.xml | 18 +++++++ .../ext/jsp/webapps/errors/WEB-INF/web.xml | 18 +++++++ .../jsp/webapps/errors/failing-parsetime.ftlnv | 19 +++++++ .../jsp/webapps/errors/failing-parsetime.jsp | 18 +++++++ .../ext/jsp/webapps/errors/failing-runtime.jsp | 18 +++++++ .../jsp/webapps/multipleLoaders/WEB-INF/web.xml | 18 +++++++ .../tldDiscovery/WEB-INF/fmtesttag 2.tld | 18 +++++++ .../webapps/tldDiscovery/WEB-INF/fmtesttag4.tld | 18 +++++++ .../WEB-INF/subdir-with-tld/fmtesttag3.tld | 18 +++++++ .../jsp/webapps/tldDiscovery/WEB-INF/web.xml | 18 +++++++ .../tldDiscovery/not-auto-scanned/fmtesttag.tld | 18 +++++++ .../ConfigureOutputFormatExamples1.properties | 17 +++++++ .../ConfigureOutputFormatExamples2.properties | 17 +++++++ .../TemplateConfigurationExamples1.properties | 17 +++++++ .../TemplateConfigurationExamples2.properties | 17 +++++++ .../TemplateConfigurationExamples3.properties | 17 +++++++ .../models/BeansTestResources.properties | 17 +++++++ .../test/templatesuite/models/defaultxmlns1.xml | 18 +++++++ .../models/xml-ns_prefix-scope.xml | 18 +++++++ .../test/templatesuite/models/xml.xml | 18 +++++++ .../test/templatesuite/models/xmlfragment.xml | 18 +++++++ .../test/templatesuite/models/xmlns.xml | 18 +++++++ .../test/templatesuite/models/xmlns2.xml | 18 +++++++ .../test/templatesuite/models/xmlns3.xml | 18 +++++++ .../freemarker/test/templatesuite/testcases.xml | 18 +++++++ src/test/resources/logback-test.xml | 18 +++++++ 83 files changed, 1482 insertions(+), 94 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e8fdf537/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e8fdf537/osgi.bnd ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e8fdf537/src/main/resources/freemarker/version.properties ----------------------------------------------------------------------
