From 572ef6e2c4266d49f12ede949b2a421f9fe5db0a Mon Sep 17 00:00:00 2001
From: Mic <misvy@vmware.com>
Date: Fri, 8 Feb 2013 14:26:00 +0800
Subject: [PATCH] moved pointcut to @Repository instead of @Service

In that way we don't need a dedicated config file for the Service layer
---
 .springBeans                                        |  2 --
 .../petclinic/aspects/CallMonitoringAspect.java     |  2 +-
 src/main/resources/spring/service-config.xml        | 13 -------------
 src/main/webapp/WEB-INF/mvc-core-config.xml         |  2 +-
 src/main/webapp/WEB-INF/web.xml                     |  2 +-
 5 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 src/main/resources/spring/service-config.xml

diff --git a/.springBeans b/.springBeans
index a22a616d6..2f9dc4c20 100644
--- a/.springBeans
+++ b/.springBeans
@@ -11,7 +11,6 @@
 		<config>src/main/webapp/WEB-INF/mvc-view-config.xml</config>
 		<config>src/main/resources/spring/dao-config.xml</config>
 		<config>src/main/resources/spring/datasource-config.xml</config>
-		<config>src/main/resources/spring/service-config.xml</config>
 	</configs>
 	<configSets>
 		<configSet>
@@ -24,7 +23,6 @@
 				<config>src/main/resources/spring/dao-config.xml</config>
 				<config>src/main/resources/spring/datasource-config.xml</config>
 				<config>src/main/resources/spring/jmx-aop-config.xml</config>
-				<config>src/main/resources/spring/service-config.xml</config>
 			</configs>
 			<profiles>
 			</profiles>
diff --git a/src/main/java/org/springframework/samples/petclinic/aspects/CallMonitoringAspect.java b/src/main/java/org/springframework/samples/petclinic/aspects/CallMonitoringAspect.java
index 234a25be0..9e2b68eda 100644
--- a/src/main/java/org/springframework/samples/petclinic/aspects/CallMonitoringAspect.java
+++ b/src/main/java/org/springframework/samples/petclinic/aspects/CallMonitoringAspect.java
@@ -55,7 +55,7 @@ public class CallMonitoringAspect {
 	}
 
 
-	@Around("within(@org.springframework.stereotype.Service *)")
+	@Around("within(@org.springframework.stereotype.Repository *)")
 	public Object invoke(ProceedingJoinPoint joinPoint) throws Throwable {
 		if (this.isEnabled) {
 			StopWatch sw = new StopWatch(joinPoint.toShortString());
diff --git a/src/main/resources/spring/service-config.xml b/src/main/resources/spring/service-config.xml
deleted file mode 100644
index 99ef66db7..000000000
--- a/src/main/resources/spring/service-config.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Application context definition for PetClinic on JPA.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-
-		
-		<context:component-scan base-package="org.springframework.samples.petclinic.service"/>
-		
-</beans>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/mvc-core-config.xml b/src/main/webapp/WEB-INF/mvc-core-config.xml
index 3b1a242bb..6ce11a4a6 100644
--- a/src/main/webapp/WEB-INF/mvc-core-config.xml
+++ b/src/main/webapp/WEB-INF/mvc-core-config.xml
@@ -15,7 +15,7 @@
 	<!--
 		- POJOs labeled with the @Controller and @Service annotations are auto-detected.
 	-->
-	<context:component-scan base-package="org.springframework.samples.petclinic.web"/>
+	<context:component-scan base-package="org.springframework.samples.petclinic.web, org.springframework.samples.petclinic.service"/>
 	
 	 <mvc:annotation-driven  conversion-service="conversionService"/>
 	
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 0dfdc6bf0..aa7171e44 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -23,7 +23,7 @@ id="WebApp_ID" version="2.5">
 	-->
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
-		<param-value>classpath:spring/dao-config.xml, classpath:spring/service-config.xml, classpath:spring/jmx-aop-config.xml</param-value>
+		<param-value>classpath:spring/dao-config.xml, classpath:spring/jmx-aop-config.xml</param-value>
 	</context-param>
 	
 	<listener>