From dc592837be6fad4c671f970c3713e9c9e8ad9d66 Mon Sep 17 00:00:00 2001
From: Colin Sampaleanu <csampaleanu@vmware.com>
Date: Mon, 13 Apr 2009 05:23:44 +0000
Subject: [PATCH] allow petclinic unit tests to work. slf4j impl was needed

---
 org.springframework.samples.petclinic/.classpath  |  1 +
 org.springframework.samples.petclinic/ivy.xml     | 15 +++++++++------
 .../petclinic.iml                                 | 12 ++++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/org.springframework.samples.petclinic/.classpath b/org.springframework.samples.petclinic/.classpath
index 742b0bbac0..0d9148baf9 100644
--- a/org.springframework.samples.petclinic/.classpath
+++ b/org.springframework.samples.petclinic/.classpath
@@ -38,5 +38,6 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/com.springsource.org.hibernate/3.3.1.GA/com.springsource.org.hibernate-3.3.1.GA.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/com.springsource.org.hibernate.ejb/3.4.0.GA/com.springsource.org.hibernate.ejb-3.4.0.GA.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.hibernate/com.springsource.org.hibernate.annotations/3.4.0.GA/com.springsource.org.hibernate.annotations-3.4.0.GA.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.slf4j/com.springsource.slf4j.jcl/1.5.3/com.springsource.slf4j.jcl-1.5.3.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.samples.petclinic/ivy.xml b/org.springframework.samples.petclinic/ivy.xml
index 818d358182..d2e7237d24 100644
--- a/org.springframework.samples.petclinic/ivy.xml
+++ b/org.springframework.samples.petclinic/ivy.xml
@@ -19,7 +19,9 @@
 	</publications>
 
 	<dependencies>
+		<dependency org="com.oracle.toplink.essentials" name="com.springsource.oracle.toplink.essentials" rev="2.0.0.b41-beta2" conf="compile->compile"/>
 		<dependency org="com.sun.syndication" name="com.springsource.com.sun.syndication" rev="0.9.0" conf="compile->compile"/>
+		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="compile->compile"/>
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->runtime"/>
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.2.0" conf="compile->runtime"/>
 		<dependency org="javax.xml.bind" name="com.springsource.javax.xml.bind" rev="2.1.7" conf="compile->runtime"/>
@@ -29,18 +31,19 @@
 		<dependency org="org.apache.openjpa" name="com.springsource.org.apache.openjpa" rev="1.1.0" conf="compile->compile"/>
 		<dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2" conf="compile->runtime"/>
 		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.2.RELEASE" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA" conf="compile->compile"/>
+		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.4.0.GA" conf="compile->compile"/>
+		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->runtime"/>
+                <dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="1.5.3" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.oxm" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->runtime"/>
-		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="compile->compile"/>
-		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA" conf="compile->compile"/>
-		<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.4.0.GA" conf="compile->compile"/>
-		<dependency org="com.oracle.toplink.essentials" name="com.springsource.oracle.toplink.essentials" rev="2.0.0.b41-beta2" conf="compile->compile"/>
 		<!-- test dependencies -->
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.5.0" conf="test->compile" />
-		<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->compile"/>
+		<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="compile->compile"/>
+
+		<!--dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->compile"/-->
 		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="test->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations" rev="3.4.0.GA" conf="test->compile"/>
 
diff --git a/org.springframework.samples.petclinic/petclinic.iml b/org.springframework.samples.petclinic/petclinic.iml
index 91a88e9c63..140a697a60 100644
--- a/org.springframework.samples.petclinic/petclinic.iml
+++ b/org.springframework.samples.petclinic/petclinic.iml
@@ -73,6 +73,18 @@
     <orderEntry type="module" module-name="context" />
     <orderEntry type="module" module-name="jdbc" />
     <orderEntry type="module" module-name="test" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$IVY_CACHE$/org.slf4j/com.springsource.slf4j.jcl/1.5.3/com.springsource.slf4j.jcl-1.5.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$IVY_CACHE$/org.slf4j/com.springsource.slf4j.jcl/1.5.3/com.springsource.slf4j.jcl-sources-1.5.3.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+
     <orderEntry type="module-library">
       <library>
         <CLASSES>