You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2016/02/11 22:57:42 UTC
incubator-freemarker git commit: Merge remote-tracking branch
'origin/2.3.24-gae-stabilization' into 2.3.24-stabilization
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3.24-stabilization [created] bbbfbaece
Merge remote-tracking branch 'origin/2.3.24-gae-stabilization' into 2.3.24-stabilization
Conflicts:
.project
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/bbbfbaec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/bbbfbaec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/bbbfbaec
Branch: refs/heads/2.3.24-stabilization
Commit: bbbfbaece9c982dd658535a4680e83fe17d1d333
Parents: b9ca91d b8e1d5e
Author: ddekany <dd...@apache.org>
Authored: Thu Feb 11 22:25:02 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Feb 11 22:25:02 2016 +0100
----------------------------------------------------------------------
.classpath | 60 ---
.gitignore | 4 +
.project | 41 --
.settings/edu.umd.cs.findbugs.core.prefs | 143 ------
.../edu.umd.cs.findbugs.plugin.eclipse.prefs | 4 -
.settings/org.eclipse.core.resources.prefs | 2 -
.settings/org.eclipse.core.runtime.prefs | 2 -
.settings/org.eclipse.jdt.core.prefs | 409 ----------------
.settings/org.eclipse.jdt.ui.prefs | 71 ---
.../org.eclipse.ltk.core.refactoring.prefs | 2 -
NOTICE | 4 -
README | 89 +++-
build.xml | 3 -
codestyle.xml | 313 ------------
.../Formatter-profile-FreeMarker.xml | 313 ++++++++++++
.../freemarker/cache/MultiTemplateLoader.java | 61 ++-
.../cache/StatefulTemplateLoader.java | 2 +-
.../freemarker/cache/StringTemplateLoader.java | 13 +
.../ext/servlet/FreemarkerServlet.java | 3 -
src/manual/en_US/book.xml | 474 ++++---------------
.../cache/MultiTemplateLoaderTest.java | 67 +++
.../core/AppMetaTemplateDateFormatFactory.java | 2 -
.../config/WebappLocalFreemarkerServlet.java | 25 +
.../freemarker/manual/CustomFormatsExample.java | 3 +-
.../manual/UnitAwareTemplateNumberModel.java | 1 -
.../CopyrightCommentRemoverTemplateLoader.java | 4 -
.../freemarker/test/ResourcesExtractor.java | 296 ++++++++++++
.../freemarker/test/servlet/WebAppTestCase.java | 175 ++++---
.../ext/jsp/webapps/basic/CONTENTS.txt | 33 ++
.../ext/jsp/webapps/config/CONTENTS.txt | 33 ++
.../lib/WebappLocalFreemarkerServlet.jar | Bin 936 -> 0 bytes
.../webapps/config/WEB-INF/lib/templates.jar | Bin 1018 -> 0 bytes
.../WEB-INF/lib/templates.jar/sub/test2.ftl | 19 +
.../ext/jsp/webapps/config/WEB-INF/web.xml | 4 +-
.../ext/jsp/webapps/errors/CONTENTS.txt | 28 ++
.../jsp/webapps/multipleLoaders/CONTENTS.txt | 24 +
.../ext/jsp/webapps/tldDiscovery/CONTENTS.txt | 37 ++
.../tldDiscovery/WEB-INF/lib/taglib-foo.jar | Bin 1221 -> 0 bytes
.../lib/taglib-foo.jar/META-INF/foo bar.tld | 32 ++
.../webapps/tldDiscovery/WEB-INF/taglib 2.jar | Bin 1179 -> 0 bytes
.../WEB-INF/taglib 2.jar/META-INF/taglib.tld | 31 ++
41 files changed, 1274 insertions(+), 1553 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bbbfbaec/build.xml
----------------------------------------------------------------------