From c0b90bf9ef66bb2fdd051a3f0d8c6f6cee7e6ac3 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Wed, 25 Nov 2009 19:27:08 +0000
Subject: [PATCH] SPR-6447 + move jdbc scripts from META-INF into /resources

---
 pom.xml                                                     | 4 +++-
 .../{webapp/META-INF => resources}/hsqldb/dropTables.txt    | 0
 src/main/{webapp/META-INF => resources}/hsqldb/initDB.txt   | 0
 .../{webapp/META-INF => resources}/hsqldb/populateDB.txt    | 0
 src/main/resources/jdbc.properties                          | 6 +++---
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename src/main/{webapp/META-INF => resources}/hsqldb/dropTables.txt (100%)
 rename src/main/{webapp/META-INF => resources}/hsqldb/initDB.txt (100%)
 rename src/main/{webapp/META-INF => resources}/hsqldb/populateDB.txt (100%)

diff --git a/pom.xml b/pom.xml
index d9b79897e..09e4330cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.samples</groupId>
-	<artifactId>org.springframework.samples.petclinic</artifactId>
+	<artifactId>petclinic-classic</artifactId>
 	<name>petclinic-classic</name>
 	<packaging>war</packaging>
 	<version>1.0.0-SNAPSHOT</version>
@@ -43,6 +43,7 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
 			<version>1.2.0</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
@@ -68,6 +69,7 @@
 			<groupId>org.apache.taglibs</groupId>
 			<artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
 			<version>1.1.2</version>
+			<scope>provided</scope>
 		</dependency>		
 		<dependency>
 			<groupId>org.aspectj</groupId>
diff --git a/src/main/webapp/META-INF/hsqldb/dropTables.txt b/src/main/resources/hsqldb/dropTables.txt
similarity index 100%
rename from src/main/webapp/META-INF/hsqldb/dropTables.txt
rename to src/main/resources/hsqldb/dropTables.txt
diff --git a/src/main/webapp/META-INF/hsqldb/initDB.txt b/src/main/resources/hsqldb/initDB.txt
similarity index 100%
rename from src/main/webapp/META-INF/hsqldb/initDB.txt
rename to src/main/resources/hsqldb/initDB.txt
diff --git a/src/main/webapp/META-INF/hsqldb/populateDB.txt b/src/main/resources/hsqldb/populateDB.txt
similarity index 100%
rename from src/main/webapp/META-INF/hsqldb/populateDB.txt
rename to src/main/resources/hsqldb/populateDB.txt
diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties
index e039cdf1b..47537f9cd 100644
--- a/src/main/resources/jdbc.properties
+++ b/src/main/resources/jdbc.properties
@@ -23,9 +23,9 @@ jdbc.password=
 
 # Properties that control the population of schema and data for a new data source
 jdbc.populate=true
-jdbc.schemaLocation=classpath:/META-INF/hsqldb/initDB.txt
-jdbc.dataLocation=classpath:/META-INF/hsqldb/populateDB.txt
-jdbc.dropLocation=classpath:/META-INF/hsqldb/dropTables.txt
+jdbc.schemaLocation=classpath:hsqldb/initDB.txt
+jdbc.dataLocation=classpath:hsqldb/populateDB.txt
+jdbc.dropLocation=classpath:hsqldb/dropTables.txt
 
 # Property that determines which Hibernate dialect to use
 # (only applied with "applicationContext-hibernate.xml")