diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml index 4106e6f2f..f0c25a3de 100644 --- a/archetypes/simple-cli/pom.xml +++ b/archetypes/simple-cli/pom.xml @@ -87,10 +87,17 @@ commons-dbcp 1.2.2 + + org.slf4j + slf4j-log4j12 + 1.5.8 + true + log4j log4j 1.2.14 + true commons-io diff --git a/spring-batch-core/.classpath b/spring-batch-core/.classpath index bc2bc4663..3314635d4 100644 --- a/spring-batch-core/.classpath +++ b/spring-batch-core/.classpath @@ -1,15 +1,11 @@ - - - - + + + + - - - - - + diff --git a/spring-batch-core/.project b/spring-batch-core/.project index 75897d876..48beb3161 100644 --- a/spring-batch-core/.project +++ b/spring-batch-core/.project @@ -1,31 +1,34 @@ - spring-batch-core - Core domain for batch processing, expressing a domain of Jobs, Steps, Chunks, etc. + spring-batch-core + Core domain for batch processing, expressing a domain of Jobs, Steps, Chunks, etc. - - spring-batch-infrastructure - - - - org.eclipse.wst.common.project.facet.core.builder - - - - org.eclipse.jdt.core.javabuilder - - - - org.springframework.ide.eclipse.core.springbuilder - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.springframework.ide.eclipse.core.springnature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.maven.ide.eclipse.maven2Nature - - \ No newline at end of file + + spring-batch-infrastructure + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.springframework.ide.eclipse.core.springbuilder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.springframework.ide.eclipse.core.springnature + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + org.maven.ide.eclipse.maven2Nature + + diff --git a/spring-batch-core/.settings/org.maven.ide.eclipse.prefs b/spring-batch-core/.settings/org.maven.ide.eclipse.prefs index c77475b58..2c8a54873 100644 --- a/spring-batch-core/.settings/org.maven.ide.eclipse.prefs +++ b/spring-batch-core/.settings/org.maven.ide.eclipse.prefs @@ -1,9 +1,9 @@ -#Thu Jul 09 13:28:42 BST 2009 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 +#Thu Nov 12 12:13:53 GMT 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml index 0314d3ed2..85a5e8020 100644 --- a/spring-batch-core/pom.xml +++ b/spring-batch-core/pom.xml @@ -127,6 +127,11 @@ org.springframework spring-tx + + org.slf4j + slf4j-log4j12 + true + log4j log4j diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/MapJobExplorerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/MapJobExplorerFactoryBean.java index ed43b2c38..19297d842 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/MapJobExplorerFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/MapJobExplorerFactoryBean.java @@ -52,12 +52,21 @@ public class MapJobExplorerFactoryBean extends AbstractJobExplorerFactoryBean im public MapJobExplorerFactoryBean() { } + /** + * The repository factory that can be used to create daos for the explorer. + * + * @param repositoryFactory a {@link MapJobExplorerFactoryBean} + */ + public void setRepositoryFactory(MapJobRepositoryFactoryBean repositoryFactory) { + this.repositoryFactory = repositoryFactory; + } + /** * @throws Exception * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ public void afterPropertiesSet() throws Exception { - Assert.state(repositoryFactory!=null, "A MapJobExplorerFactoryBean must be provided"); + Assert.state(repositoryFactory != null, "A MapJobExplorerFactoryBean must be provided"); repositoryFactory.afterPropertiesSet(); } diff --git a/spring-batch-infrastructure-tests/pom.xml b/spring-batch-infrastructure-tests/pom.xml index 013d0c05a..94aa93ae2 100644 --- a/spring-batch-infrastructure-tests/pom.xml +++ b/spring-batch-infrastructure-tests/pom.xml @@ -1,171 +1,172 @@ - - 4.0.0 - spring-batch-infrastructure-tests - Infrastructure Tests + + 4.0.0 + spring-batch-infrastructure-tests + Infrastructure Tests - Integration tests for the Spring Batch Infrastructure + Integration tests for the Spring Batch Infrastructure - - org.springframework.batch - spring-batch-parent - 2.1.0.CI-SNAPSHOT - ../spring-batch-parent - - - - default - - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - - - - test - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - - - - - - - - org.springframework.batch - spring-batch-infrastructure - 2.1.0.CI-SNAPSHOT - - - hsqldb - hsqldb - - - commons-io - commons-io - test - - - commons-lang - commons-lang - test - - - org.apache.derby - derby - - - org.apache.activemq - activemq-core - 5.1.0 - test - - - junit - junit - - - org.easymock - easymock - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - - - org.apache.geronimo.specs - geronimo-j2ee-management_1.1_spec - 1.0.1 - test - - - xmlunit - xmlunit - 1.2 - test - - - org.codehaus.castor - castor - 1.2 - test - - - log4j - log4j - test - - - xerces - xercesImpl - 2.8.1 - test - - - com.thoughtworks.xstream - xstream - test - - - org.codehaus.woodstox - woodstox-core-asl - test - - - org.springframework.ws - spring-oxm - test - - - org.springframework - spring-jdbc - test - - - org.springframework - spring-jms - true - - - org.springframework - spring-test - test - - - org.springframework - spring-tx - - - org.springframework - spring-aop - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - junit:junit - - - - - + + org.springframework.batch + spring-batch-parent + 2.1.0.CI-SNAPSHOT + ../spring-batch-parent + + + + default + + true + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + + + test + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + + + + + + + + org.springframework.batch + spring-batch-infrastructure + 2.1.0.CI-SNAPSHOT + + + hsqldb + hsqldb + + + commons-io + commons-io + test + + + commons-lang + commons-lang + test + + + org.apache.derby + derby + + + org.apache.activemq + activemq-core + 5.1.0 + test + + + junit + junit + + + org.easymock + easymock + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + + + org.apache.geronimo.specs + geronimo-j2ee-management_1.1_spec + 1.0.1 + test + + + xmlunit + xmlunit + 1.2 + test + + + org.codehaus.castor + castor + 1.2 + test + + + log4j + log4j + test + + + xerces + xercesImpl + 2.8.1 + test + + + com.thoughtworks.xstream + xstream + test + + + org.codehaus.woodstox + woodstox-core-asl + test + + + org.springframework.ws + spring-oxm + test + + + org.springframework + spring-jdbc + test + + + org.springframework + spring-jms + true + + + org.springframework + spring-test + test + + + org.springframework + spring-tx + + + org.springframework + spring-aop + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + + + + diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml index 848d720ff..425c8a585 100644 --- a/spring-batch-infrastructure/pom.xml +++ b/spring-batch-infrastructure/pom.xml @@ -70,13 +70,14 @@ true - commons-logging - commons-logging + org.slf4j + slf4j-log4j12 + true log4j log4j - true + test commons-lang @@ -101,7 +102,7 @@ org.hibernate - hibernate + hibernate-core true diff --git a/spring-batch-integration/.classpath b/spring-batch-integration/.classpath index 5eadf6da4..2daddec39 100644 --- a/spring-batch-integration/.classpath +++ b/spring-batch-integration/.classpath @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/spring-batch-integration/pom.xml b/spring-batch-integration/pom.xml index 54cefca84..11d2e31ce 100644 --- a/spring-batch-integration/pom.xml +++ b/spring-batch-integration/pom.xml @@ -64,9 +64,15 @@ junit junit + + org.slf4j + slf4j-log4j12 + true + log4j log4j + true org.aspectj diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/VanillaIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/VanillaIntegrationTests-context.xml index 8af3d7dca..52006b776 100644 --- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/VanillaIntegrationTests-context.xml +++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/VanillaIntegrationTests-context.xml @@ -42,7 +42,9 @@ class="org.springframework.batch.integration.partition.BeanFactoryStepLocator" /> + class="org.springframework.batch.core.explore.support.MapJobExplorerFactoryBean"> + + diff --git a/spring-batch-integration/src/test/resources/simple-job-launcher-context.xml b/spring-batch-integration/src/test/resources/simple-job-launcher-context.xml index 4433ae212..1f75530a3 100644 --- a/spring-batch-integration/src/test/resources/simple-job-launcher-context.xml +++ b/spring-batch-integration/src/test/resources/simple-job-launcher-context.xml @@ -57,4 +57,5 @@ + \ No newline at end of file diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml index 06be74e57..8d3dabbc1 100644 --- a/spring-batch-parent/pom.xml +++ b/spring-batch-parent/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.springframework.batch spring-batch-parent @@ -296,8 +297,8 @@ org.hibernate - hibernate - 3.2.6.ga + hibernate-core + 3.3.2.GA true @@ -328,6 +329,10 @@ edu.oswego.cs.concurrent edu.oswego.cs.dl.util.concurrent + + org.hibernate + hibernate + @@ -335,6 +340,12 @@ hibernate-annotations 3.3.1.GA true + + + org.hibernate + hibernate + + cglib @@ -343,9 +354,14 @@ true - commons-logging - commons-logging - 1.1.1 + org.slf4j + slf4j-api + 1.5.8 + + + org.slf4j + slf4j-log4j12 + 1.5.8 commons-lang diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml index b95ec135b..8f3a77f09 100644 --- a/spring-batch-samples/pom.xml +++ b/spring-batch-samples/pom.xml @@ -128,10 +128,15 @@ 1.2 test + + org.slf4j + slf4j-log4j12 + true + log4j log4j - true + test org.codehaus.groovy @@ -141,7 +146,7 @@ org.hibernate - hibernate + hibernate-core org.hibernate