updated to FreeMarker 2.3.15 (SPR-4962)

org.springframework.context.support/context-support.iml

@@ -41,11 +41,11 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.freemarker/com.springsource.freemarker/2.3.12/com.springsource.freemarker-2.3.12.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.freemarker/com.springsource.freemarker/2.3.15/com.springsource.freemarker-2.3.15.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.freemarker/com.springsource.freemarker/2.3.12/com.springsource.freemarker-sources-2.3.12.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.freemarker/com.springsource.freemarker/2.3.15/com.springsource.freemarker-sources-2.3.15.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>

org.springframework.context.support/ivy.xml

@@ -29,7 +29,7 @@
 
 	<dependencies>
 		<dependency org="com.bea.commonj" name="com.springsource.commonj" rev="1.1.0" conf="optional, commonj->compile"/>
-		<dependency org="org.freemarker" name="com.springsource.freemarker" rev="2.3.12" conf="optional, freemarker->compile"/>
+		<dependency org="org.freemarker" name="com.springsource.freemarker" rev="2.3.15" conf="optional, freemarker->compile"/>
 		<dependency org="javax.activation" name="com.springsource.javax.activation" rev="1.1.0" conf="provided->compile"/>
 		<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="optional, mail->compile"/>
 		<dependency org="net.sourceforge.ehcache" name="com.springsource.net.sf.ehcache" rev="1.3.0" conf="optional, ehcache->compile"/>

org.springframework.context.support/pom.xml

@@ -24,9 +24,6 @@
       <artifactId>jta</artifactId>
       <version>1.1</version>
     </dependency>
-
-
-    
     <dependency>
       <groupId>quartz</groupId>
       <artifactId>quartz</artifactId>
@@ -38,12 +35,10 @@
       <version>1.6.0</version>
       <optional>true</optional>
     </dependency>
-
-
     <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
-      <version>2.3.12</version>
+      <version>2.3.15</version>
       <optional>true</optional>
     </dependency>
     <dependency>

org.springframework.integration-tests/integration-tests.iml

@@ -220,11 +220,11 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.freemarker/com.springsource.freemarker/2.3.12/com.springsource.freemarker-2.3.12.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.freemarker/com.springsource.freemarker/2.3.15/com.springsource.freemarker-2.3.15.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.freemarker/com.springsource.freemarker/2.3.12/com.springsource.freemarker-sources-2.3.12.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.freemarker/com.springsource.freemarker/2.3.15/com.springsource.freemarker-sources-2.3.15.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>

org.springframework.integration-tests/ivy.xml

@@ -69,7 +69,7 @@
 		<dependency org="org.easymock" name="com.springsource.org.easymock.classextension" rev="2.3.0" conf="test->compile"/>
 		<dependency org="org.eclipse.persistence" name="com.springsource.org.eclipse.persistence" rev="1.0.1" conf="test->compile"/>
 		<dependency org="org.eclipse.persistence" name="com.springsource.org.eclipse.persistence.jpa" rev="1.0.1" conf="test->compile"/>
-		<dependency org="org.freemarker" name="com.springsource.freemarker" rev="2.3.12" conf="test->compile"/>
+		<dependency org="org.freemarker" name="com.springsource.freemarker" rev="2.3.15" conf="test->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA" conf="test->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations" rev="3.4.0.GA" conf="test->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations.common" rev="3.3.0.ga" conf="test->compile"/>

org.springframework.integration-tests/pom.xml

@@ -309,7 +309,7 @@
     <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
-      <version>2.3.12</version>
+      <version>2.3.15</version>
       <scope>test</scope>
     </dependency>
     <dependency>

org.springframework.web.servlet/ivy.xml

@@ -34,7 +34,7 @@
 					conf="optional, feed->compile"/>
 		<dependency org="com.lowagie.text" name="com.springsource.com.lowagie.text" rev="2.0.8"
 					conf="optional, itext->compile"/>
-		<dependency org="org.freemarker" name="com.springsource.freemarker" rev="2.3.12"
+		<dependency org="org.freemarker" name="com.springsource.freemarker" rev="2.3.15"
 					conf="optional, freemarker->compile"/>
 		<dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="provided->compile"/>
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->compile"/>

org.springframework.web.servlet/pom.xml

@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
-      <version>2.3.12</version>
+      <version>2.3.15</version>
       <optional>true</optional>
     </dependency>
     <dependency>

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java

@@ -34,6 +34,7 @@ import javax.servlet.http.HttpSession;
 
 import freemarker.core.ParseException;
 import freemarker.ext.jsp.TaglibFactory;
+import freemarker.ext.servlet.AllHttpScopesHashModel;
 import freemarker.ext.servlet.FreemarkerServlet;
 import freemarker.ext.servlet.HttpRequestHashModel;
 import freemarker.ext.servlet.HttpRequestParametersHashModel;
@@ -41,6 +42,7 @@ import freemarker.ext.servlet.HttpSessionHashModel;
 import freemarker.ext.servlet.ServletContextHashModel;
 import freemarker.template.Configuration;
 import freemarker.template.ObjectWrapper;
+import freemarker.template.SimpleHash;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
 
@@ -250,7 +252,7 @@ public class FreeMarkerView extends AbstractTemplateView {
 	 * library hash model.
 	 * <p>Can be overridden to customize the behavior, for example to render
 	 * multiple templates into a single view.
-	 * @param model the template model to use for rendering
+	 * @param model the model to use for rendering
 	 * @param request current HTTP request
 	 * @param response current servlet response
 	 * @throws IOException if the template file could not be retrieved
@@ -264,20 +266,34 @@ public class FreeMarkerView extends AbstractTemplateView {
 	protected void doRender(Map<String, Object> model, HttpServletRequest request, HttpServletResponse response) throws Exception {
 		// Expose model to JSP tags (as request attributes).
 		exposeModelAsRequestAttributes(model, request);
-
 		// Expose all standard FreeMarker hash models.
-		model.put(FreemarkerServlet.KEY_JSP_TAGLIBS, this.taglibFactory);
+		SimpleHash fmModel = buildTemplateModel(model, request, response);
-		model.put(FreemarkerServlet.KEY_APPLICATION, this.servletContextHashModel);
-		model.put(FreemarkerServlet.KEY_SESSION, buildSessionModel(request, response));
-		model.put(FreemarkerServlet.KEY_REQUEST, new HttpRequestHashModel(request, response, getObjectWrapper()));
-		model.put(FreemarkerServlet.KEY_REQUEST_PARAMETERS, new HttpRequestParametersHashModel(request));
 
 		if (logger.isDebugEnabled()) {
 			logger.debug("Rendering FreeMarker template [" + getUrl() + "] in FreeMarkerView '" + getBeanName() + "'");
 		}
 		// Grab the locale-specific version of the template.
 		Locale locale = RequestContextUtils.getLocale(request);
-		processTemplate(getTemplate(locale), model, response);
+		processTemplate(getTemplate(locale), fmModel, response);
+	}
+
+	/**
+	 * Build a FreeMarker template model for the given model Map.
+	 * <p>The default implementation builds a {@link AllHttpScopesHashModel}.
+	 * @param model the model to use for rendering
+	 * @param request current HTTP request
+	 * @param response current servlet response
+	 * @return the FreeMarker template model, as a {@link SimpleHash} or subclass thereof
+	 */
+	protected SimpleHash buildTemplateModel(Map<String, Object> model, HttpServletRequest request, HttpServletResponse response) {
+		AllHttpScopesHashModel fmModel = new AllHttpScopesHashModel(getObjectWrapper(), getServletContext(), request);
+		fmModel.put(FreemarkerServlet.KEY_JSP_TAGLIBS, this.taglibFactory);
+		fmModel.put(FreemarkerServlet.KEY_APPLICATION, this.servletContextHashModel);
+		fmModel.put(FreemarkerServlet.KEY_SESSION, buildSessionModel(request, response));
+		fmModel.put(FreemarkerServlet.KEY_REQUEST, new HttpRequestHashModel(request, response, getObjectWrapper()));
+		fmModel.put(FreemarkerServlet.KEY_REQUEST_PARAMETERS, new HttpRequestParametersHashModel(request));
+		fmModel.putAll(model);
+		return fmModel;
 	}
 
 	/**
@@ -338,7 +354,7 @@ public class FreeMarkerView extends AbstractTemplateView {
 	 * @throws TemplateException if thrown by FreeMarker
 	 * @see freemarker.template.Template#process(Object, java.io.Writer)
 	 */
-	protected void processTemplate(Template template, Map<String, Object> model, HttpServletResponse response)
+	protected void processTemplate(Template template, SimpleHash model, HttpServletResponse response)
 			throws IOException, TemplateException {
 
 		template.process(model, response.getWriter());

org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,9 @@ import javax.servlet.http.HttpServletResponse;
 
 import freemarker.template.Configuration;
 import freemarker.template.Template;
+import freemarker.template.TemplateModel;
+import freemarker.template.SimpleHash;
+import freemarker.template.TemplateException;
 import junit.framework.TestCase;
 
 import org.springframework.beans.TestBean;
@@ -79,7 +82,9 @@ public class FreeMarkerMacroTests extends TestCase {
 
 	public void testExposeSpringMacroHelpers() throws Exception {
 		FreeMarkerView fv = new FreeMarkerView() {
-			protected void processTemplate(Template template, Map model, HttpServletResponse response) {
+			@Override
+			protected void processTemplate(Template template, SimpleHash fmModel, HttpServletResponse response) throws TemplateException {
+				Map model = fmModel.toMap();
 				assertTrue(model.get(FreeMarkerView.SPRING_MACRO_REQUEST_CONTEXT_ATTRIBUTE) instanceof RequestContext);
 				RequestContext rc = (RequestContext) model.get(FreeMarkerView.SPRING_MACRO_REQUEST_CONTEXT_ATTRIBUTE);
 				BindStatus status = rc.getBindStatus("tb.name");
@@ -100,7 +105,8 @@ public class FreeMarkerMacroTests extends TestCase {
 		final String helperTool = "wrongType";
 
 		FreeMarkerView fv = new FreeMarkerView() {
-			protected void processTemplate(Template template, Map model, HttpServletResponse response) {
+			@Override
+			protected void processTemplate(Template template, SimpleHash model, HttpServletResponse response) {
 				fail();
 			}
 		};
@@ -155,6 +161,7 @@ public class FreeMarkerMacroTests extends TestCase {
 		view.setUrl("test.ftl");
 		view.setExposeSpringMacroHelpers(false);
 		view.setConfiguration(config);
+		view.setServletContext(new MockServletContext());
 
 		view.render(model, request, response);
 

org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,9 @@ import java.util.Locale;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
+import freemarker.ext.servlet.AllHttpScopesHashModel;
 import freemarker.template.Configuration;
+import freemarker.template.SimpleScalar;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
 import org.easymock.MockControl;
@@ -104,7 +106,7 @@ public class FreeMarkerViewTests {
 		wac.getParentBeanFactory();
 		wmc.setReturnValue(null);
 		wac.getServletContext();
-		wmc.setReturnValue(sc, 4);
+		wmc.setReturnValue(sc, 5);
 		wmc.replay();
 
 		fv.setUrl("templateName");
@@ -141,7 +143,7 @@ public class FreeMarkerViewTests {
 		wac.getParentBeanFactory();
 		wmc.setReturnValue(null);
 		wac.getServletContext();
-		wmc.setReturnValue(sc, 4);
+		wmc.setReturnValue(sc, 5);
 		wmc.replay();
 
 		fv.setUrl("templateName");
@@ -170,9 +172,9 @@ public class FreeMarkerViewTests {
 			return new Template(name, new StringReader("test")) {
 				public void process(Object model, Writer writer) throws TemplateException, IOException {
 					assertEquals(Locale.US, locale);
-					assertTrue(model instanceof Map);
+					assertTrue(model instanceof AllHttpScopesHashModel);
-					Map modelMap = (Map) model;
+					AllHttpScopesHashModel fmModel = (AllHttpScopesHashModel) model;
-					assertEquals("myvalue", modelMap.get("myattr"));
+					assertEquals("myvalue", fmModel.get("myattr").toString());
 				}
 			};
 		}

org.springframework.web.servlet/web-servlet.iml

@@ -43,11 +43,11 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.freemarker/com.springsource.freemarker/2.3.12/com.springsource.freemarker-2.3.12.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.freemarker/com.springsource.freemarker/2.3.15/com.springsource.freemarker-2.3.15.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.freemarker/com.springsource.freemarker/2.3.12/com.springsource.freemarker-sources-2.3.12.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.freemarker/com.springsource.freemarker/2.3.15/com.springsource.freemarker-sources-2.3.15.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>