diff --git a/spring-batch-samples/.settings/hsql-server.launch b/spring-batch-samples/.settings/hsql-server.launch
index 7a8a70363..8cccbba21 100644
--- a/spring-batch-samples/.settings/hsql-server.launch
+++ b/spring-batch-samples/.settings/hsql-server.launch
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/spring-batch-samples"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="spring-batch-samples"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
 </listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.hsqldb.Server"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="spring-batch-samples"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dbatch.jdbc.url=jdbc:hsqldb:hsql://localhost:9005/samples"/>
 </launchConfiguration>
diff --git a/spring-batch-samples/src/main/resources/batch.properties b/spring-batch-samples/src/main/resources/batch.properties
index 8fc31f6b8..529be7db0 100644
--- a/spring-batch-samples/src/main/resources/batch.properties
+++ b/spring-batch-samples/src/main/resources/batch.properties
@@ -2,7 +2,8 @@
 #    for HSQLDB:
 batch.jdbc.driver=org.hsqldb.jdbcDriver
 batch.jdbc.url=jdbc:hsqldb:mem:testdb;sql.enforce_strict_size=true
-# use this one for a separate server process (so you can inspect the results)
+# use this one for a separate server process so you can inspect the results
+# (or add it to system properties with -D to override at run time).
 # batch.jdbc.url=jdbc:hsqldb:hsql://localhost:9005/samples
 batch.jdbc.user=sa
 batch.jdbc.password=
@@ -23,11 +24,3 @@ batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.Hs
 # Bean Properties for override
 #   for HSQLDB:
 incrementerParent.columnName=ID
-
-# Switch Dao implementations
-# batch.jobdao=hibernateJobDao
-# batch.stepdao=hibernateStepDao
-# batch.transaction.manager=hibernateTransactionManager
-batch.jobdao=sqlJobDao
-batch.stepdao=sqlStepDao
-batch.transaction.manager=sqlTransactionManager
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 73f9cfe94..c790b12c6 100644
--- a/spring-batch-samples/src/main/resources/data-source-context.xml
+++ b/spring-batch-samples/src/main/resources/data-source-context.xml
@@ -28,13 +28,14 @@
 			<bean class="java.lang.System" factory-method="getProperties"/>
 		</property>
 		<property name="ignoreInvalidKeys" value="true" />
-		<property name="order" value="1"/>
+		<property name="order" value="2"/>
 	</bean>
 
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="location" value="classpath:batch.properties" />
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
 		<property name="ignoreUnresolvablePlaceholders" value="false" />
-		<property name="order" value="2"/>
+		<property name="order" value="1"/>
 	</bean>
 
 	<bean id="incrementerParent" class="${batch.database.incrementer.class}" abstract="true">