From 80e124a06879de853f87064e1f2ab0cebd71799d Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Mon, 19 Oct 2015 16:47:12 -0400
Subject: [PATCH] Fix issue with Spring Security config

---
 .../WEB-INF/flows/embedded-flow-in-modal-dialog/step1.jsp     | 1 +
 .../WEB-INF/flows/embedded-flow-in-modal-dialog/step2.jsp     | 1 +
 .../src/main/webapp/WEB-INF/flows/embedded-flow/step1.jsp     | 1 +
 .../src/main/webapp/WEB-INF/flows/embedded-flow/step2.jsp     | 1 +
 .../src/main/webapp/WEB-INF/spring/security-config.xml        | 4 ++--
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow-in-modal-dialog/step1.jsp b/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow-in-modal-dialog/step1.jsp
index dc41421..b6b7619 100644
--- a/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow-in-modal-dialog/step1.jsp
+++ b/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow-in-modal-dialog/step1.jsp
@@ -1,6 +1,7 @@
 <div id="modalDialogContainer">
 	<p class="notice">This is step 1 of the flow embedded in a modal dialog.</p>
 	<form id="step1" action="${flowExecutionUrl}" method="POST">
+		<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 		<button id="cancel" type="submit" name="_eventId_cancel">Cancel</button>
 		<button id="next" type="submit" name="_eventId_next">Next &gt;&gt;</button>
 		<script type="text/javascript">
diff --git a/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow-in-modal-dialog/step2.jsp b/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow-in-modal-dialog/step2.jsp
index 81ba4d2..ad7a601 100644
--- a/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow-in-modal-dialog/step2.jsp
+++ b/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow-in-modal-dialog/step2.jsp
@@ -1,6 +1,7 @@
 <div id="modalDialogContainer">
 	<p class="notice">This is step 2 of the flow embedded in a modal dialog.</p>
 	<form id="step2" action="${flowExecutionUrl}" method="POST">
+		<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 		<button id="cancel" type="submit" name="_eventId_cancel">Cancel</button>
 		<button id="previous" type="submit" name="_eventId_previous">&lt;&lt; Previous</button>
 		<button id="finish" type="submit" name="_eventId_finish">Finish &gt;&gt;</button>
diff --git a/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow/step1.jsp b/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow/step1.jsp
index 7589932..c2758a7 100644
--- a/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow/step1.jsp
+++ b/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow/step1.jsp
@@ -1,6 +1,7 @@
 <div id="embeddedFlow">
 	<p class="notice">This is step 1 of the embedded flow</p>
 	<form id="step1" action="${flowExecutionUrl}" method="POST">
+		<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 		<button id="cancel" type="submit" name="_eventId_cancel">Cancel</button>
 		<button id="next" type="submit" name="_eventId_next">Next &gt;&gt;</button>
 		<script type="text/javascript">
diff --git a/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow/step2.jsp b/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow/step2.jsp
index 5d04442..0644725 100644
--- a/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow/step2.jsp
+++ b/webflow-showcase/src/main/webapp/WEB-INF/flows/embedded-flow/step2.jsp
@@ -1,6 +1,7 @@
 <div id="embeddedFlow">
 	<p class="notice">This is step 2 of the embedded flow</p>
 	<form id="step2" action="${flowExecutionUrl}" method="POST">
+		<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 		<button id="cancel" type="submit" name="_eventId_cancel">Cancel</button>
 		<button id="previous" type="submit" name="_eventId_previous">&lt;&lt; Previous</button>
 		<button id="finish" type="submit" name="_eventId_finish">Finish &gt;&gt;</button>
diff --git a/webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml b/webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml
index 34a3126..8dc75ec 100644
--- a/webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml
+++ b/webflow-showcase/src/main/webapp/WEB-INF/spring/security-config.xml
@@ -4,9 +4,9 @@
        xmlns:security="http://www.springframework.org/schema/security"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+           http://www.springframework.org/schema/beans/spring-beans.xsd
            http://www.springframework.org/schema/security
-           http://www.springframework.org/schema/security/spring-security-3.2.xsd">
+           http://www.springframework.org/schema/security/spring-security.xsd">
 
 	<!-- 
 		Configure Spring Security