Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring 2.5.2

Browse Source
This commit is contained in:
dsyer
2008-02-29 14:05:43 +00:00
parent 3c981017cd
commit fca1e65bdd
8 changed files with 99 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
spring-batch-execution/.springBeans
View File

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

9
spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java
View File

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

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

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

6
spring-batch-infrastructure/.classpath
View File

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

10
spring-batch-infrastructure/.settings/org.eclipse.jdt.core.prefs
View File

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

3
spring-batch-infrastructure/.settings/org.eclipse.jdt.ui.prefs
View File

@@ -1,3 +0,0 @@
#Wed Aug 15 22:31:17 BST 2007
eclipse.preferences.version=1
internal.default.compliance=user

3
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemWriter.java
View File

@@ -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++) {

6
spring-batch-samples/.classpath
View File

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