diff --git a/spring-batch-execution/.springBeans b/spring-batch-execution/.springBeans
index c12f307ee..d3af34221 100644
--- a/spring-batch-execution/.springBeans
+++ b/spring-batch-execution/.springBeans
@@ -1,78 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
-	<version>1</version>
-	<pluginVersion><![CDATA[2.0.4.v200802202100]]></pluginVersion>
-	<configSuffixes>
-		<configSuffix><![CDATA[xml]]></configSuffix>
-	</configSuffixes>
-	<enableImports><![CDATA[true]]></enableImports>
-	<configs>
-		<config>src/test/resources/simple-container-definition.xml</config>
-		<config>src/test/resources/job-configuration.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/test-context.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/scope/scope-tests.xml</config>
-		<config>src/test/resources/beanRefContext.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoDb2.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoDerby.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoHsql.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoMissingDataSource.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoMySql.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoOk.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoOracle.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoPostgres.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/StepMissingItemReader.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/StepMissingItemWriter.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/StepMissingTransactionManager.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/StepOk.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/StepRerunAlways.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/StepRerunIncomplete.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/StepRerunNever.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/StepSpecificTransactionManager.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepMissingTasklet.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepOk.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepRerunAlways.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepRerunIncomplete.xml</config>
-		<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepRerunNever.xml</config>
-	</configs>
-	<configSets>
-		<configSet>
-			<name><![CDATA[bootstrap]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/test/resources/job-configuration.xml</config>
-				<config>src/test/resources/simple-container-definition.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[sqltest]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml</config>
-				<config>src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[hibernatetest]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name><![CDATA[testJob]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml</config>
-				<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml</config>
-			</configs>
-		</configSet>
-	</configSets>
-</beansProjectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.0.3.v200802061800]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[true]]></enableImports>
+	<configs>
+		<config>src/test/resources/simple-container-definition.xml</config>
+		<config>src/test/resources/job-configuration.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/test-context.xml</config>
+		<config>src/test/resources/beanRefContext.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoDb2.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoDerby.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoHsql.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoMissingDataSource.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoMySql.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoOk.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoOracle.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoPostgres.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepMissingItemReader.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepMissingItemWriter.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepMissingTransactionManager.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepOk.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepRerunAlways.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepRerunIncomplete.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepRerunNever.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/StepSpecificTransactionManager.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepMissingTasklet.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepOk.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepRerunAlways.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepRerunIncomplete.xml</config>
+		<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepRerunNever.xml</config>
+	</configs>
+	<configSets>
+		<configSet>
+			<name><![CDATA[bootstrap]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/test/resources/job-configuration.xml</config>
+				<config>src/test/resources/simple-container-definition.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[sqltest]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml</config>
+				<config>src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[hibernatetest]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[testJob]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml</config>
+				<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml</config>
+			</configs>
+		</configSet>
+	</configSets>
+</beansProjectDescription>
diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java
index 87c0bcd4b..0c85d19df 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java
@@ -187,6 +187,15 @@ public class StepExecutionProxyResource extends StepListenerSupport implements R
 		return delegate.isOpen();
 	}
 
+	/**
+	 * @see org.springframework.core.io.Resource#isReadable()
+	 */
+	public boolean isReadable() {
+		Assert.state(delegate != null, "The delegate resource has not been initialised. "
+				+ "Remember to register this object as a StepListener.");
+		return delegate.isReadable();
+	}
+
 	/**
 	 * Public setter for the {@link JobParametersFactory} used to translate
 	 * {@link JobParameters} into {@link Properties}. Defaults to a
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/scope/scope-tests.xml b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/scope/scope-tests.xml
deleted file mode 100644
index 28b097ac0..000000000
--- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/scope/scope-tests.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
-
-	<bean class="org.springframework.batch.execution.scope.StepScope" />
-
-	<bean id="bean"
-		class="org.springframework.batch.execution.scope.StepContextAwareStepScopeTests$TestBean"
-		scope="step" destroy-method="close">
-		<property name="name" value="foo" />
-	</bean>
-
-	<bean id="inner"
-		class="org.springframework.batch.execution.scope.StepContextAwareStepScopeTests$TestBean"
-		scope="step">
-		<property name="child">
-			<bean
-				class="org.springframework.batch.execution.scope.StepContextAwareStepScopeTests$TestBean"
-				destroy-method="close" scope="step">
-				<property name="name" value="bar" />
-			</bean>
-		</property>
-		<property name="name" value="foo" />
-	</bean>
-
-	<bean id="aware"
-		class="org.springframework.batch.execution.scope.StepContextAwareStepScopeTests$TestBeanAware"
-		scope="step">
-		<property name="name" value="bar" />
-	</bean>
-
-	<bean id="proxy"
-		class="org.springframework.batch.execution.scope.StepContextAwareStepScopeTests$TestBeanAware"
-		scope="step">
-		<aop:scoped-proxy/>
-		<property name="name" value="spam" />
-	</bean>
-
-</beans>
-
diff --git a/spring-batch-infrastructure/.classpath b/spring-batch-infrastructure/.classpath
index 623ecbc7a..bf5d1cf16 100644
--- a/spring-batch-infrastructure/.classpath
+++ b/spring-batch-infrastructure/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
-	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**/*.java" including="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry including="**/*.java" kind="src" output="bin/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**/*.java" including="**" kind="src" output="bin/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/spring-batch-infrastructure/.settings/org.eclipse.jdt.core.prefs b/spring-batch-infrastructure/.settings/org.eclipse.jdt.core.prefs
index 3e85e6782..d60e8dcbb 100644
--- a/spring-batch-infrastructure/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-batch-infrastructure/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,8 @@
-#Mon Dec 10 14:44:35 EST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+#Fri Feb 29 13:52:09 GMT 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.4
diff --git a/spring-batch-infrastructure/.settings/org.eclipse.jdt.ui.prefs b/spring-batch-infrastructure/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 19781f17e..000000000
--- a/spring-batch-infrastructure/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Aug 15 22:31:17 BST 2007
-eclipse.preferences.version=1
-internal.default.compliance=user
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemWriter.java
index c06ac56bf..f237e7bbc 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemWriter.java
@@ -42,8 +42,7 @@ public class PropertyExtractingDelegatingItemWriter extends AbstractMethodInvoki
 	 */
 	public void write(Object item) throws Exception {
 		// helper for extracting property values from a bean
-		BeanWrapper beanWrapper = new BeanWrapperImpl();
-		beanWrapper.setWrappedInstance(item);
+		BeanWrapper beanWrapper = new BeanWrapperImpl(item);
 		
 		Object[] methodArguments = new Object[fieldsUsedAsTargetMethodArguments.length];
 		for (int i = 0; i < fieldsUsedAsTargetMethodArguments.length; i++) {
diff --git a/spring-batch-samples/.classpath b/spring-batch-samples/.classpath
index 6ceeb8b67..b6d9ce7c7 100644
--- a/spring-batch-samples/.classpath
+++ b/spring-batch-samples/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
-	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry including="**/*.java" kind="src" output="bin/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**/*.java" including="**" kind="src" path="src/main/resources"/>
-	<classpathentry excluding="**/*.java" including="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry excluding="**/*.java" including="**" kind="src" output="bin/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>