diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 1c01917a9..9fc8fd04b 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -18,7 +18,7 @@ org.springframework.batch org.springframework.batch - 2.0.1.CI-SNAPSHOT + 2.0.0.CI-SNAPSHOT .. diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml index bf44bf5d8..29f9c251f 100644 --- a/archetypes/simple-cli/pom.xml +++ b/archetypes/simple-cli/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.springframework.batch org.springframework.batch.archetype.simple.cli - 2.0.1.CI-SNAPSHOT + 2.0.0.CI-SNAPSHOT jar Commandline http://www.springframework.org/spring-batch/archetypes/simple-cli-archetype diff --git a/pom.xml b/pom.xml index a7d5aefcd..9919353a6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.springframework.batch org.springframework.batch @@ -7,7 +8,7 @@ - 2.0.1.CI-SNAPSHOT + 2.0.0.CI-SNAPSHOT pom spring-batch-parent @@ -15,7 +16,7 @@ spring-batch-core spring-batch-test - http://www.springframework.org/spring-batch + http://static.springframework.org/spring-batch SpringSource http://www.springsource.com @@ -65,13 +66,6 @@ - - maven-javadoc-plugin - - - org.apache.maven.plugins - maven-source-plugin - maven-assembly-plugin false @@ -138,7 +132,9 @@ src/site/docbook/reference/ src/docbkx/resources/images/ - + pre-site @@ -185,7 +181,10 @@ runtime - + org.apache.xmlgraphics fop 0.93 @@ -251,37 +250,45 @@ - + - + - + - + - + - + - + - + @@ -342,11 +349,12 @@ maven-site-plugin - 2.0-beta-7-SNAPSHOT + 2.0-beta-8-SNAPSHOT @@ -446,84 +454,6 @@ - - maven-javadoc-plugin - - - javadoc - package - - jar - - - - repost - site - - javadoc - - - - - - http://java.sun.com/j2ee/1.4/docs/api - http://java.sun.com/j2se/1.5.0/docs/api - http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/ - http://jakarta.apache.org/commons/dbcp/apidocs/ - http://jakarta.apache.org/commons/fileupload/apidocs/ - http://jakarta.apache.org/commons/httpclient/apidocs/ - http://jakarta.apache.org/commons/pool/apidocs/ - http://jakarta.apache.org/commons/logging/apidocs/ - http://junit.sourceforge.net/javadoc/ - http://logging.apache.org/log4j/docs/api/ - http://jakarta.apache.org/regexp/apidocs/ - http://jakarta.apache.org/velocity/api/ - http://static.springframework.org/spring/docs/2.5.x/api/ - http://static.springframework.org/spring-batch/apidocs/ - http://static.springframework.org/spring-ws/site/apidocs/ - -
- - - -]]> -
- - - - -]]> - - true - *.batch.sample,*.batch.container,example,test - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - @@ -549,6 +479,53 @@ + + true + true + + http://java.sun.com/j2ee/1.4/docs/api + http://java.sun.com/j2se/1.5.0/docs/api + http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/ + http://jakarta.apache.org/commons/dbcp/apidocs/ + http://jakarta.apache.org/commons/fileupload/apidocs/ + http://jakarta.apache.org/commons/httpclient/apidocs/ + http://jakarta.apache.org/commons/pool/apidocs/ + http://jakarta.apache.org/commons/logging/apidocs/ + http://junit.sourceforge.net/javadoc/ + http://logging.apache.org/log4j/docs/api/ + http://jakarta.apache.org/regexp/apidocs/ + http://jakarta.apache.org/velocity/api/ + http://static.springframework.org/spring/docs/2.5.x/api/ + http://static.springframework.org/spring-batch/apidocs/ + http://static.springframework.org/spring-ws/site/apidocs/ + +
+ + + +]]> +
+ + + + +]]> + + org.apache.maven.plugins @@ -613,4 +590,4 @@ - \ No newline at end of file + diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml index 447388a1c..f0cef18cb 100644 --- a/spring-batch-core/pom.xml +++ b/spring-batch-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.batch org.springframework.batch.parent - 2.0.1.CI-SNAPSHOT + 2.0.0.CI-SNAPSHOT ../spring-batch-parent diff --git a/spring-batch-core/src/main/resources/schema-db2.sql b/spring-batch-core/src/main/resources/schema-db2.sql index 05ba9cf10..2617dbd0d 100644 --- a/spring-batch-core/src/main/resources/schema-db2.sql +++ b/spring-batch-core/src/main/resources/schema-db2.sql @@ -4,7 +4,8 @@ CREATE TABLE BATCH_JOB_INSTANCE ( JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY , VERSION BIGINT , JOB_NAME VARCHAR(100) NOT NULL, - JOB_KEY VARCHAR(2500) + JOB_KEY VARCHAR(2500) , + constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY) ) ; CREATE TABLE BATCH_JOB_EXECUTION ( diff --git a/spring-batch-core/src/main/resources/schema-derby.sql b/spring-batch-core/src/main/resources/schema-derby.sql index c677cdfa8..6386fc4fb 100644 --- a/spring-batch-core/src/main/resources/schema-derby.sql +++ b/spring-batch-core/src/main/resources/schema-derby.sql @@ -4,7 +4,8 @@ CREATE TABLE BATCH_JOB_INSTANCE ( JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, VERSION BIGINT , JOB_NAME VARCHAR(100) NOT NULL, - JOB_KEY VARCHAR(2500) + JOB_KEY VARCHAR(2500) , + constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY) ) ; CREATE TABLE BATCH_JOB_EXECUTION ( diff --git a/spring-batch-core/src/main/resources/schema-drop-db2.sql b/spring-batch-core/src/main/resources/schema-drop-db2.sql index d65eaf7d1..a45e3647c 100644 --- a/spring-batch-core/src/main/resources/schema-drop-db2.sql +++ b/spring-batch-core/src/main/resources/schema-drop-db2.sql @@ -1,5 +1,5 @@ --- Autogenerated: do not edit this file - +-- Autogenerated: do not edit this file + DROP TABLE BATCH_STEP_EXECUTION_CONTEXT ; DROP TABLE BATCH_JOB_EXECUTION_CONTEXT ; DROP TABLE BATCH_STEP_EXECUTION ; diff --git a/spring-batch-core/src/main/resources/schema-drop-derby.sql b/spring-batch-core/src/main/resources/schema-drop-derby.sql index eca911f1d..68ffb0214 100644 --- a/spring-batch-core/src/main/resources/schema-drop-derby.sql +++ b/spring-batch-core/src/main/resources/schema-drop-derby.sql @@ -1,5 +1,5 @@ --- Autogenerated: do not edit this file - +-- Autogenerated: do not edit this file + DROP TABLE BATCH_STEP_EXECUTION_CONTEXT ; DROP TABLE BATCH_JOB_EXECUTION_CONTEXT ; DROP TABLE BATCH_STEP_EXECUTION ; diff --git a/spring-batch-core/src/main/resources/schema-drop-hsqldb.sql b/spring-batch-core/src/main/resources/schema-drop-hsqldb.sql index 7caf67071..34ebe189b 100644 --- a/spring-batch-core/src/main/resources/schema-drop-hsqldb.sql +++ b/spring-batch-core/src/main/resources/schema-drop-hsqldb.sql @@ -1,5 +1,5 @@ --- Autogenerated: do not edit this file - +-- Autogenerated: do not edit this file + DROP TABLE BATCH_STEP_EXECUTION_CONTEXT IF EXISTS; DROP TABLE BATCH_JOB_EXECUTION_CONTEXT IF EXISTS; DROP TABLE BATCH_STEP_EXECUTION IF EXISTS; diff --git a/spring-batch-core/src/main/resources/schema-drop-mysql.sql b/spring-batch-core/src/main/resources/schema-drop-mysql.sql index a4dd1d886..ae2520194 100644 --- a/spring-batch-core/src/main/resources/schema-drop-mysql.sql +++ b/spring-batch-core/src/main/resources/schema-drop-mysql.sql @@ -1,5 +1,5 @@ --- Autogenerated: do not edit this file - +-- Autogenerated: do not edit this file + DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_CONTEXT ; DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_CONTEXT ; DROP TABLE IF EXISTS BATCH_STEP_EXECUTION ; diff --git a/spring-batch-core/src/main/resources/schema-drop-oracle10g.sql b/spring-batch-core/src/main/resources/schema-drop-oracle10g.sql index d65eaf7d1..a45e3647c 100644 --- a/spring-batch-core/src/main/resources/schema-drop-oracle10g.sql +++ b/spring-batch-core/src/main/resources/schema-drop-oracle10g.sql @@ -1,5 +1,5 @@ --- Autogenerated: do not edit this file - +-- Autogenerated: do not edit this file + DROP TABLE BATCH_STEP_EXECUTION_CONTEXT ; DROP TABLE BATCH_JOB_EXECUTION_CONTEXT ; DROP TABLE BATCH_STEP_EXECUTION ; diff --git a/spring-batch-core/src/main/resources/schema-drop-postgresql.sql b/spring-batch-core/src/main/resources/schema-drop-postgresql.sql index d65eaf7d1..a45e3647c 100644 --- a/spring-batch-core/src/main/resources/schema-drop-postgresql.sql +++ b/spring-batch-core/src/main/resources/schema-drop-postgresql.sql @@ -1,5 +1,5 @@ --- Autogenerated: do not edit this file - +-- Autogenerated: do not edit this file + DROP TABLE BATCH_STEP_EXECUTION_CONTEXT ; DROP TABLE BATCH_JOB_EXECUTION_CONTEXT ; DROP TABLE BATCH_STEP_EXECUTION ; diff --git a/spring-batch-core/src/main/resources/schema-hsqldb.sql b/spring-batch-core/src/main/resources/schema-hsqldb.sql index bac2f5bde..0c2b4866f 100644 --- a/spring-batch-core/src/main/resources/schema-hsqldb.sql +++ b/spring-batch-core/src/main/resources/schema-hsqldb.sql @@ -4,7 +4,8 @@ CREATE TABLE BATCH_JOB_INSTANCE ( JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY , VERSION BIGINT , JOB_NAME VARCHAR(100) NOT NULL, - JOB_KEY VARCHAR(2500) + JOB_KEY VARCHAR(2500) , + constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY) ) ; CREATE TABLE BATCH_JOB_EXECUTION ( diff --git a/spring-batch-core/src/main/resources/schema-mysql.sql b/spring-batch-core/src/main/resources/schema-mysql.sql index 3dfb51f73..dd3f6fe8a 100644 --- a/spring-batch-core/src/main/resources/schema-mysql.sql +++ b/spring-batch-core/src/main/resources/schema-mysql.sql @@ -4,7 +4,8 @@ CREATE TABLE BATCH_JOB_INSTANCE ( JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY , VERSION BIGINT , JOB_NAME VARCHAR(100) NOT NULL, - JOB_KEY VARCHAR(2500) + JOB_KEY VARCHAR(2500) , + constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY) ) ENGINE=InnoDB; CREATE TABLE BATCH_JOB_EXECUTION ( diff --git a/spring-batch-core/src/main/resources/schema-oracle10g.sql b/spring-batch-core/src/main/resources/schema-oracle10g.sql index 2898dc4f3..50634b4ac 100644 --- a/spring-batch-core/src/main/resources/schema-oracle10g.sql +++ b/spring-batch-core/src/main/resources/schema-oracle10g.sql @@ -4,7 +4,8 @@ CREATE TABLE BATCH_JOB_INSTANCE ( JOB_INSTANCE_ID NUMBER(19,0) NOT NULL PRIMARY KEY , VERSION NUMBER(19,0) , JOB_NAME VARCHAR2(100) NOT NULL, - JOB_KEY VARCHAR2(2500) + JOB_KEY VARCHAR2(2500) , + constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY) ) ; CREATE TABLE BATCH_JOB_EXECUTION ( diff --git a/spring-batch-core/src/main/resources/schema-postgresql.sql b/spring-batch-core/src/main/resources/schema-postgresql.sql index 826e5e233..70f6d2c37 100644 --- a/spring-batch-core/src/main/resources/schema-postgresql.sql +++ b/spring-batch-core/src/main/resources/schema-postgresql.sql @@ -4,7 +4,8 @@ CREATE TABLE BATCH_JOB_INSTANCE ( JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY , VERSION BIGINT , JOB_NAME VARCHAR(100) NOT NULL, - JOB_KEY VARCHAR(2500) + JOB_KEY VARCHAR(2500) , + constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY) ) ; CREATE TABLE BATCH_JOB_EXECUTION ( diff --git a/spring-batch-core/src/main/resources/schema-sqlserver.sql b/spring-batch-core/src/main/resources/schema-sqlserver.sql index cffa2e5e4..2d1312234 100644 --- a/spring-batch-core/src/main/resources/schema-sqlserver.sql +++ b/spring-batch-core/src/main/resources/schema-sqlserver.sql @@ -4,7 +4,8 @@ CREATE TABLE BATCH_JOB_INSTANCE ( JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY , VERSION BIGINT , JOB_NAME VARCHAR(100) NOT NULL, - JOB_KEY VARCHAR(2500) + JOB_KEY VARCHAR(2500) , + constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY) ) ; CREATE TABLE BATCH_JOB_EXECUTION ( diff --git a/spring-batch-core/src/main/resources/schema-sybase.sql b/spring-batch-core/src/main/resources/schema-sybase.sql index e4b15699a..dda071b92 100644 --- a/spring-batch-core/src/main/resources/schema-sybase.sql +++ b/spring-batch-core/src/main/resources/schema-sybase.sql @@ -4,7 +4,8 @@ CREATE TABLE BATCH_JOB_INSTANCE ( JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY , VERSION BIGINT NULL, JOB_NAME VARCHAR(100) NOT NULL, - JOB_KEY VARCHAR(2500) NULL + JOB_KEY VARCHAR(2500) NULL, + constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY) ) ; CREATE TABLE BATCH_JOB_EXECUTION ( diff --git a/spring-batch-core/src/main/sql/tables-main.sql.vpp b/spring-batch-core/src/main/sql/tables-main.sql.vpp index d156ad1a7..37139756d 100644 --- a/spring-batch-core/src/main/sql/tables-main.sql.vpp +++ b/spring-batch-core/src/main/sql/tables-main.sql.vpp @@ -2,7 +2,8 @@ CREATE TABLE BATCH_JOB_INSTANCE ( JOB_INSTANCE_ID ${BIGINT} $!{IDENTITY} NOT NULL PRIMARY KEY $!{GENERATED}, VERSION ${BIGINT} $!{NULL}, JOB_NAME ${VARCHAR}(100) NOT NULL, - JOB_KEY ${VARCHAR}(2500) $!{NULL} + JOB_KEY ${VARCHAR}(2500) $!{NULL}, + constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY) ) $!{VOODOO}; CREATE TABLE BATCH_JOB_EXECUTION ( diff --git a/spring-batch-infrastructure-tests/pom.xml b/spring-batch-infrastructure-tests/pom.xml index 15a971099..9b813d879 100644 --- a/spring-batch-infrastructure-tests/pom.xml +++ b/spring-batch-infrastructure-tests/pom.xml @@ -7,10 +7,22 @@ org.springframework.batch org.springframework.batch.parent - 2.0.1.CI-SNAPSHOT + 2.0.0.CI-SNAPSHOT ../spring-batch-parent + + tiger + + 1.5 + + + + javax.xml.stream + com.springsource.javax.xml.stream + + + default @@ -52,10 +64,6 @@ - org.springframework.batch @@ -98,11 +106,6 @@ javax.jms com.springsource.javax.jms - - - stax - stax - org.apache.geronimo.specs com.springsource.javax.management.j2ee diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml index d42d42599..7d6075a36 100644 --- a/spring-batch-infrastructure/pom.xml +++ b/spring-batch-infrastructure/pom.xml @@ -10,12 +10,9 @@ org.springframework.batch org.springframework.batch.parent - 2.0.1.CI-SNAPSHOT + 2.0.0.CI-SNAPSHOT ../spring-batch-parent - - ${pom.groupId}.infrastructure - tiger @@ -24,8 +21,8 @@ - stax - stax + javax.xml.stream + com.springsource.javax.xml.stream diff --git a/spring-batch-infrastructure/src/site/apt/index.apt b/spring-batch-infrastructure/src/site/apt/index.apt index c3228a4f4..1da232bae 100644 --- a/spring-batch-infrastructure/src/site/apt/index.apt +++ b/spring-batch-infrastructure/src/site/apt/index.apt @@ -8,7 +8,7 @@ Introduction This module provides framework code for the Spring Batch project. - The core interfaces are <<>>, <<>>, + The core interfaces are <<>>, <<>>, <<>>, <<>> and <<>>. The reader and writer interfaces are implemented in some generic @@ -26,16 +26,16 @@ template.setCompletionPolicy(new FixedChunkSizeCompletionPolicy(2)); template.iterate(new RepeatCallback() { - public ExitStatus doInIteration(RepeatContext context) { + public RepeatStatus doInIteration(RepeatContext context) { // Do stuff in batch... - return ExitStatus.CONTINUABLE; // Return ExitStatus.FINISHED to signal exhausted data + return RepeatStatus.CONTINUABLE; // Return RepeatStatus.FINISHED to signal exhausted data } }); +--- The callback is executed repeatedly, until the completion policy - determines that the batch should end. + determines that the batch should end (in the example, twice). The framework provides <<>> for automatic retry of a business operation. This is independent of the batching support, diff --git a/spring-batch-integration/pom.xml b/spring-batch-integration/pom.xml index 8fac023eb..a03fd6da0 100644 --- a/spring-batch-integration/pom.xml +++ b/spring-batch-integration/pom.xml @@ -6,7 +6,7 @@ org.springframework.batch org.springframework.batch.parent - 2.0.1.CI-SNAPSHOT + 2.0.0.CI-SNAPSHOT ../spring-batch-parent diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml index 148b5c8d1..f7c35821c 100644 --- a/spring-batch-parent/pom.xml +++ b/spring-batch-parent/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 org.springframework.batch org.springframework.batch.parent - 2.0.1.CI-SNAPSHOT + 2.0.0.CI-SNAPSHOT Spring Batch Parent + http://static.springframework.org/spring-batch Spring Batch parent project. Defines dependencies and common configuration for the build process. @@ -29,6 +31,53 @@ true + + staging + + + staging + file:///${user.dir}/target/staging + + + staging + file:///${user.dir}/target/staging + + + staging + file:///${user.dir}/target/staging + + + + + release + + + + maven-javadoc-plugin + + + javadoc + package + + jar + + + + + + maven-source-plugin + + + attach-sources + + jar + + + + + + + snapshots @@ -48,11 +97,12 @@ maven-site-plugin - 2.0-beta-7-SNAPSHOT + 2.0-beta-8-SNAPSHOT @@ -134,6 +184,38 @@ + + + + maven-jxr-plugin + + true + + + + maven-surefire-report-plugin + + true + + + + maven-project-info-reports-plugin + + + maven-javadoc-plugin + + true + + + + + javadoc + + + + + + @@ -437,7 +519,7 @@ objectstyle ObjectStyle.org Repository - http://objectstyle.org/maven2/ + http://objectstyle.org/maven2 false diff --git a/spring-batch-parent/src/site/site.xml b/spring-batch-parent/src/site/site.xml new file mode 100644 index 000000000..5aad0d342 --- /dev/null +++ b/spring-batch-parent/src/site/site.xml @@ -0,0 +1,23 @@ + + + + ${project.name} + http://www.springframework.org/spring-batch + + + images/shim.gif + + + + + + org.springframework.maven.skins + maven-spring-skin + 1.0.5 + + + + + + + diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml index 848ba2982..860adef09 100644 --- a/spring-batch-samples/pom.xml +++ b/spring-batch-samples/pom.xml @@ -10,9 +10,23 @@ org.springframework.batch org.springframework.batch.parent - 2.0.1.CI-SNAPSHOT + 2.0.0.CI-SNAPSHOT ../spring-batch-parent + + + tiger + + 1.5 + + + + javax.xml.stream + com.springsource.javax.xml.stream + + + + org.springframework.batch @@ -178,12 +192,6 @@ db2jcc 9.5.0 test --> - - stax - stax - - true - org.springframework diff --git a/spring-batch-test/pom.xml b/spring-batch-test/pom.xml index cd8a07046..015028f11 100755 --- a/spring-batch-test/pom.xml +++ b/spring-batch-test/pom.xml @@ -9,7 +9,7 @@ org.springframework.batch org.springframework.batch.parent - 2.0.1.CI-SNAPSHOT + 2.0.0.CI-SNAPSHOT ../spring-batch-parent diff --git a/src/site/apt/downloads.apt b/src/site/apt/downloads.apt index 078adfcfb..54d543039 100644 --- a/src/site/apt/downloads.apt +++ b/src/site/apt/downloads.apt @@ -57,7 +57,7 @@ Spring Batch Downloads +--------------- spring-releases - Spring Portfolio Maven RELEASE Repository + Spring Maven RELEASE Repository http://s3.amazonaws.com/maven.springframework.org/release +--------------- @@ -111,7 +111,7 @@ Spring Batch Downloads +--------------- spring-s3 - Spring Portfolio Maven MILESTONE Repository + Spring Maven MILESTONE Repository http://s3.amazonaws.com/maven.springframework.org/milestone +--------------- diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index e812302af..9935c99df 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -13,7 +13,7 @@ Introduction Spring Batch provides reusable functions that are essential in processing large volumes of records, including logging/tracing, transaction management, job processing statistics, job restart, skip, and resource management. It also provides more advance technical services and features that will enable extremely high-volume and high performance batch jobs though optimization and partitioning techniques. Simple as well as complex, high-volume batch jobs can leverage the framework in a highly scalable manner to process significant volumes of information. - Spring Batch is part of the {{{http://www.springframework.org/projects}Spring Portfolio}}. + Spring Batch is part of {{{http://www.springframework.org/projects}Spring}}. * Spring Batch Architecture diff --git a/src/site/apt/migration/2.0-m4-rc1.apt b/src/site/apt/migration/2.0-m4-rc1.apt new file mode 100644 index 000000000..5bf442f2c --- /dev/null +++ b/src/site/apt/migration/2.0-m4-rc1.apt @@ -0,0 +1,135 @@ +Spring Batch 2.0.0.RC1 Release Notes + +* Bug + + + * {{{http://jira.springframework.org/browse/BATCH-1089}BATCH-1089}} - Getting Started page should be updated + + * {{{http://jira.springframework.org/browse/BATCH-1088}BATCH-1088}} - NamespaceHandler no handle all XML tags + + * {{{http://jira.springframework.org/browse/BATCH-1087}BATCH-1087}} - ClassPathXmlJobRegistry does not accept patterns for resources + + * {{{http://jira.springframework.org/browse/BATCH-1086}BATCH-1086}} - JdbcJobExecutionDao.getRunningJobExecutions() ignores jobName + + * {{{http://jira.springframework.org/browse/BATCH-1085}BATCH-1085}} - Should adding next entities mean that the next attribute cannot be used? + + * {{{http://jira.springframework.org/browse/BATCH-1084}BATCH-1084}} - Change "status" attribute of and to "exit-code" + + * {{{http://jira.springframework.org/browse/BATCH-1083}BATCH-1083}} - Use RowMapper instead of ParameterizedRowMapper for public API + + * {{{http://jira.springframework.org/browse/BATCH-1082}BATCH-1082}} - If file reader is lenient about resource existing on startup, it should also check when it is closed + + * {{{http://jira.springframework.org/browse/BATCH-1081}BATCH-1081}} - Add task-executor= to + + * {{{http://jira.springframework.org/browse/BATCH-1080}BATCH-1080}} - make a top-level element + + * {{{http://jira.springframework.org/browse/BATCH-1078}BATCH-1078}} - Maven Build - ClassNotFoundException: com.springsource.util.math.Sets + + * {{{http://jira.springframework.org/browse/BATCH-1077}BATCH-1077}} - Update docs to reflect changes in statuses + + * {{{http://jira.springframework.org/browse/Update}Update}} - docs to reflect changes in statuses + + * {{{http://jira.springframework.org/browse/BATCH-1076}BATCH-1076}} - Add a test case to show how a can restart on the step it failed on + + * {{{http://jira.springframework.org/browse/BATCH-1075}BATCH-1075}} - allow-start-if-complete and start-limit should be on , not + + * {{{http://jira.springframework.org/browse/BATCH-1073}BATCH-1073}} - on element, "listeners" must be disallowed when "ref" attribute is specified + + * {{{http://jira.springframework.org/browse/BATCH-1071}BATCH-1071}} - JobInterruptedException needs to be on the fatal list + + * {{{http://jira.springframework.org/browse/BATCH-1070}BATCH-1070}} - Add 'strict' property to BeanWrapperFieldSetMapper to allow suppression of errors + + * {{{http://jira.springframework.org/browse/BATCH-1069}BATCH-1069}} - Update docs to show top-level element + + * {{{http://jira.springframework.org/browse/BATCH-1068}BATCH-1068}} - Update samples to use top-level element + + * {{{http://jira.springframework.org/browse/BATCH-1067}BATCH-1067}} - Problems with the way 'split' element handles EndStates + + * {{{http://jira.springframework.org/browse/BATCH-1066}BATCH-1066}} - Modify namespace so that if "next" attribute is used, then no transition elements will be allowed. + + * {{{http://jira.springframework.org/browse/BATCH-1064}BATCH-1064}} - Namespace end transition names don't match their corresponding statuses + + * {{{http://jira.springframework.org/browse/BATCH-1063}BATCH-1063}} - Fix image sizes + + * {{{http://jira.springframework.org/browse/BATCH-1062}BATCH-1062}} - Add namespace declaration information to docs + + * {{{http://jira.springframework.org/browse/BATCH-1061}BATCH-1061}} - FlowJob.getLastStepExecution() puts arguments into isLater() in the wrong order + + * {{{http://jira.springframework.org/browse/BATCH-1059}BATCH-1059}} - BATCH_JOB_INSTANCE.JOB_KEY ignores Date milliseconds + + * {{{http://jira.springframework.org/browse/BATCH-1057}BATCH-1057}} - Residual from 1.x left over in AbstractItemWriter + + * {{{http://jira.springframework.org/browse/BATCH-1056}BATCH-1056}} - Proofread documentation + + * {{{http://jira.springframework.org/browse/BATCH-1055}BATCH-1055}} - Add section on filtering to docs + + * {{{http://jira.springframework.org/browse/BATCH-1054}BATCH-1054}} - Maven Build - incompatible bundle manifest version + + * {{{http://jira.springframework.org/browse/BATCH-1053}BATCH-1053}} - Add getStep(String) to Job interface + + * {{{http://jira.springframework.org/browse/BATCH-1052}BATCH-1052}} - Write Common Pattern section about SystemCommandTasklet + + * {{{http://jira.springframework.org/browse/BATCH-1051}BATCH-1051}} - Write Common Pattern section about multi-line records + + * {{{http://jira.springframework.org/browse/BATCH-1050}BATCH-1050}} - SimpleJobExplorer doesn't retrieve StepExecutions of running JobExecutions using MapStepExecutionDao + + * {{{http://jira.springframework.org/browse/BATCH-1049}BATCH-1049}} - Add compile scope to spring-test in spring-batch-test + + * {{{http://jira.springframework.org/browse/BATCH-1048}BATCH-1048}} - Add site docos for the Test project + + * {{{http://jira.springframework.org/browse/BATCH-1047}BATCH-1047}} - CommandLineJobRunner should use JobOperator + + * {{{http://jira.springframework.org/browse/BATCH-1043}BATCH-1043}} - Add chapter on scaling (partitioning, etc) to docs + + * {{{http://jira.springframework.org/browse/BATCH-1041}BATCH-1041}} - Create section in documentation about launching from within a web container + + * {{{http://jira.springframework.org/browse/BATCH-1040}BATCH-1040}} - Add cross referencing to documentation + + * {{{http://jira.springframework.org/browse/BATCH-1037}BATCH-1037}} - Change namespace to set job-repository only on job + + * {{{http://jira.springframework.org/browse/BATCH-1034}BATCH-1034}} - Add StepScope to application context automatically in the parser + + * {{{http://jira.springframework.org/browse/BATCH-1030}BATCH-1030}} - FlowJob replays failed steps on restart, even if the failure did not fail the job + + * {{{http://jira.springframework.org/browse/BATCH-1028}BATCH-1028}} - JdbcCursorItemReader driverSupportsAbsolute property defaults to false + + * {{{http://jira.springframework.org/browse/BATCH-1027}BATCH-1027}} - PassThroughFieldExtractor should have a unit test + + * {{{http://jira.springframework.org/browse/BATCH-1023}BATCH-1023}} - File writing related interfaces need more javadoc + + * {{{http://jira.springframework.org/browse/BATCH-1013}BATCH-1013}} - Using the batch namespace, steps can't be defined outside of the "job" tag. + + * {{{http://jira.springframework.org/browse/BATCH-1011}BATCH-1011}} - Need distinction between "stop" and "end" transitions? + + * {{{http://jira.springframework.org/browse/BATCH-1010}BATCH-1010}} - StepFactoryBeans cleanup + + * {{{http://jira.springframework.org/browse/BATCH-1008}BATCH-1008}} - Elements in namespace are order-dependent + + * {{{http://jira.springframework.org/browse/BATCH-1000}BATCH-1000}} - Add timeout to TaskExecutorPartitionHandler + + * {{{http://jira.springframework.org/browse/BATCH-955}BATCH-955}} - Update XML schema to be tooling friendly + + * {{{http://jira.springframework.org/browse/BATCH-949}BATCH-949}} - JdbcCursorItemReader: property name for "mapper"? + + * {{{http://jira.springframework.org/browse/BATCH-942}BATCH-942}} - Obvious JobLocator implementation + + * {{{http://jira.springframework.org/browse/BATCH-909}BATCH-909}} - Turn off getWarnings() call in JdbcCursorItemReader when ignoreWarnings is true + + * {{{http://jira.springframework.org/browse/BATCH-882}BATCH-882}} - Create section in documentation highlighting key changes between 1.x and 2.0 + + * {{{http://jira.springframework.org/browse/BATCH-851}BATCH-851}} - Remove DrivingQueryItemReader support in favor of PagingItemReaders + + * {{{http://jira.springframework.org/browse/BATCH-819 Create}BATCH-819 Create}} - separate CI builds for artifacts in Maven Central and Enterprise Repository + + * {{{http://jira.springframework.org/browse/BATCH-818 Create}BATCH-818 Create}} - and test ivy and maven files needed for build + + * {{{http://jira.springframework.org/browse/BATCH-793}BATCH-793}} - Creating a new ApplicationContext per Job needs refactoring + + * {{{http://jira.springframework.org/browse/BATCH-690}BATCH-690}} - Move drop table statements to separate script + + * {{{http://jira.springframework.org/browse/BATCH-659}BATCH-659}} - unused classes deprecation/removal + + * {{{http://jira.springframework.org/browse/BATCH-618}BATCH-618}} - DefaultJobParametersConverter does not parse parameters of type double + + * {{{http://jira.springframework.org/browse/BATCH-583}BATCH-583}} - Figures missing from PDF docs + diff --git a/src/site/docbook/reference/domain.xml b/src/site/docbook/reference/domain.xml index b0a3b9081..0c3afd144 100644 --- a/src/site/docbook/reference/domain.xml +++ b/src/site/docbook/reference/domain.xml @@ -44,18 +44,11 @@ processing needs. - - - - - + - Figure 2.1: Batch Stereotypes @@ -221,6 +214,8 @@ JobExecution properties + + status @@ -591,6 +586,8 @@ StepExecution properties + + status diff --git a/src/site/docbook/reference/scalability.xml b/src/site/docbook/reference/scalability.xml index 01693b12a..99fd44839 100644 --- a/src/site/docbook/reference/scalability.xml +++ b/src/site/docbook/reference/scalability.xml @@ -296,7 +296,77 @@ pairs, so it might contain a range of primary keys, or line numbers, or the location of an input file. The remote Step then normally binds to the context input using #{...} - placeholders (late binding in step scope). + placeholders (late binding in step scope), as illustrated in the next + section. + + The names of the step executions (the keys in the + Map returned by + Partitioner) need to be unique amongst the step + executions of a Job, but do not have any other specific requirements. + The easiest way to do this, and to make the names meaningful for users, + is to use a prefix+suffix naming convention, where the prefix is the + name of the step that is being executed (which itself is unique in the + Job), and the suffix is just a counter. There is + a SimplePartitioner in the framework that uses + this convention. + + +
+ Binding Input Data to Steps + + It is very efficient for the steps that are executed by the + PartitionHandler to have identical configuration, and for their input + parameters to be bound at runtime from the ExecutionContext. This is + easy to do with the StepScope feature of Spring Batch (covered in more + detail in the section on ). For example + if the Partitioner creates + ExecutionContext instances with an attribute key + fileName, pointing to a different file (or + directlory) for each step invocation, the + Partitioner output might look like this: + + + Example step execution name to execution context provided by + Partitioner targeting directory processing + + + + + Step Execution Name + (key) + + ExecutionContext + (value) + + + + filecopy:partition0 + + fileName=/home/data/one + + + + filecopy:partition1 + + fileName=/home/data/two + + + + filecopy:partition2 + + fileName=/home/data/three + + + +
+ + Then the file name can be bound to a step using late binding to + the execution context: + + + #{stepExecutionContext.fileName}/* + ]]>
- \ No newline at end of file + diff --git a/src/site/docbook/reference/step.xml b/src/site/docbook/reference/step.xml index 32b2a15dc..87981cec8 100644 --- a/src/site/docbook/reference/step.xml +++ b/src/site/docbook/reference/step.xml @@ -1442,7 +1442,7 @@ -
+
Late binding of Job and Step Attributes Both the XML and Flat File examples above use the Spring @@ -1520,7 +1520,7 @@ ]]> -
+
Step Scope All of the late binding examples from above have a scope of "step" @@ -1538,12 +1538,25 @@ to use late binding since the bean cannot actually be instantiated until the Step starts, which allows the attributes to be found. Because it is not part of the Spring container by default, it - must be added explicitly: + must be added explicitly, either by using the batch + namespace: + + +... + +]]> + + or by including a bean definition explicitly for theStep (but not both): ]]> +
diff --git a/src/site/site.xml b/src/site/site.xml index f86b2618f..e448cb435 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -41,7 +41,12 @@ - + + + + + +