From 79c86bf13dbb7c19c45c97ce12942257de2995af Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Fri, 25 Sep 2009 08:30:27 +0000
Subject: [PATCH] RESOLVED - issue BATCH-1414: Move schema scripts to a package
 http://jira.springframework.org/browse/BATCH-1414

---
 archetypes/simple-cli/.classpath                              | 4 ++--
 archetypes/simple-cli/src/main/resources/batch.properties     | 2 +-
 .../{ => org/springframework/batch/core}/schema-db2.sql       | 0
 .../{ => org/springframework/batch/core}/schema-derby.sql     | 0
 .../{ => org/springframework/batch/core}/schema-drop-db2.sql  | 0
 .../springframework/batch/core}/schema-drop-derby.sql         | 0
 .../springframework/batch/core}/schema-drop-hsqldb.sql        | 0
 .../springframework/batch/core}/schema-drop-mysql.sql         | 0
 .../springframework/batch/core}/schema-drop-oracle10g.sql     | 0
 .../springframework/batch/core}/schema-drop-postgresql.sql    | 0
 .../{ => org/springframework/batch/core}/schema-hsqldb.sql    | 0
 .../{ => org/springframework/batch/core}/schema-mysql.sql     | 0
 .../{ => org/springframework/batch/core}/schema-oracle10g.sql | 0
 .../springframework/batch/core}/schema-postgresql.sql         | 0
 .../{ => org/springframework/batch/core}/schema-sqlserver.sql | 0
 .../{ => org/springframework/batch/core}/schema-sybase.sql    | 0
 .../batch/core/repository/dao/data-source-context.xml         | 2 +-
 spring-batch-test/.classpath                                  | 4 ++--
 spring-batch-test/src/test/resources/batch-hsql.properties    | 2 +-
 19 files changed, 7 insertions(+), 7 deletions(-)
 rename spring-batch-core/src/main/resources/{ => org/springframework/batch/core}/schema-db2.sql (100%)
 rename spring-batch-core/src/main/resources/{ => org/springframework/batch/core}/schema-derby.sql (100%)
 rename spring-batch-core/src/main/resources/{ => org/springframework/batch/core}/schema-drop-db2.sql (100%)
 rename spring-batch-core/src/main/resources/{ => org/springframework/batch/core}/schema-drop-derby.sql (100%)
 rename spring-batch-core/src/main/resources/{ => org/springframework/batch/core}/schema-drop-hsqldb.sql (100%)
 rename spring-batch-core/src/main/resources/{ => org/springframework/batch/core}/schema-drop-mysql.sql (100%)
 rename spring-batch-core/src/main/resources/{ => org/springframework/batch/core}/schema-drop-oracle10g.sql (100%)
 rename spring-batch-core/src/main/resources/{ => org/springframework/batch/core}/schema-drop-postgresql.sql (100%)
 rename spring-batch-core/src/main/resources/{ => org/springframework/batch/core}/schema-hsqldb.sql (100%)
 rename spring-batch-core/src/main/resources/{ => org/springframework/batch/core}/schema-mysql.sql (100%)
 rename spring-batch-core/src/main/resources/{ => org/springframework/batch/core}/schema-oracle10g.sql (100%)
 rename spring-batch-core/src/main/resources/{ => org/springframework/batch/core}/schema-postgresql.sql (100%)
 rename spring-batch-core/src/main/resources/{ => org/springframework/batch/core}/schema-sqlserver.sql (100%)
 rename spring-batch-core/src/main/resources/{ => org/springframework/batch/core}/schema-sybase.sql (100%)

diff --git a/archetypes/simple-cli/.classpath b/archetypes/simple-cli/.classpath
index 96489ff1c..2daddec39 100644
--- a/archetypes/simple-cli/.classpath
+++ b/archetypes/simple-cli/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/archetypes/simple-cli/src/main/resources/batch.properties b/archetypes/simple-cli/src/main/resources/batch.properties
index 688179a6b..5c55586e4 100644
--- a/archetypes/simple-cli/src/main/resources/batch.properties
+++ b/archetypes/simple-cli/src/main/resources/batch.properties
@@ -8,4 +8,4 @@ batch.jdbc.url=jdbc:hsqldb:mem:testdb;sql.enforce_strict_size=true
 batch.jdbc.user=sa
 batch.jdbc.password=
 batch.schema=
-batch.schema.script=schema-hsqldb.sql
+batch.schema.script=org/springframework/batch/core/schema-hsqldb.sql
diff --git a/spring-batch-core/src/main/resources/schema-db2.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-db2.sql
similarity index 100%
rename from spring-batch-core/src/main/resources/schema-db2.sql
rename to spring-batch-core/src/main/resources/org/springframework/batch/core/schema-db2.sql
diff --git a/spring-batch-core/src/main/resources/schema-derby.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-derby.sql
similarity index 100%
rename from spring-batch-core/src/main/resources/schema-derby.sql
rename to spring-batch-core/src/main/resources/org/springframework/batch/core/schema-derby.sql
diff --git a/spring-batch-core/src/main/resources/schema-drop-db2.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-db2.sql
similarity index 100%
rename from spring-batch-core/src/main/resources/schema-drop-db2.sql
rename to spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-db2.sql
diff --git a/spring-batch-core/src/main/resources/schema-drop-derby.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-derby.sql
similarity index 100%
rename from spring-batch-core/src/main/resources/schema-drop-derby.sql
rename to spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-derby.sql
diff --git a/spring-batch-core/src/main/resources/schema-drop-hsqldb.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-hsqldb.sql
similarity index 100%
rename from spring-batch-core/src/main/resources/schema-drop-hsqldb.sql
rename to spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-hsqldb.sql
diff --git a/spring-batch-core/src/main/resources/schema-drop-mysql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-mysql.sql
similarity index 100%
rename from spring-batch-core/src/main/resources/schema-drop-mysql.sql
rename to spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-mysql.sql
diff --git a/spring-batch-core/src/main/resources/schema-drop-oracle10g.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-oracle10g.sql
similarity index 100%
rename from spring-batch-core/src/main/resources/schema-drop-oracle10g.sql
rename to spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-oracle10g.sql
diff --git a/spring-batch-core/src/main/resources/schema-drop-postgresql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-postgresql.sql
similarity index 100%
rename from spring-batch-core/src/main/resources/schema-drop-postgresql.sql
rename to spring-batch-core/src/main/resources/org/springframework/batch/core/schema-drop-postgresql.sql
diff --git a/spring-batch-core/src/main/resources/schema-hsqldb.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hsqldb.sql
similarity index 100%
rename from spring-batch-core/src/main/resources/schema-hsqldb.sql
rename to spring-batch-core/src/main/resources/org/springframework/batch/core/schema-hsqldb.sql
diff --git a/spring-batch-core/src/main/resources/schema-mysql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mysql.sql
similarity index 100%
rename from spring-batch-core/src/main/resources/schema-mysql.sql
rename to spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mysql.sql
diff --git a/spring-batch-core/src/main/resources/schema-oracle10g.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-oracle10g.sql
similarity index 100%
rename from spring-batch-core/src/main/resources/schema-oracle10g.sql
rename to spring-batch-core/src/main/resources/org/springframework/batch/core/schema-oracle10g.sql
diff --git a/spring-batch-core/src/main/resources/schema-postgresql.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-postgresql.sql
similarity index 100%
rename from spring-batch-core/src/main/resources/schema-postgresql.sql
rename to spring-batch-core/src/main/resources/org/springframework/batch/core/schema-postgresql.sql
diff --git a/spring-batch-core/src/main/resources/schema-sqlserver.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlserver.sql
similarity index 100%
rename from spring-batch-core/src/main/resources/schema-sqlserver.sql
rename to spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sqlserver.sql
diff --git a/spring-batch-core/src/main/resources/schema-sybase.sql b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sybase.sql
similarity index 100%
rename from spring-batch-core/src/main/resources/schema-sybase.sql
rename to spring-batch-core/src/main/resources/org/springframework/batch/core/schema-sybase.sql
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/data-source-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/data-source-context.xml
index ca1a9b254..04d95ab18 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/data-source-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/repository/dao/data-source-context.xml
@@ -5,7 +5,7 @@
 		<property name="dataSource" ref="dataSource" />
 		<property name="initScripts">
 			<list>
-				<value>schema-hsqldb.sql</value>
+				<value>org/springframework/batch/core/schema-hsqldb.sql</value>
 				<value>foo.sql</value>
 			</list>
 		</property>
diff --git a/spring-batch-test/.classpath b/spring-batch-test/.classpath
index 96489ff1c..2daddec39 100755
--- a/spring-batch-test/.classpath
+++ b/spring-batch-test/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/spring-batch-test/src/test/resources/batch-hsql.properties b/spring-batch-test/src/test/resources/batch-hsql.properties
index 7f28d4f4a..9b85b094f 100755
--- a/spring-batch-test/src/test/resources/batch-hsql.properties
+++ b/spring-batch-test/src/test/resources/batch-hsql.properties
@@ -11,7 +11,7 @@ batch.schema=
 batch.jndi.name=
 batch.naming.factory.initial=
 batch.naming.provider.url=
-batch.schema.script=schema-hsqldb.sql
+batch.schema.script=org/springframework/batch/core/schema-hsqldb.sql
 batch.business.schema.script=business-schema-hsqldb.sql
 batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.HsqlMaxValueIncrementer
 batch.lob.handler.class=org.springframework.jdbc.support.lob.DefaultLobHandler