petclinic-uncached

diff --git a/src/main/java/org/springframework/samples/petclinic/NamedEntity.java b/src/main/java/org/springframework/samples/petclinic/NamedEntity.java
index f77348e..18c4714 100644
--- a/src/main/java/org/springframework/samples/petclinic/NamedEntity.java
+++ b/src/main/java/org/springframework/samples/petclinic/NamedEntity.java
@@ -3,6 +3,7 @@ package org.springframework.samples.petclinic;
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
 
+
 /**
  * Simple JavaBean domain object adds a name property to <code>BaseEntity</code>.
  * Used as a base class for objects needing these properties.

diff --git a/src/main/java/org/springframework/samples/petclinic/Owner.java b/src/main/java/org/springframework/samples/petclinic/Owner.java
index bde857e..65e3df8 100644
--- a/src/main/java/org/springframework/samples/petclinic/Owner.java
+++ b/src/main/java/org/springframework/samples/petclinic/Owner.java
@@ -12,8 +12,9 @@ import javax.persistence.Entity;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.validation.constraints.Digits;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 
-import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.beans.support.MutableSortDefinition;
 import org.springframework.beans.support.PropertyComparator;
 import org.springframework.core.style.ToStringCreator;
@@ -24,19 +25,20 @@ import org.springframework.core.style.ToStringCreator;
  * @author Ken Krebs
  * @author Juergen Hoeller
  * @author Sam Brannen
+ * @author Michael Isvy
  */
 @Entity @Table(name="owners")
 public class Owner extends Person {
 	@Column(name="address")
-	@NotEmpty
+	@NotNull @Size(min = 1)
 	private String address;
 	
-	@Column(name="city")
-	@NotEmpty
+	@Column(name="city")	
+	@NotNull @Size(min = 1)
 	private String city;
 
 	@Column(name="telephone")
-	@NotEmpty @Digits(fraction = 0, integer = 10)
+	@NotNull @Digits(fraction = 0, integer = 10)
 	private String telephone;
 
 	@OneToMany(cascade=CascadeType.ALL, mappedBy="owner")

diff --git a/src/main/webapp/resources/html/tutorial.html b/src/main/webapp/resources/html/tutorial.html
index ada7140..e1a408b 100644
--- a/src/main/webapp/resources/html/tutorial.html
+++ b/src/main/webapp/resources/html/tutorial.html
@@ -834,7 +834,7 @@
 		A copy of the existing <strong>Owner</strong> is used for editing.
 	  </li>
 	  <li>
-		<span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.AddPetController</span>
+		<span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.PetController</span>
 		is an annotation-driven, POJO <em>Form</em> controller that is used to add a new <strong>Pet</strong>
 		to an existing <strong>Owner</strong>.
 	  </li>

diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
index 205cfda..6c0f881 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
@@ -36,13 +36,13 @@
 	  <table class="table-buttons">
 	    <tr>
 	      <td colspan="2" align="center">
-	        <spring:url value="{ownerId}/edit" var="editUrl">
+	        <spring:url value="{ownerId}/edit.html" var="editUrl">
 	        	<spring:param name="ownerId" value="${owner.id}" />
 	        </spring:url>
 	        <a href="${fn:escapeXml(editUrl)}">Edit Owner</a>
 	      </td>
 	      <td>
-	        <spring:url value="{ownerId}/pets/new" var="addUrl">
+	        <spring:url value="{ownerId}/pets/new.html" var="addUrl">
 	        	<spring:param name="ownerId" value="${owner.id}" />
 	        </spring:url>
 	        <a href="${fn:escapeXml(addUrl)}">Add New Pet</a>