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/03/26 16:41:46 UTC
[32/32] incubator-freemarker git commit: Merge remote-tracking branch
'origin/2.3-gae' into 2.3
Merge remote-tracking branch 'origin/2.3-gae' into 2.3
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/8eada2e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/8eada2e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/8eada2e9
Branch: refs/heads/2.3
Commit: 8eada2e9d7865bc70d65062b120cb838380f8b1b
Parents: b9ca91d 9299036
Author: ddekany <dd...@apache.org>
Authored: Sat Mar 26 16:40:32 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sat Mar 26 16:40:32 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 | 12 +-
README | 96 +-
RELEASE-NOTES | 4 +-
build.xml | 5 +-
codestyle.xml | 313 -
.../Formatter-profile-FreeMarker.xml | 313 +
.../freemarker/cache/MultiTemplateLoader.java | 61 +-
.../cache/StatefulTemplateLoader.java | 2 +-
.../freemarker/cache/StringTemplateLoader.java | 13 +
.../freemarker/cache/WebappTemplateLoader.java | 2 +-
src/main/java/freemarker/cache/_CacheAPI.java | 11 +-
.../core/CommonTemplateMarkupOutputModel.java | 9 +-
src/main/java/freemarker/core/Configurable.java | 10 +
src/main/java/freemarker/core/Environment.java | 333 +-
src/main/java/freemarker/core/LibraryLoad.java | 16 +-
.../freemarker/core/MarkupOutputFormat.java | 26 +-
src/main/java/freemarker/core/OutputFormat.java | 2 +-
.../freemarker/core/TemplateConfiguration.java | 4 +-
.../core/TemplateMarkupOutputModel.java | 21 +-
src/main/java/freemarker/core/TextBlock.java | 4 +
.../ext/servlet/FreemarkerServlet.java | 3 -
.../java/freemarker/template/Configuration.java | 117 +-
.../template/DefaultObjectWrapper.java | 2 +-
.../template/TemplateExceptionHandler.java | 9 +-
.../freemarker/template/utility/StringUtil.java | 8 +-
.../resources/freemarker/version.properties | 8 +-
src/manual/en_US/book.xml | 1396 +-
src/manual/zh_CN/book.xml | 31353 +++++++++++++++++
src/manual/zh_CN/docgen-help/README | 2 +
.../zh_CN/docgen-misc/googleAnalytics.html | 9 +
.../zh_CN/docgen-originals/figures/README | 2 +
src/manual/zh_CN/docgen.cjson | 130 +
src/manual/zh_CN/favicon.png | Bin 0 -> 1291 bytes
src/manual/zh_CN/figures/model2sketch.png | Bin 0 -> 21425 bytes
src/manual/zh_CN/figures/overview.png | Bin 0 -> 11837 bytes
src/manual/zh_CN/figures/tree.png | Bin 0 -> 4699 bytes
src/manual/zh_CN/logo.png | Bin 0 -> 10134 bytes
src/manual/zh_CN/placeholder.txt | 24 -
.../cache/MultiTemplateLoaderTest.java | 85 +
.../core/AppMetaTemplateDateFormatFactory.java | 2 -
.../freemarker/core/IncludeAndImportTest.java | 173 +-
.../java/freemarker/core/OutputFormatTest.java | 2 +-
.../config/WebappLocalFreemarkerServlet.java | 25 +
.../freemarker/manual/CustomFormatsExample.java | 3 +-
.../manual/UnitAwareTemplateNumberModel.java | 1 -
.../freemarker/template/ConfigurationTest.java | 22 +
.../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 +
72 files changed, 34004 insertions(+), 2083 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8eada2e9/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8eada2e9/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------