Merge remote-tracking branch 'FREEMARKER-1-option-overrideResponseContentType' into 2.3-gae
FREEMARKER-1: Adding OverrideResponseContentType init param in FreemarkerServlet GitHub pull request #5 Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/3ab293ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/3ab293ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/3ab293ad Branch: refs/heads/2.3-gae Commit: 3ab293ad12e1aaf2e2bededcd3540884d35f9fae Parents: 0256df5 e89dbfc Author: ddekany <[email protected]> Authored: Sat Oct 17 17:44:28 2015 +0200 Committer: ddekany <[email protected]> Committed: Sat Oct 17 17:48:10 2015 +0200 ---------------------------------------------------------------------- .classpath | 2 + ivy.xml | 10 +- .../ext/servlet/FreemarkerServlet.java | 37 ++++-- .../ext/servlet/FreemarkerServletTest.java | 124 +++++++++++++++++++ .../resources/freemarker/ext/servlet/foo.ftl | 19 +++ 5 files changed, 181 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/3ab293ad/.classpath ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/3ab293ad/ivy.xml ----------------------------------------------------------------------
