freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [6/6] incubator-freemarker git commit: Merge remote-tracking branch 'origin/3' into 3
Date Sat, 15 Jul 2017 22:05:22 GMT
Merge remote-tracking branch 'origin/3' into 3

Conflicts:
	FM3-CHANGE-LOG.txt


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/bc35fa23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/bc35fa23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/bc35fa23

Branch: refs/heads/3
Commit: bc35fa2379b8becdd55f998009b1875b382b29df
Parents: 51dba88 ce9ab30
Author: ddekany <ddekany@apache.org>
Authored: Sun Jul 16 00:03:05 2017 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Sun Jul 16 00:03:05 2017 +0200

----------------------------------------------------------------------
 FM3-CHANGE-LOG.txt                              |   8 +-
 .../spring/web/view/AbstractFreeMarkerView.java | 170 ++++++++++++++++++
 .../spring/web/view/AbstractFreemarkerView.java | 170 ------------------
 .../spring/web/view/FreeMarkerView.java         | 168 ++++++++++++++++++
 .../spring/web/view/FreeMarkerViewResolver.java | 149 ++++++++++++++++
 .../spring/web/view/FreemarkerView.java         | 168 ------------------
 .../spring/web/view/FreemarkerViewResolver.java | 149 ----------------
 .../SpringResourceTemplateLoaderTest.java       |  84 +++++++++
 .../SpringResourceTemplateLoaderTest.java       |  84 ---------
 .../web/view/FreeMarkerViewResolverTest.java    |  98 +++++++++++
 .../spring/web/view/FreeMarkerViewTest.java     | 176 +++++++++++++++++++
 .../web/view/FreemarkerViewResolverTest.java    |  98 -----------
 .../spring/web/view/FreemarkerViewTest.java     | 176 -------------------
 13 files changed, 852 insertions(+), 846 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bc35fa23/FM3-CHANGE-LOG.txt
----------------------------------------------------------------------
diff --cc FM3-CHANGE-LOG.txt
index b5544cb,e502498..52b00c9
--- a/FM3-CHANGE-LOG.txt
+++ b/FM3-CHANGE-LOG.txt
@@@ -307,5 -299,11 +307,11 @@@ the FreeMarer 3 changelog here
    tool does this conversion.)
  - Inside a #switch, #case can't be after #default anymore (this is actually a bug in FM2)
    (The template converter can't fix this automatically, but reports it as an error.)
 -- #else and #elseif tags must be ended without "/", for example, <#else/> is illegal
now, <#else> is legal.
 +- #else and #elseIf tags must be ended without "/", for example, <#else/> is illegal
now, <#else> is legal.
-   (The template converter tool does this conversion.)
+   (The template converter tool does this conversion.)
+ - Spring Framework Support (freemarker-spring): FREEMARKER-54, FREEMARKER-55
+   - ConfigurationFactoryBean, a new Spring Framework's FactoryBean to create Configuration,
using Builder.
+   - SpringResourceTemplateLoader, a new TemplateLoader to load templates from Spring Framework's
Resources.
+   - New FreeMarkerView and FreeMarkerViewResolver for MVC support. FreeMarkerView supports
TaglibFactory and other
+     models by default like FreemarkerServlet does.
+ 


Mime
View raw message