From b3b536194a12cae2772cf45f55692b01ddfb1f43 Mon Sep 17 00:00:00 2001
From: Julien Dubois <jdubois@ippon.fr>
Date: Mon, 25 Feb 2013 22:33:08 +0100
Subject: [PATCH] Transactions should be on the root application context (or
 Hibernate will not be able to persist entities)

---
 src/main/resources/spring/dao-config.xml      | 4 +++-
 src/main/resources/spring/mvc-core-config.xml | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/spring/dao-config.xml b/src/main/resources/spring/dao-config.xml
index 620f88527..9ea5c1764 100644
--- a/src/main/resources/spring/dao-config.xml
+++ b/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/>
diff --git a/src/main/resources/spring/mvc-core-config.xml b/src/main/resources/spring/mvc-core-config.xml
index 3724b0559..426f12315 100644
--- a/src/main/resources/spring/mvc-core-config.xml
+++ b/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"/>