From 52d4b20d08a6041ffb8bd613e647504b4f5f11cb Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 19 Mar 2012 16:32:05 +0000
Subject: [PATCH] Apply patch from SPR-7894

---
 .classpath                                     | 4 ++--
 .project                                       | 4 ++--
 src/main/webapp/WEB-INF/jsp/owners/form.jsp    | 6 +++---
 src/main/webapp/WEB-INF/jsp/pets/form.jsp      | 8 ++++----
 src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.classpath b/.classpath
index 5e7d5199b..8122bbbe4 100644
--- a/.classpath
+++ b/.classpath
@@ -5,11 +5,11 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="output" path="target/classes"/>
-</classpath>
\ No newline at end of file
+</classpath>
diff --git a/.project b/.project
index 87137c12c..239f04e3c 100644
--- a/.project
+++ b/.project
@@ -32,18 +32,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/form.jsp b/src/main/webapp/WEB-INF/jsp/owners/form.jsp
index 1670a7c1b..b4c2b2100 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/form.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/form.jsp
@@ -1,11 +1,11 @@
 <%@ include file="/WEB-INF/jsp/includes.jsp" %>
 <%@ include file="/WEB-INF/jsp/header.jsp" %>
 <c:choose>
-	<c:when test="${owner.new}"><c:set var="method" value="post"/></c:when>
+	<c:when test="${owner['new']}"><c:set var="method" value="post"/></c:when>
 	<c:otherwise><c:set var="method" value="put"/></c:otherwise>
 </c:choose>
 
-<h2><c:if test="${owner.new}">New </c:if>Owner:</h2>
+<h2><c:if test="${owner['new']}">New </c:if>Owner:</h2>
 <form:form modelAttribute="owner" method="${method}">
   <table>
     <tr>
@@ -46,7 +46,7 @@
     <tr>
       <td>
         <c:choose>
-          <c:when test="${owner.new}">
+          <c:when test="${owner['new']}">
             <p class="submit"><input type="submit" value="Add Owner"/></p>
           </c:when>
           <c:otherwise>
diff --git a/src/main/webapp/WEB-INF/jsp/pets/form.jsp b/src/main/webapp/WEB-INF/jsp/pets/form.jsp
index 459ec63b3..12f503db5 100644
--- a/src/main/webapp/WEB-INF/jsp/pets/form.jsp
+++ b/src/main/webapp/WEB-INF/jsp/pets/form.jsp
@@ -1,11 +1,11 @@
 <%@ include file="/WEB-INF/jsp/includes.jsp" %>
 <%@ include file="/WEB-INF/jsp/header.jsp" %>
 <c:choose>
-	<c:when test="${pet.new}"><c:set var="method" value="post"/></c:when>
+	<c:when test="${pet['new']}"><c:set var="method" value="post"/></c:when>
 	<c:otherwise><c:set var="method" value="put"/></c:otherwise>
 </c:choose>
 
-<h2><c:if test="${pet.new}">New </c:if>Pet</h2>
+<h2><c:if test="${pet['new']}">New </c:if>Pet</h2>
 
 <b>Owner:</b> ${pet.owner.firstName} ${pet.owner.lastName}
 <br/>
@@ -35,7 +35,7 @@
     <tr>
       <td>
         <c:choose>
-          <c:when test="${pet.new}">
+          <c:when test="${pet['new']}">
             <p class="submit"><input type="submit" value="Add Pet"/></p>
           </c:when>
           <c:otherwise>
@@ -47,7 +47,7 @@
   </table>
 </form:form>
 
-<c:if test="${!pet.new}">
+<c:if test="${!pet['new']}">
   <form:form method="delete">
     <p class="submit"><input type="submit" value="Delete Pet"/></p>
   </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp
index b1207a00f..97183f46c 100644
--- a/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp
@@ -1,7 +1,7 @@
 <%@ include file="/WEB-INF/jsp/includes.jsp" %>
 <%@ include file="/WEB-INF/jsp/header.jsp" %>
 
-<h2><c:if test="${visit.new}">New </c:if>Visit:</h2>
+<h2><c:if test="${visit['new']}">New </c:if>Visit:</h2>
 
 <form:form modelAttribute="visit">
   <b>Pet:</b>
@@ -56,7 +56,7 @@
     <th>Description</th>
   </tr>
   <c:forEach var="visit" items="${visit.pet.visits}">
-    <c:if test="${!visit.new}">
+    <c:if test="${!visit['new']}">
       <tr>
         <td><fmt:formatDate value="${visit.date}" pattern="yyyy-MM-dd"/></td>
         <td>${visit.description}</td>