Upgrade to Spring 2.5.2
This commit is contained in:
dsyer
@@ -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>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user