Upgrade to Spring 2.5.2

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

spring-batch-execution/src/test/resources/org/springframework/batch/execution/scope/scope-tests.xml

@@ -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>
-