From bcda93f280e9174f4e5c44fc830a864a963633a5 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Sat, 19 Dec 2009 21:37:18 +0000
Subject: [PATCH] Slf4j update

---
 pom.xml                                                    | 2 +-
 .../samples/petclinic/aspects/AbstractTraceAspect.java     | 6 +++---
 .../samples/petclinic/jdbc/SimpleJdbcClinic.java           | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index f4ca9008f..22a3c6067 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	<version>1.0.0-SNAPSHOT</version>
 	<properties>
 		<spring.version>3.0.0.RELEASE</spring.version>
-		<slf4j.version>1.5.6</slf4j.version>
+		<slf4j.version>1.5.10</slf4j.version>
 	</properties>
 	<dependencies>
 	
diff --git a/src/main/java/org/springframework/samples/petclinic/aspects/AbstractTraceAspect.java b/src/main/java/org/springframework/samples/petclinic/aspects/AbstractTraceAspect.java
index 26d32359f..977bb684f 100644
--- a/src/main/java/org/springframework/samples/petclinic/aspects/AbstractTraceAspect.java
+++ b/src/main/java/org/springframework/samples/petclinic/aspects/AbstractTraceAspect.java
@@ -1,11 +1,11 @@
 package org.springframework.samples.petclinic.aspects;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Aspect to illustrate Spring-driven load-time weaving.
@@ -16,7 +16,7 @@ import org.aspectj.lang.annotation.Pointcut;
 @Aspect
 public abstract class AbstractTraceAspect {
 
-	private static final Log logger = LogFactory.getLog(AbstractTraceAspect.class);
+	private static final Logger logger = LoggerFactory.getLogger(AbstractTraceAspect.class);
 	
 	@Pointcut
 	public abstract void traced();
diff --git a/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinic.java b/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinic.java
index 587acecb9..1d9894d38 100644
--- a/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinic.java
+++ b/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinic.java
@@ -8,9 +8,8 @@ import java.util.List;
 
 import javax.sql.DataSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.EmptyResultDataAccessException;
@@ -57,7 +56,7 @@ import org.springframework.transaction.annotation.Transactional;
 @ManagedResource("petclinic:type=Clinic")
 public class SimpleJdbcClinic implements Clinic, SimpleJdbcClinicMBean {
 
-	private final Log logger = LogFactory.getLog(getClass());
+	private final Logger logger = LoggerFactory.getLogger(getClass());
 
 	private SimpleJdbcTemplate simpleJdbcTemplate;