From 3a1f475f0261cd0215009e245223ca9ba4225e82 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Mon, 28 Jan 2013 17:34:44 -0500 Subject: [PATCH] Add support for spring:eval JSP tag Issue: SWF-1462 --- .../webflow/mvc/servlet/ServletMvcView.java | 9 +++++++-- .../webflow/mvc/view/AbstractMvcView.java | 9 ++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/ServletMvcView.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/ServletMvcView.java index 4a669c7b..dee261d2 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/ServletMvcView.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/ServletMvcView.java @@ -20,13 +20,14 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.core.convert.ConversionService; import org.springframework.webflow.context.ExternalContext; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.mvc.view.AbstractMvcView; /** * The Spring Web Servlet MVC view implementation. - * + * * @author Keith Donald */ public class ServletMvcView extends AbstractMvcView { @@ -47,7 +48,11 @@ public class ServletMvcView extends AbstractMvcView { HttpServletResponse response = (HttpServletResponse) externalContext.getNativeResponse(); request.setAttribute(org.springframework.web.servlet.support.RequestContext.WEB_APPLICATION_CONTEXT_ATTRIBUTE, context.getActiveFlow().getApplicationContext()); + // spring:eval tag + if (getConversionService() != null) { + request.setAttribute(ConversionService.class.getName(), getConversionService().getDelegateConversionService()); + } getView().render(model, request, response); } -} \ No newline at end of file +} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java index ae80603a..9b6defae 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java @@ -273,6 +273,13 @@ public abstract class AbstractMvcView implements View { return view; } + /** + * @return the configured ConversionService + */ + protected ConversionService getConversionService() { + return conversionService; + } + /** * Template method subclasses should override to execute the view rendering logic. * @param model the view model data @@ -676,4 +683,4 @@ public abstract class AbstractMvcView implements View { } } -} \ No newline at end of file +}