diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml index 1f08e99dc..76b6e79f7 100644 --- a/docs/src/site/site.xml +++ b/docs/src/site/site.xml @@ -3,20 +3,8 @@ Spring Batch: ${project.name} - - images/shim.gif - - - - - - org.springframework.maven.skins - maven-spring-skin - 1.0.4 - - @@ -28,6 +16,5 @@ - ${reports} diff --git a/pom.xml b/pom.xml index 4c341df15..160cbad7b 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,17 @@ http://repository.atlassian.com/maven2 + + + + + + maven-site-plugin + 2.0-beta-7-SNAPSHOT + + + + xsl-aggregation @@ -210,6 +221,11 @@ + + org.codehaus.mojo + emma-maven-plugin + 1.0-20070912.011112-4 + org.apache.maven.plugins maven-antrun-plugin @@ -567,9 +583,8 @@ 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.1.x/api/ - http://static.springframework.org/spring-batch/spring-batch-infrastructure/apidocs/ - http://static.springframework.org/spring-batch/spring-batch-core/apidocs/ + http://static.springframework.org/spring/docs/2.5.x/api/ + http://static.springframework.org/spring-batch/apidocs/ true org.springframework.batch.sample diff --git a/spring-batch-core/src/site/site.xml b/spring-batch-core/src/site/site.xml index 1eaea417a..b0d91e7f6 100644 --- a/spring-batch-core/src/site/site.xml +++ b/spring-batch-core/src/site/site.xml @@ -3,21 +3,10 @@ Spring Batch: ${project.name} - - images/shim.gif - - - - - - org.springframework.maven.skins - maven-spring-skin - 1.0.4 - + - diff --git a/spring-batch-infrastructure/src/site/apt/index.apt b/spring-batch-infrastructure/src/site/apt/index.apt index 11434fe7d..c3228a4f4 100644 --- a/spring-batch-infrastructure/src/site/apt/index.apt +++ b/spring-batch-infrastructure/src/site/apt/index.apt @@ -8,8 +8,15 @@ Introduction This module provides framework code for the Spring Batch project. - The core interfaces are <<>> and - <<>>. The main implementations are + The core interfaces are <<>>, <<>>, + <<>> and <<>>. + + The reader and writer interfaces are implemented in some generic + ways to help users with I/O in a transactional envionment. Spring + Batch provides some file-based (flat file and xml) implementations + and some database implementations. + + The main implementations of the repeat and retry interfaces are <<>> and <<>>. Example usage: +--- diff --git a/spring-batch-infrastructure/src/site/site.xml b/spring-batch-infrastructure/src/site/site.xml index 08e086d1c..372e1dac3 100644 --- a/spring-batch-infrastructure/src/site/site.xml +++ b/spring-batch-infrastructure/src/site/site.xml @@ -3,26 +3,12 @@ Spring Batch: ${project.name} + index.html - - images/shim.gif - - - - - - - - org.springframework.maven.skins - maven-spring-skin - 1.0.4 - - - diff --git a/spring-batch-integration/src/site/site.xml b/spring-batch-integration/src/site/site.xml index b3fe5eca5..29c288783 100644 --- a/spring-batch-integration/src/site/site.xml +++ b/spring-batch-integration/src/site/site.xml @@ -1,23 +1,9 @@ - - Spring Batch: ${project.name} - - - images/shim.gif - - - - - - org.springframework.maven.skins - maven-spring-skin - 1.0.2 - + - diff --git a/spring-batch-samples/.springBeans b/spring-batch-samples/.springBeans index 2eef2bbdd..dd95a7479 100644 --- a/spring-batch-samples/.springBeans +++ b/spring-batch-samples/.springBeans @@ -1,10 +1,11 @@ 1 - + + src/main/resources/jobs/fixedLengthImportJob.xml src/main/resources/jobs/multilineJob.xml diff --git a/spring-batch-samples/src/site/site.xml b/spring-batch-samples/src/site/site.xml index 28f22faa1..56a12dcc8 100644 --- a/spring-batch-samples/src/site/site.xml +++ b/spring-batch-samples/src/site/site.xml @@ -1,28 +1,9 @@ - - Spring Batch: ${project.name} - - - - images/shim.gif - - - - - - - - org.springframework.maven.skins - maven-spring-skin - 1.0.3 - - - diff --git a/src/site/site.xml b/src/site/site.xml index e881dae1c..fdc3b3bb5 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -2,7 +2,7 @@ ${project.name} - http://www.springframework.org/ + http://www.springframework.org/spring-batch images/shim.gif @@ -17,21 +17,25 @@ - + - + + + + + - - - + + +