From 5c7dcc59b9ce2965ef37f1549680f8fc4b35983e Mon Sep 17 00:00:00 2001 From: dsyer Date: Fri, 28 Mar 2008 07:11:59 +0000 Subject: [PATCH] Update bits of site for 1.0.0 --- dictionary.txt | 1 + docs/src/site/docbook/reference/retry.xml | 25 ++++++++----------- .../resources/adhoc-job-launcher-context.xml | 4 +-- .../resources/quartz-job-launcher-context.xml | 2 +- src/site/apt/downloads.apt | 4 +-- src/site/apt/snapshots.apt | 2 +- 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dictionary.txt b/dictionary.txt index 1cd88af5c..d46efa409 100644 --- a/dictionary.txt +++ b/dictionary.txt @@ -50,3 +50,4 @@ tasklet bespoke standalone kasanicky +remedial diff --git a/docs/src/site/docbook/reference/retry.xml b/docs/src/site/docbook/reference/retry.xml index 644b997df..c3d4a3e78 100644 --- a/docs/src/site/docbook/reference/retry.xml +++ b/docs/src/site/docbook/reference/retry.xml @@ -147,26 +147,24 @@ Object result = template.execute(new RetryCallback() { recognise the failed operations when they come back in a new transaction. To facilitate this in the commonest case where an object (like a message or message payload) is being processed, Spring Batch - provides the ItemReaderRetryPolicy. This works + provides the ItemWriterRetryPolicy. This works in conjunction with a special RetryCallback - implementation ItemReaderRetryCallback, which + implementation ItemWriterRetryCallback, which in turn relies on the user providing an - ItemReader and an ItemWriter. This callback implements the common - pattern where it reads from a reader and passes the result to a - writer. + pattern where it passes the item to a writer. The way the failed operations are recognised in this - implementation is by identifying the object that is returned from the - ItemReader. To identify the item the user can - provide an ItemKeyGenerator strategy, and this - is responsible for returning a unique key identifying the item. The + implementation is by identifying the item across multiple invocations + of the retry. To identify the item the user can provide an + ItemKeyGenerator strategy, and this is + responsible for returning a unique key identifying the item. The identifier is used as a key in the RetryContextCache. An ItemKeyGenerator can be provided either by injecting it directly into the - ItemReaderRetryCallback, or by implementing the - interface in the ItemReader, or by accepting + ItemWriterRetryCallback, or by implementing the + interface in the ItemWriter, or by accepting the default which is to simply use the item itself as a key. When the retry is exhausted, because a stateful retry is always @@ -176,13 +174,12 @@ Object result = template.execute(new RetryCallback() { almost certain to fail). This option is provided by the ItemRecoverer strategy. Like the key generator, it can be directly injected or provided by implementing the interface - in either the ItemReader or - ItemWriter. + in the ItemWriter. The decision to retry or not is actually delegated to a regular stateless retry policy, so the usual concerns about limits and timeouts can be injected into the - ItemReaderRetryPolicy through the delegate + ItemWriterRetryPolicy through the delegate property. diff --git a/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml b/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml index 50be87399..1e5c0fe7a 100644 --- a/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml +++ b/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml @@ -17,7 +17,7 @@ class="org.springframework.batch.core.launch.support.SimpleExportedJobLauncher"> + ref="jobRegistry" /> - + diff --git a/spring-batch-samples/src/main/resources/quartz-job-launcher-context.xml b/spring-batch-samples/src/main/resources/quartz-job-launcher-context.xml index 349b28e32..9999996e5 100644 --- a/spring-batch-samples/src/main/resources/quartz-job-launcher-context.xml +++ b/spring-batch-samples/src/main/resources/quartz-job-launcher-context.xml @@ -23,7 +23,7 @@ - + diff --git a/src/site/apt/downloads.apt b/src/site/apt/downloads.apt index aeeba588a..23bcbe284 100644 --- a/src/site/apt/downloads.apt +++ b/src/site/apt/downloads.apt @@ -7,7 +7,7 @@ Milestone Builds - These builds are provided for evaluation and community feedback. They will have a release identifier ending in "mX" where X is the milestone number, or "rcX" for a release candidate. The current release is <<1.0.0.rc1>>. + These builds are provided for evaluation and community feedback. They will have a release identifier ending in "mX" where X is the milestone number, or "rcX" for a release candidate. The current release is <<1.0.0>>. * Zip Downloads @@ -33,7 +33,7 @@ Milestone Builds org.springframework.batch spring-batch-core - 1.0.0.rc1 + 1.0.0 +--------------- diff --git a/src/site/apt/snapshots.apt b/src/site/apt/snapshots.apt index e3ab84966..95ca74059 100644 --- a/src/site/apt/snapshots.apt +++ b/src/site/apt/snapshots.apt @@ -27,7 +27,7 @@ Snapshot Builds org.springframework.batch spring-batch-core - 1.0.0.-SNAPSHOT + 1.0.1-SNAPSHOT +---------------