diff --git a/spring-batch-samples/src/main/resources/batch.properties b/spring-batch-samples/src/main/resources/batch.properties
index d787e6f81..8fc31f6b8 100644
--- a/spring-batch-samples/src/main/resources/batch.properties
+++ b/spring-batch-samples/src/main/resources/batch.properties
@@ -11,11 +11,14 @@ batch.jndi.name=
 batch.naming.factory.initial=
 batch.naming.provider.url=
 batch.database.vendor=HSQLDB
+batch.schema.script=schema-hsqldb.sql
+batch.business.schema.script=business-schema-hsqldb.sql
 batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.HsqlMaxValueIncrementer
 
 # Other platforms:
 # org.springframework.jdbc.support.incrementer.DB2SequenceMaxValueIncrementer
 # org.springframework.jdbc.support.incrementer.PostgreSQLSequenceMaxValueIncrementer
+# batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.DerbyMaxValueIncrementer
 
 # Bean Properties for override
 #   for HSQLDB:
diff --git a/spring-batch-samples/src/main/resources/data-source-context-init.xml b/spring-batch-samples/src/main/resources/data-source-context-init.xml
index aabd28239..5e43a36e4 100644
--- a/spring-batch-samples/src/main/resources/data-source-context-init.xml
+++ b/spring-batch-samples/src/main/resources/data-source-context-init.xml
@@ -7,8 +7,8 @@
 		<property name="dataSource" ref="dataSource"/>
 		<property name="initScripts">
 			<list>
-				<value>schema-hsqldb.sql</value>
-				<value>business-schema-hsqldb.sql</value>
+				<value>${batch.schema.script}</value>
+				<value>${batch.business.schema.script}</value>
 			</list>
 		</property>
 	</bean>
diff --git a/spring-batch-samples/src/main/resources/data-source-context.xml b/spring-batch-samples/src/main/resources/data-source-context.xml
index ecd8fa052..a4b3e627f 100644
--- a/spring-batch-samples/src/main/resources/data-source-context.xml
+++ b/spring-batch-samples/src/main/resources/data-source-context.xml
@@ -13,7 +13,8 @@
 		<property name="url" value="${batch.jdbc.url}" />
 		<property name="username" value="${batch.jdbc.user}" />
 		<property name="password" value="${batch.jdbc.password}" />
-	</bean>
+	</bean>
+	<!-- bean id="dataSource" class="test.jdbc.datasource.DerbyDataSourceFactoryBean"/-->
 
 	<bean id="sqlTransactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager" lazy-init="true">
 		<property name="dataSource" ref="dataSource" />