Merge branch 'master' of https://github.com/SpringSource/spring-petclinic

src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java

@@ -45,7 +45,7 @@ public class JpaOwnerRepositoryImpl implements OwnerRepository {
     public Collection<Owner> findByLastName(String lastName) {
         // using 'join fetch' because a single query should load both owners and pets
         // using 'left join fetch' because it might happen that an owner does not have pets yet
-        Query query = this.em.createQuery("SELECT owner FROM Owner owner left join fetch owner.pets WHERE owner.lastName LIKE :lastName");
+        Query query = this.em.createQuery("SELECT DISTINCT owner FROM Owner owner left join fetch owner.pets WHERE owner.lastName LIKE :lastName");
         query.setParameter("lastName", lastName + "%");
         return query.getResultList();
     }

src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaOwnerRepositoryImpl.java

@@ -43,7 +43,7 @@ public class JpaOwnerRepositoryImpl implements OwnerRepository {
     public Collection<Owner> findByLastName(String lastName) {
         // using 'join fetch' because a single query should load both owners and pets
         // using 'left join fetch' because it might happen that an owner does not have pets yet
-        Query query = this.em.createQuery("SELECT owner FROM Owner owner left join fetch owner.pets WHERE owner.lastName LIKE :lastName");
+        Query query = this.em.createQuery("SELECT DISTINCT owner FROM Owner owner left join fetch owner.pets WHERE owner.lastName LIKE :lastName");
         query.setParameter("lastName", lastName + "%");
         return query.getResultList();
     }

src/main/resources/spring/dao-config.xml

@@ -22,6 +22,8 @@
     <!-- import the dataSource definition -->
     <import resource="datasource-config.xml"/>
 
+    <context:component-scan
+            base-package="org.springframework.samples.petclinic.service"/>
 
     <!-- Configurer that replaces ${...} placeholders with values from a properties file -->
     <!-- (in this case, JDBC-related settings for the JPA EntityManager definition below) -->
@@ -40,7 +42,7 @@
     <!--
         Instruct Spring to perform declarative transaction management
         automatically on annotated classes.
-                
+
         for mode="aspectj"/ see SPR-6392
     -->
     <tx:annotation-driven/>

src/main/resources/spring/mvc-core-config.xml

@@ -20,7 +20,7 @@
         - POJOs labeled with the @Controller and @Service annotations are auto-detected.
     -->
     <context:component-scan
-            base-package="org.springframework.samples.petclinic.web, org.springframework.samples.petclinic.service"/>
+            base-package="org.springframework.samples.petclinic.web"/>
 
     <mvc:annotation-driven conversion-service="conversionService"/>