From a7ae7df3a8a85ed841d1c05e437a99e9c4c936a8 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Thu, 4 Feb 2010 17:48:51 +0000
Subject: [PATCH] + upgrade to AJ 1.6.8 + add dedicated section for Tomcat 5.5
 and Tomcat 6 LTW setup (so it's clearer)

---
 pom.xml                              | 4 ++--
 src/main/webapp/META-INF/context.xml | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9ba67ac96..0e02dcb04 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.10</slf4j.version>
+		<slf4j.version>1.5.6</slf4j.version>
 	</properties>
 	<dependencies>
 
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>com.springsource.org.aspectj.weaver</artifactId>
-			<version>1.6.5.RELEASE</version>
+			<version>1.6.8.RELEASE</version>
 		</dependency>
 
 		<!-- Logging -->
diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml
index fb6b09c3b..25356f60d 100644
--- a/src/main/webapp/META-INF/context.xml
+++ b/src/main/webapp/META-INF/context.xml
@@ -1,8 +1,14 @@
 <!-- Tomcat context descriptor used for specifying a custom ClassLoader -->
 <!-- Useful for allowing web-app wide (as opposed to VM or container wide) class instrumentation -->
 <Context path="/petclinic" reloadable="false">
-	<!-- please note that useSystemClassLoaderAsParent is available only in Tomcat 5.5.x since Tomcat 5.5.20. Remove it if Tomcat 6 is used -->
+	<!-- Tomcat 6.x or higher -->
 	<!--  
+	<Loader loaderClass="org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader"/>
+	-->
+	
+	<!-- Tomcat 5.5.x (higher then 5.5.20) -->
+	<!--
 	<Loader loaderClass="org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader" useSystemClassLoaderAsParent="false"/>
 	-->
+	
 </Context>