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 2017/06/18 14:30:34 UTC
[8/9] incubator-freemarker git commit: freemareker-spring module,
basic functionality
freemareker-spring module, basic functionality
Merge commit 'refs/pull/23/head' of https://github.com/apache/incubator-freemarker into 3
Conflicts:
settings.gradle
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/886fd666
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/886fd666
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/886fd666
Branch: refs/heads/3
Commit: 886fd66684d06d161dbc1b139eb1a35f01030420
Parents: c73dc56 fc1f429
Author: ddekany <dd...@apache.org>
Authored: Sun Jun 18 16:26:51 2017 +0200
Committer: ddekany <dd...@apache.org>
Committed: Sun Jun 18 16:26:51 2017 +0200
----------------------------------------------------------------------
freemarker-spring/build.gradle | 99 +++++++++++++++
.../spring/ConfigurationFactoryBean.java | 118 +++++++++++++++++
.../SpringResourceTemplateLoader.java | 123 ++++++++++++++++++
.../spring/ConfigurationFactoryBeanTest.java | 127 +++++++++++++++++++
.../SpringResourceTemplateLoaderTest.java | 82 ++++++++++++
.../META-INF/templates/sub1/sub2/t.ftl | 1 +
settings.gradle | 2 +-
7 files changed, 551 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/886fd666/settings.gradle
----------------------------------------------------------------------
diff --cc settings.gradle
index 1f07da1,2373331..f8f9b47
--- a/settings.gradle
+++ b/settings.gradle
@@@ -26,5 -26,5 +26,5 @@@ include 'freemarker-servlet
include 'freemarker-test-utils'
include 'freemarker-manual'
include 'freemarker-dom'
+ include 'freemarker-spring'
-
+include 'freemarker-converter'
-