Skip to content
Browse files

Finish off RC1 release

  • Loading branch information...
1 parent 443c6da commit cefced1f29718c350259edc70b435ecffc1012e8 dsyer committed
Showing with 495 additions and 176 deletions.
  1. +1 −1 archetypes/pom.xml
  2. +1 −1 archetypes/simple-cli/pom.xml
  3. +78 −101 pom.xml
  4. +1 −1 spring-batch-core/pom.xml
  5. +2 −1 spring-batch-core/src/main/resources/schema-db2.sql
  6. +2 −1 spring-batch-core/src/main/resources/schema-derby.sql
  7. +2 −2 spring-batch-core/src/main/resources/schema-drop-db2.sql
  8. +2 −2 spring-batch-core/src/main/resources/schema-drop-derby.sql
  9. +2 −2 spring-batch-core/src/main/resources/schema-drop-hsqldb.sql
  10. +2 −2 spring-batch-core/src/main/resources/schema-drop-mysql.sql
  11. +2 −2 spring-batch-core/src/main/resources/schema-drop-oracle10g.sql
  12. +2 −2 spring-batch-core/src/main/resources/schema-drop-postgresql.sql
  13. +2 −1 spring-batch-core/src/main/resources/schema-hsqldb.sql
  14. +2 −1 spring-batch-core/src/main/resources/schema-mysql.sql
  15. +2 −1 spring-batch-core/src/main/resources/schema-oracle10g.sql
  16. +2 −1 spring-batch-core/src/main/resources/schema-postgresql.sql
  17. +2 −1 spring-batch-core/src/main/resources/schema-sqlserver.sql
  18. +2 −1 spring-batch-core/src/main/resources/schema-sybase.sql
  19. +2 −1 spring-batch-core/src/main/sql/tables-main.sql.vpp
  20. +13 −10 spring-batch-infrastructure-tests/pom.xml
  21. +3 −6 spring-batch-infrastructure/pom.xml
  22. +4 −4 spring-batch-infrastructure/src/site/apt/index.apt
  23. +1 −1 spring-batch-integration/pom.xml
  24. +87 −5 spring-batch-parent/pom.xml
  25. +23 −0 spring-batch-parent/src/site/site.xml
  26. +15 −7 spring-batch-samples/pom.xml
  27. +1 −1 spring-batch-test/pom.xml
  28. +2 −2 src/site/apt/downloads.apt
  29. +1 −1 src/site/apt/index.apt
  30. +135 −0 src/site/apt/migration/2.0-m4-rc1.apt
  31. +5 −8 src/site/docbook/reference/domain.xml
  32. +72 −2 src/site/docbook/reference/scalability.xml
  33. +16 −3 src/site/docbook/reference/step.xml
  34. +6 −1 src/site/site.xml
View
2 archetypes/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.batch</groupId>
<artifactId>org.springframework.batch</artifactId>
- <version>2.0.1.CI-SNAPSHOT</version>
+ <version>2.0.0.CI-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
View
2 archetypes/simple-cli/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.batch</groupId>
<artifactId>org.springframework.batch.archetype.simple.cli</artifactId>
- <version>2.0.1.CI-SNAPSHOT</version>
+ <version>2.0.0.CI-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Commandline</name>
<url>http://www.springframework.org/spring-batch/archetypes/simple-cli-archetype</url>
View
179 pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.batch</groupId>
<artifactId>org.springframework.batch</artifactId>
@@ -7,7 +8,7 @@
<!-- Use CDATA to keep it on a single line in the manifest -->
<![CDATA[Spring Batch provides tools for enterprise batch or bulk processing. It can be used to wire up jobs, and track their execution, or simply as an optimization for repetitive processing in a transactional environment. Spring Batch is part of the Spring Portfolio.]]>
</description>
- <version>2.0.1.CI-SNAPSHOT</version>
+ <version>2.0.0.CI-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>spring-batch-parent</module>
@@ -15,7 +16,7 @@
<module>spring-batch-core</module>
<module>spring-batch-test</module>
</modules>
- <url>http://www.springframework.org/spring-batch</url>
+ <url>http://static.springframework.org/spring-batch</url>
<organization>
<name>SpringSource</name>
<url>http://www.springsource.com</url>
@@ -66,13 +67,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<inherited>false</inherited>
<executions>
@@ -138,7 +132,9 @@
<imgSrcPath>src/site/docbook/reference/</imgSrcPath>
<admonGraphicsPath>src/docbkx/resources/images/</admonGraphicsPath>
<postProcess>
- <copy file="${basedir}/target/docbkx/pdf/index.pdf" tofile="${basedir}/target/site/reference/pdf/spring-batch-docs.pdf" failonerror="false" />
+ <copy file="${basedir}/target/docbkx/pdf/index.pdf"
+ tofile="${basedir}/target/site/reference/pdf/spring-batch-docs.pdf"
+ failonerror="false" />
</postProcess>
</configuration>
<phase>pre-site</phase>
@@ -185,7 +181,10 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <!-- This is a downgrade for the 2.0.8 plugin (was 0.94) but prevents ArrayOutOfBounds exception on xi:includes -->
+ <!--
+ This is a downgrade for the 2.0.8 plugin (was 0.94) but
+ prevents ArrayOutOfBounds exception on xi:includes
+ -->
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
<version>0.93</version>
@@ -251,37 +250,45 @@
<fileset dir="target">
<include name="*with-dep*.zip" />
</fileset>
- <regexpmapper from="^[^/]*/(.*)$$" to="\1" handledirsep="true" />
+ <regexpmapper from="^[^/]*/(.*)$$" to="\1"
+ handledirsep="true" />
</unzip>
<unzip dest="target/it/no-dep">
<fileset dir="target">
<include name="*no-dep*.zip" />
</fileset>
- <regexpmapper from="^[^/]*/(.*)$$" to="\1" handledirsep="true" />
+ <regexpmapper from="^[^/]*/(.*)$$" to="\1"
+ handledirsep="true" />
</unzip>
- <fail message="Failed integration test of zip distro: Spring Batch jar files are missing.">
+ <fail
+ message="Failed integration test of zip distro: Spring Batch jar files are missing.">
<condition>
<not>
<resourcecount count="3">
- <fileset id="fs" dir="target/it/with-dep/dist" includes="*.jar" />
+ <fileset id="fs" dir="target/it/with-dep/dist"
+ includes="*.jar" />
</resourcecount>
</not>
</condition>
</fail>
- <fail message="Failed integration test of zip distro: dependency jar files are missing.">
+ <fail
+ message="Failed integration test of zip distro: dependency jar files are missing.">
<condition>
<not>
<resourcecount count="1">
- <fileset id="fs" dir="target/it/with-dep/sources/lib" includes="org.springframework.beans-*.jar" />
+ <fileset id="fs" dir="target/it/with-dep/sources/lib"
+ includes="org.springframework.beans-*.jar" />
</resourcecount>
</not>
</condition>
</fail>
- <fail message="Failed integration test of zip distro: test dependency jar files are missing.">
+ <fail
+ message="Failed integration test of zip distro: test dependency jar files are missing.">
<condition>
<not>
<resourcecount count="1">
- <fileset id="fs" dir="target/it/with-dep/sources/lib" includes="com.springsource.org.junit-*.jar" />
+ <fileset id="fs" dir="target/it/with-dep/sources/lib"
+ includes="com.springsource.org.junit-*.jar" />
</resourcecount>
</not>
</condition>
@@ -342,11 +349,12 @@
<pluginManagement>
<plugins>
<!--
- This seems to work better than the default (2008/03/19) because links on sub-module sites are not broken
+ This seems to work better than the default (2008/03/19) because
+ links on sub-module sites are not broken
-->
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-7-SNAPSHOT</version>
+ <version>2.0-beta-8-SNAPSHOT</version>
</plugin>
</plugins>
</pluginManagement>
@@ -446,84 +454,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- <execution>
- <id>repost</id>
- <phase>site</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <links>
- <link>http://java.sun.com/j2ee/1.4/docs/api</link>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
- <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
- <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
- <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
- <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
- <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
- <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
- <link>http://logging.apache.org/log4j/docs/api/</link>
- <link>http://jakarta.apache.org/regexp/apidocs/</link>
- <link>http://jakarta.apache.org/velocity/api/</link>
- <link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
- <link>http://static.springframework.org/spring-batch/apidocs/</link>
- <link>http://static.springframework.org/spring-ws/site/apidocs/</link>
- </links>
- <header><![CDATA[
- <!-- Begin Google Analytics code -->
- <script type="text/javascript">
- var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
- document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
- </script>
- <script type="text/javascript">
- var pageTracker = _gat._getTracker("UA-2728886-3");
- pageTracker._setDomainName("none");
- pageTracker._setAllowLinker(true);
- pageTracker._trackPageview();
- </script>
- <!-- End Google Analytics code -->
-]]>
- </header>
- <bottom><![CDATA[
- <!-- Begin LoopFuse code -->
- <script src="http://loopfuse.net/webrecorder/js/listen.js" type="text/javascript">
- </script>
- <script type="text/javascript">
- _lf_cid = "LF_48be82fa";
- _lf_remora();
- </script>
- <!-- End LoopFuse code -->
-]]>
- </bottom>
- <aggregate>true</aggregate>
- <excludePackageNames>*.batch.sample,*.batch.container,example,test</excludePackageNames>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</pluginManagement>
</build>
@@ -549,6 +479,53 @@
</reports>
</reportSet>
</reportSets>
+ <configuration>
+ <aggregate>true</aggregate>
+ <breakiterator>true</breakiterator>
+ <links>
+ <link>http://java.sun.com/j2ee/1.4/docs/api</link>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
+ <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
+ <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
+ <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
+ <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
+ <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+ <link>http://junit.sourceforge.net/javadoc/</link>
+ <link>http://logging.apache.org/log4j/docs/api/</link>
+ <link>http://jakarta.apache.org/regexp/apidocs/</link>
+ <link>http://jakarta.apache.org/velocity/api/</link>
+ <link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
+ <link>http://static.springframework.org/spring-batch/apidocs/</link>
+ <link>http://static.springframework.org/spring-ws/site/apidocs/</link>
+ </links>
+ <header><![CDATA[
+ <!-- Begin Google Analytics code -->
+ <script type="text/javascript">
+ var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+ </script>
+ <script type="text/javascript">
+ var pageTracker = _gat._getTracker("UA-2728886-3");
+ pageTracker._setDomainName("none");
+ pageTracker._setAllowLinker(true);
+ pageTracker._trackPageview();
+ </script>
+ <!-- End Google Analytics code -->
+]]>
+ </header>
+ <bottom><![CDATA[
+ <!-- Begin LoopFuse code -->
+ <script src="http://loopfuse.net/webrecorder/js/listen.js" type="text/javascript">
+ </script>
+ <script type="text/javascript">
+ _lf_cid = "LF_48be82fa";
+ _lf_remora();
+ </script>
+ <!-- End LoopFuse code -->
+]]>
+ </bottom>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -613,4 +590,4 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-</project>
+</project>
View
2 spring-batch-core/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.batch</groupId>
<artifactId>org.springframework.batch.parent</artifactId>
- <version>2.0.1.CI-SNAPSHOT</version>
+ <version>2.0.0.CI-SNAPSHOT</version>
<relativePath>../spring-batch-parent</relativePath>
</parent>
View
3 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 (
View
3 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 (
View
4 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 ;
View
4 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 ;
View
4 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;
View
4 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 ;
View
4 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 ;
View
4 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 ;
View
3 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 (
View
3 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 (
View
3 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 (
View
3 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 (
View
3 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 (
View
3 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 (
View
3 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 (
View
23 spring-batch-infrastructure-tests/pom.xml
@@ -7,11 +7,23 @@
<parent>
<groupId>org.springframework.batch</groupId>
<artifactId>org.springframework.batch.parent</artifactId>
- <version>2.0.1.CI-SNAPSHOT</version>
+ <version>2.0.0.CI-SNAPSHOT</version>
<relativePath>../spring-batch-parent</relativePath>
</parent>
<profiles>
<profile>
+ <id>tiger</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>com.springsource.javax.xml.stream</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -52,10 +64,6 @@
</profile>
</profiles>
- <!--
- Temporary measure while we get to the bottom of the test failures on
- Bamboo
- -->
<dependencies>
<dependency>
<groupId>org.springframework.batch</groupId>
@@ -99,11 +107,6 @@
<artifactId>com.springsource.javax.jms</artifactId>
</dependency>
<dependency>
- <!-- TODO: remove this or find a replacement in Java 5 / BRITS -->
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>com.springsource.javax.management.j2ee</artifactId>
<version>1.0.1</version>
View
9 spring-batch-infrastructure/pom.xml
@@ -10,12 +10,9 @@
<parent>
<groupId>org.springframework.batch</groupId>
<artifactId>org.springframework.batch.parent</artifactId>
- <version>2.0.1.CI-SNAPSHOT</version>
+ <version>2.0.0.CI-SNAPSHOT</version>
<relativePath>../spring-batch-parent</relativePath>
</parent>
- <properties>
- <bundle.symbolic.name>${pom.groupId}.infrastructure</bundle.symbolic.name>
- </properties>
<profiles>
<profile>
<id>tiger</id>
@@ -24,8 +21,8 @@
</activation>
<dependencies>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>com.springsource.javax.xml.stream</artifactId>
</dependency>
</dependencies>
</profile>
View
8 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 <<<ItemReader>>>, <<<ItemWriter>>>,
+ The core interfaces are <<<ItemReader>>>, <<<ItemProcessor>>>, <<<ItemWriter>>>,
<<<RepeatOperations>>> and <<<RetryOperations>>>.
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 <<<RetryOperations>>> for automatic retry of
a business operation. This is independent of the batching support,
View
2 spring-batch-integration/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.batch</groupId>
<artifactId>org.springframework.batch.parent</artifactId>
- <version>2.0.1.CI-SNAPSHOT</version>
+ <version>2.0.0.CI-SNAPSHOT</version>
<relativePath>../spring-batch-parent</relativePath>
</parent>
<profiles>
View
92 spring-batch-parent/pom.xml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.batch</groupId>
<artifactId>org.springframework.batch.parent</artifactId>
- <version>2.0.1.CI-SNAPSHOT</version>
+ <version>2.0.0.CI-SNAPSHOT</version>
<name>Spring Batch Parent</name>
+ <url>http://static.springframework.org/spring-batch</url>
<description>
Spring Batch parent project. Defines dependencies and common configuration for the
build process.
@@ -30,6 +32,53 @@
</properties>
</profile>
<profile>
+ <id>staging</id>
+ <distributionManagement>
+ <site>
+ <id>staging</id>
+ <url>file:///${user.dir}/target/staging</url>
+ </site>
+ <repository>
+ <id>staging</id>
+ <url>file:///${user.dir}/target/staging</url>
+ </repository>
+ <snapshotRepository>
+ <id>staging</id>
+ <url>file:///${user.dir}/target/staging</url>
+ </snapshotRepository>
+ </distributionManagement>
+ </profile>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>snapshots</id>
<pluginRepositories>
<pluginRepository>
@@ -48,11 +97,12 @@
<pluginManagement>
<plugins>
<!--
- This seems to work better than the default (2008/03/19) because links on sub-module sites are not broken
+ This seems to work better than the default (2008/03/19) because
+ links on sub-module sites are not broken
-->
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-7-SNAPSHOT</version>
+ <version>2.0-beta-8-SNAPSHOT</version>
</plugin>
</plugins>
</pluginManagement>
@@ -134,6 +184,38 @@
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
<dependencyManagement>
<dependencies>
<dependency>
@@ -437,7 +519,7 @@
<repository>
<id>objectstyle</id>
<name>ObjectStyle.org Repository</name>
- <url>http://objectstyle.org/maven2/</url>
+ <url>http://objectstyle.org/maven2</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
View
23 spring-batch-parent/src/site/site.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="${project.name}">
+ <bannerLeft>
+ <name>${project.name}</name>
+ <href>http://www.springframework.org/spring-batch</href>
+ </bannerLeft>
+ <bannerRight>
+ <src>images/shim.gif</src>
+ </bannerRight>
+ <poweredBy>
+ <logo name="" href="" img="images/shim.gif"/>
+ </poweredBy>
+ <skin>
+ <groupId>org.springframework.maven.skins</groupId>
+ <artifactId>maven-spring-skin</artifactId>
+ <version>1.0.5</version>
+ </skin>
+ <body>
+ <links>
+ <item name="Home" href="http://static.springframework.org/spring-batch/index.html"/>
+ </links>
+ </body>
+</project>
View
22 spring-batch-samples/pom.xml
@@ -10,9 +10,23 @@
<parent>
<groupId>org.springframework.batch</groupId>
<artifactId>org.springframework.batch.parent</artifactId>
- <version>2.0.1.CI-SNAPSHOT</version>
+ <version>2.0.0.CI-SNAPSHOT</version>
<relativePath>../spring-batch-parent</relativePath>
</parent>
+ <profiles>
+ <profile>
+ <id>tiger</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>com.springsource.javax.xml.stream</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
<dependencies>
<dependency>
<groupId>org.springframework.batch</groupId>
@@ -178,12 +192,6 @@
<artifactId>db2jcc</artifactId> <version>9.5.0</version>
<scope>test</scope> </dependency>
-->
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <!-- optional for Java 6 -->
- <optional>true</optional>
- </dependency>
<!-- Spring Dependencies -->
<dependency>
<groupId>org.springframework</groupId>
View
2 spring-batch-test/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.batch</groupId>
<artifactId>org.springframework.batch.parent</artifactId>
- <version>2.0.1.CI-SNAPSHOT</version>
+ <version>2.0.0.CI-SNAPSHOT</version>
<relativePath>../spring-batch-parent</relativePath>
</parent>
View
4 src/site/apt/downloads.apt
@@ -57,7 +57,7 @@ Spring Batch Downloads
+---------------
<repository>
<id>spring-releases</id>
- <name>Spring Portfolio Maven RELEASE Repository</name>
+ <name>Spring Maven RELEASE Repository</name>
<url>http://s3.amazonaws.com/maven.springframework.org/release</url>
</repository>
+---------------
@@ -111,7 +111,7 @@ Spring Batch Downloads
+---------------
<repository>
<id>spring-s3</id>
- <name>Spring Portfolio Maven MILESTONE Repository</name>
+ <name>Spring Maven MILESTONE Repository</name>
<url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
</repository>
+---------------
View
2 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
View
135 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 <end> and <fail> 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 <split/>
+
+ * {{{http://jira.springframework.org/browse/BATCH-1080}BATCH-1080}} - make <tasklet> 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 <stop> 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 <step/>, not <tasklet/>
+
+ * {{{http://jira.springframework.org/browse/BATCH-1073}BATCH-1073}} - on <step> 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 <step> element
+
+ * {{{http://jira.springframework.org/browse/BATCH-1068}BATCH-1068}} - Update samples to use <step> 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
+
View
13 src/site/docbook/reference/domain.xml
@@ -44,18 +44,11 @@
processing needs.</para>
<mediaobject>
- <imageobject role="fo">
- <imagedata align="center"
- fileref="images/spring-batch-reference-model.png"
- format="PNG" />
- </imageobject>
-
- <imageobject role="html">
+ <imageobject>
<imagedata align="center"
fileref="images/spring-batch-reference-model.png"
format="PNG" scale="80" />
</imageobject>
-
<caption><para>Figure 2.1: Batch Stereotypes</para></caption>
</mediaobject>
@@ -221,6 +214,8 @@
<title>JobExecution properties</title>
<tgroup cols="2">
+<colspec colname="c1" colwidth="*"/>
+<colspec colname="c2" colwidth="4*"/>
<tbody>
<row>
<entry>status</entry>
@@ -591,6 +586,8 @@
<title>StepExecution properties</title>
<tgroup cols="2">
+<colspec colname="c1" colwidth="*"/>
+<colspec colname="c2" colwidth="4*"/>
<tbody>
<row>
<entry>status</entry>
View
74 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 <classname>Step</classname>
then normally binds to the context input using <literal>#{...}</literal>
- placeholders (late binding in step scope).</para>
+ placeholders (late binding in step scope), as illustrated in the next
+ section.</para>
+
+ <para>The names of the step executions (the keys in the
+ <classname>Map</classname> returned by
+ <classname>Partitioner</classname>) 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
+ <classname>Job</classname>), and the suffix is just a counter. There is
+ a <classname>SimplePartitioner</classname> in the framework that uses
+ this convention.</para>
+ </section>
+
+ <section>
+ <title>Binding Input Data to Steps</title>
+
+ <para>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 <xref linkend="late-binding" />). For example
+ if the <classname>Partitioner</classname> creates
+ <classname>ExecutionContext</classname> instances with an attribute key
+ <literal>fileName</literal>, pointing to a different file (or
+ directlory) for each step invocation, the
+ <classname>Partitioner</classname> output might look like this:</para>
+
+ <table>
+ <title>Example step execution name to execution context provided by
+ Partitioner targeting directory processing</title>
+
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry><emphasis role="bold">Step Execution Name
+ (key)</emphasis></entry>
+
+ <entry><emphasis role="bold">ExecutionContext
+ (value)</emphasis></entry>
+ </row>
+
+ <row>
+ <entry>filecopy:partition0</entry>
+
+ <entry>fileName=/home/data/one</entry>
+ </row>
+
+ <row>
+ <entry>filecopy:partition1</entry>
+
+ <entry>fileName=/home/data/two</entry>
+ </row>
+
+ <row>
+ <entry>filecopy:partition2</entry>
+
+ <entry>fileName=/home/data/three</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>Then the file name can be bound to a step using late binding to
+ the execution context:</para>
+
+ <programlisting><![CDATA[ <bean id="itemReader" scope="step"
+ class="org.sfw...MultiResourceItemReader">
+ <property name="resource" value="]]><emphasis role="bold">#{stepExecutionContext.fileName}/*</emphasis><![CDATA["/>
+ </bean>]]></programlisting>
</section>
</section>
-</chapter>
+</chapter>
View
19 src/site/docbook/reference/step.xml
@@ -1442,7 +1442,7 @@
</section>
</section>
- <section>
+ <section id="late-binding" xreflabel="Late Binding">
<title>Late binding of Job and Step Attributes</title>
<para>Both the XML and Flat File examples above use the Spring
@@ -1520,7 +1520,7 @@
]]></programlisting>
- <section>
+ <section id="step-scope">
<title>Step Scope</title>
<para>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 <classname>Step</classname> starts, which allows the attributes to
be found. Because it is not part of the Spring container by default, it
- must be added explicitly:</para>
+ must be added explicitly, either by using the <literal>batch</literal>
+ namespace: </para>
+
+ <programlisting><![CDATA[
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:batch="http://www.springframework.org/schema/batch"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="...">
+...
+</beans>
+]]></programlisting>
+
+ <para>or by including a bean definition explicitly for the<classname>Step</classname> (but not both):</para>
<programlisting><![CDATA[
<bean class="org.springframework.batch.core.scope.StepScope" />
]]></programlisting>
+
</section>
</section>
</chapter>
View
7 src/site/site.xml
@@ -41,7 +41,12 @@
<item name="1.0.x" href="http://www.springframework.org/spring-batch/1.0.x/index.html"/>
<item name="1.1.x" href="http://www.springframework.org/spring-batch/1.1.x/index.html"/>
</menu>
- <menu ref="modules"/>
+ <menu name="Modules" inherit="none">
+ <item name="Infrastructure" href="org.springframework.batch.infrastructure/index.html"/>
+ <item name="Core" href="org.springframework.batch.core/index.html"/>
+ <item name="Test" href="org.springframework.batch.test/index.html"/>
+ <item name="Samples" href="org.springframework.batch.samples/index.html"/>
+ </menu>
<menu ref="reports"/>
</body>
</project>

0 comments on commit cefced1

Please sign in to comment.
Something went wrong with that request. Please try again.