Update for SWF-1501

spring-attic · Feb 29, 2012 · 6a24d85 · 6a24d85
1 parent b164c1a
commit 6a24d85
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/SWF-0000/src/main/webapp/WEB-INF/myflow/myflow.xml b/SWF-0000/src/main/webapp/WEB-INF/myflow/myflow.xml
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="
 		http://www.springframework.org/schema/webflow 
-		http://www.springframework.org/schema/webflow/spring-webflow.xsd">
+		http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
 	<view-state id="view">
 		<transition on="continue" to="done" />

diff --git a/SWF-0000/src/main/webapp/WEB-INF/myflow/view.jsp b/SWF-0000/src/main/webapp/WEB-INF/myflow/view.jsp
@@ -1,5 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>

diff --git a/SWF-1501/pom.xml b/SWF-1501/pom.xml
@@ -132,13 +132,6 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.servlet.jsp</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.1</version>
-			<scope>provided</scope>
-		</dependency>
-
 		<!-- Bean Validation with the Hibernate Validator implementation -->
 		<dependency>
 			<groupId>javax.validation</groupId>

diff --git a/SWF-1501/src/main/webapp/WEB-INF/myflow/myflow.xml b/SWF-1501/src/main/webapp/WEB-INF/myflow/myflow.xml
@@ -7,6 +7,9 @@
 	<var name="mainEntityController" class="org.springframework.webflow.issues.MainEntityController"/>
 
 	<view-state id="view">
+		<on-render>
+			<set name="requestScope.dynamicImage" value="mainEntityController.createDynamicImage()" />
+		</on-render>
 		<transition on="continue" to="done" />
 	</view-state>
 

diff --git a/SWF-1501/src/main/webapp/WEB-INF/myflow/view.xhtml b/SWF-1501/src/main/webapp/WEB-INF/myflow/view.xhtml
@@ -10,7 +10,7 @@
     <div>
       <h1>My Page</h1>
       <h:form>
-        <p:graphicImage value="#{mainEntityController.createDynamicImage()}" />      
+        <p:graphicImage value="#{dynamicImage}" />
         <h:commandButton id="continue" value="End Flow" action="continue" />
       </h:form>
     </div>