From 89b67d666e50062995d82062dabdfb3c05804505 Mon Sep 17 00:00:00 2001
From: Ben Hale <bhale@vmware.com>
Date: Tue, 14 Aug 2007 15:26:44 +0000
Subject: [PATCH] Fixed up JSP pages to support new Spring 2.1-m3 requirements
 for spring:bind and form:form tags.

---
 .../webapp/WEB-INF/jsp/searchCriteria.jsp     |  4 +--
 .../webapp/WEB-INF/jsp/searchCriteria.jsp     |  2 +-
 ...org.springframework.ide.eclipse.core.prefs | 32 ++++++++++++++++++-
 .../main/webapp/WEB-INF/jsp/categoryForm.jsp  |  2 +-
 .../WEB-INF/jsp/shippingDetailsForm.jsp       |  2 +-
 5 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp b/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp
index 0e2ea9fc..6d014e11 100644
--- a/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp
+++ b/spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp
@@ -43,7 +43,7 @@
 			</td>
 		</tr>
 		</spring:hasBindErrors>
-		<spring:bind path="searchCriteria.firstName">
+		<spring:bind path="firstName">
 		<tr>
 			<td>First Name</td>
 			<td>
@@ -51,7 +51,7 @@
 			</td>
 		</tr>
 		</spring:bind>		
-		<spring:bind path="searchCriteria.lastName">
+		<spring:bind path="lastName">
 		<tr>
 			<td>Last Name</td>
 			<td>
diff --git a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp b/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp
index e51b16d2..e5cf1123 100644
--- a/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp
+++ b/spring-webflow-samples/phonebook/src/main/webapp/WEB-INF/jsp/searchCriteria.jsp
@@ -32,7 +32,7 @@
 		</tr>
 		<tr>
 			<td colspan="2">
-				<form:errors cssClass="error"/>
+				<form:errors cssClass="error" path="*"/>
 			</td>
 		</tr>
 		<tr>
diff --git a/spring-webflow-samples/sellitem/.settings/org.springframework.ide.eclipse.core.prefs b/spring-webflow-samples/sellitem/.settings/org.springframework.ide.eclipse.core.prefs
index a8fed381..5a58de60 100644
--- a/spring-webflow-samples/sellitem/.settings/org.springframework.ide.eclipse.core.prefs
+++ b/spring-webflow-samples/sellitem/.settings/org.springframework.ide.eclipse.core.prefs
@@ -1,6 +1,36 @@
-#Thu Aug 09 13:12:30 EDT 2007
+#Tue Aug 14 11:14:59 EDT 2007
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
 org.springframework.ide.eclipse.core.builders.enable.aopreferencemodelbuilder=true
 org.springframework.ide.eclipse.core.builders.enable.beansvalidator=true
 org.springframework.ide.eclipse.core.builders.enable.webflowvalidator=true
+org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanAlias-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanClass-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanConstructorArgument-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinition-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinitionHolder-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanFactory-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanInitDestroyMethod-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanReference-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.requiredProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.action-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.actionstate-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attribute-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attributemapper-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.beanaction-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationaction-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationresult-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.exceptionhandler-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.import-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.inputattribute-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.mapping-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.outputattribute-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.set-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.state-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.subflowstate-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.transition-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.variable-org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.webflowstate-org.springframework.ide.eclipse.webflow.core.validator=true
diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/categoryForm.jsp b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/categoryForm.jsp
index fd2f782e..58e4fae6 100644
--- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/categoryForm.jsp
+++ b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/categoryForm.jsp
@@ -31,7 +31,7 @@
 		<tr>
 			<td>Category:</td>
 			<td>
-				<spring:bind path="sale.category">
+				<spring:bind path="category">
 					<select name="${status.expression}">
 						<option value="" <c:if test="${status.value ==''}">selected</c:if>>
 							None (0.02 discount rate)
diff --git a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/shippingDetailsForm.jsp b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/shippingDetailsForm.jsp
index 11d5ce56..230cc43c 100644
--- a/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/shippingDetailsForm.jsp
+++ b/spring-webflow-samples/sellitem/src/main/webapp/WEB-INF/jsp/shippingDetailsForm.jsp
@@ -37,7 +37,7 @@
 		<tr>
 			<td>Shipping type:</td>
 			<td>
-				<spring:bind path="sale.shippingType">
+				<spring:bind path="shippingType">
 					<select name="${status.expression}">
 						<option value="S" <c:if test="${status.value=='S'}">selected</c:if>>
 							Standard (10 extra cost)