From 7c08d8dd3927d5e28e344aa980c4eada6c012015 Mon Sep 17 00:00:00 2001
From: dhgarrette <dhgarrette@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Sun, 7 Jun 2009 01:34:24 +0000
Subject: [PATCH] BATCH-1270: Adjusted image sizes

---
 .../docbook/reference/common-patterns.xml     |  8 ++---
 src/site/docbook/reference/domain.xml         | 14 ++++-----
 src/site/docbook/reference/glossary.xml       |  4 +--
 src/site/docbook/reference/job.xml            | 31 +++++++++----------
 .../docbook/reference/readersAndWriters.xml   | 30 +++++++++---------
 src/site/docbook/reference/scalability.xml    |  6 ++--
 .../docbook/reference/schema-appendix.xml     | 12 +++----
 .../docbook/reference/spring-batch-intro.xml  |  6 ++--
 src/site/docbook/reference/step.xml           | 16 +++++-----
 src/site/docbook/reference/testing.xml        |  3 +-
 src/site/docbook/reference/whatsnew.xml       | 31 +++++++++----------
 11 files changed, 79 insertions(+), 82 deletions(-)

diff --git a/src/site/docbook/reference/common-patterns.xml b/src/site/docbook/reference/common-patterns.xml
index 754f7862a..4d4328eb8 100644
--- a/src/site/docbook/reference/common-patterns.xml
+++ b/src/site/docbook/reference/common-patterns.xml
@@ -313,12 +313,12 @@ public void update(ExecutionContext executionContext) {
     <mediaobject>
       <imageobject role="html">
         <imagedata align="center" fileref="images/drivingQueryExample.png"
-                   scale="80" width="" />
+                   scale="80" />
       </imageobject>
 
       <imageobject role="fo">
         <imagedata align="center" fileref="images/drivingQueryExample.png"
-                   width="66%" />
+                   scale="35" />
       </imageobject>
     </mediaobject>
 
@@ -332,12 +332,12 @@ public void update(ExecutionContext executionContext) {
     <mediaobject>
       <imageobject role="html">
         <imagedata align="center" fileref="images/drivingQueryJob.png"
-                   scale="80" width="66%" />
+                   scale="85" />
       </imageobject>
 
       <imageobject role="fo">
         <imagedata align="center" fileref="images/drivingQueryJob.png"
-                   width="66%" />
+                   scale="65" />
       </imageobject>
     </mediaobject>
 
diff --git a/src/site/docbook/reference/domain.xml b/src/site/docbook/reference/domain.xml
index 6bf1ad4cf..7da09a94d 100644
--- a/src/site/docbook/reference/domain.xml
+++ b/src/site/docbook/reference/domain.xml
@@ -47,13 +47,13 @@
     <imageobject role="html">
       <imagedata align="center"
                  fileref="images/spring-batch-reference-model.png"
-                 format="PNG" scale="80" />
+                 format="PNG" scale="100" />
     </imageobject>
 
     <imageobject role="fo">
       <imagedata align="center"
                  fileref="images/spring-batch-reference-model.png"
-                 format="PNG" scale="40" />
+                 format="PNG" scale="55" />
     </imageobject>
 
     <caption><para>Figure 2.1: Batch Stereotypes</para></caption>
@@ -78,12 +78,12 @@
     <mediaobject>
       <imageobject role="html">
         <imagedata align="center" fileref="images/job-heirarchy.png"
-                   scale="80" />
+                   scale="100" />
       </imageobject>
 
       <imageobject role="fo">
         <imagedata align="center" fileref="images/job-heirarchy.png"
-                   scale="40" />
+                   scale="60" />
       </imageobject>
     </mediaobject>
 
@@ -173,13 +173,13 @@
           <imageobject role="html">
             <imagedata align="center"
                        fileref="images/job-stereotypes-parameters.png"
-                       scale="80" />
+                       scale="100" />
           </imageobject>
 
           <imageobject role="fo">
             <imagedata align="center"
                        fileref="images/job-stereotypes-parameters.png"
-                       scale="40" />
+                       scale="60" />
           </imageobject>
         </mediaobject></para>
 
@@ -564,7 +564,7 @@
 
       <imageobject role="fo">
         <imagedata align="center" fileref="images/jobHeirarchyWithSteps.png"
-                   scale="40" />
+                   scale="60" />
       </imageobject>
     </mediaobject>
 
diff --git a/src/site/docbook/reference/glossary.xml b/src/site/docbook/reference/glossary.xml
index e599e7adc..9b4892e11 100644
--- a/src/site/docbook/reference/glossary.xml
+++ b/src/site/docbook/reference/glossary.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE glossary PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<glossary>
+<glossary id="glossary">
   <glossdiv>
     <title>Spring Batch Glossary</title>
 
@@ -213,4 +213,4 @@
       </glossdef>
     </glossentry>
   </glossdiv>
-</glossary>
\ No newline at end of file
+</glossary>
diff --git a/src/site/docbook/reference/job.xml b/src/site/docbook/reference/job.xml
index e65881e9f..43a55e1ef 100644
--- a/src/site/docbook/reference/job.xml
+++ b/src/site/docbook/reference/job.xml
@@ -10,13 +10,14 @@
   <mediaobject>
     <imageobject role="html">
       <imagedata align="center"
-                 fileref="images/spring-batch-reference-model.png" scale="80" />
+                 fileref="images/spring-batch-reference-model.png"
+                 format="PNG" scale="100" />
     </imageobject>
 
     <imageobject role="fo">
       <imagedata align="center"
-                 fileref="images/spring-batch-reference-model.png" scale="40"
-                 width="75%" />
+                 fileref="images/spring-batch-reference-model.png"
+                 format="PNG" scale="55" />
     </imageobject>
   </mediaobject>
 
@@ -397,14 +398,12 @@ catch (JobRestartException e) {
     <mediaobject>
       <imageobject role="html">
         <imagedata align="center"
-                   fileref="images/job-launcher-sequence-sync.png" scale="90"
-                   width="66%" />
+                   fileref="images/job-launcher-sequence-sync.png" scale="90" />
       </imageobject>
 
       <imageobject role="fo">
         <imagedata align="center"
-                   fileref="images/job-launcher-sequence-sync.png" scale="70"
-                   width="66%" />
+                   fileref="images/job-launcher-sequence-sync.png" scale="35" />
       </imageobject>
     </mediaobject>
 
@@ -419,14 +418,12 @@ catch (JobRestartException e) {
     <mediaobject>
       <imageobject role="html">
         <imagedata align="center"
-                   fileref="images/job-launcher-sequence-async.png" scale="90"
-                   width="66%" />
+                   fileref="images/job-launcher-sequence-async.png" scale="90" />
       </imageobject>
 
       <imageobject role="fo">
         <imagedata align="center"
-                   fileref="images/job-launcher-sequence-async.png" scale="70"
-                   width="66%" />
+                   fileref="images/job-launcher-sequence-async.png" scale="35" />
       </imageobject>
     </mediaobject>
 
@@ -635,12 +632,12 @@ catch (JobRestartException e) {
       job asynchronously:<mediaobject>
           <imageobject role="html">
             <imagedata align="center" fileref="images/launch-from-request.png"
-                       width="40%" />
+                       scale="75" />
           </imageobject>
 
           <imageobject role="fo">
             <imagedata align="center" fileref="images/launch-from-request.png"
-                       scale="80" width="40%" />
+                       scale="35" />
           </imageobject>
         </mediaobject></para>
 
@@ -683,12 +680,12 @@ public class JobLauncherController {
     <mediaobject>
       <imageobject role="html">
         <imagedata align="center" fileref="images/job-repository.png"
-                   width="40%" />
+                   scale="60" />
       </imageobject>
 
       <imageobject role="fo">
         <imagedata align="center" fileref="images/job-repository.png"
-                   scale="80" width="40%" />
+                   scale="50" />
       </imageobject>
     </mediaobject>
 
@@ -705,12 +702,12 @@ public class JobLauncherController {
     <mediaobject>
       <imageobject role="html">
         <imagedata align="center" fileref="images/job-repository-advanced.png"
-                   width="65%" />
+                   role="70" />
       </imageobject>
 
       <imageobject role="fo">
         <imagedata align="center" fileref="images/job-repository-advanced.png"
-                   scale="70" width="65%" />
+                   scale="45" />
       </imageobject>
     </mediaobject>
 
diff --git a/src/site/docbook/reference/readersAndWriters.xml b/src/site/docbook/reference/readersAndWriters.xml
index eae2ab122..b5e3fa7c6 100644
--- a/src/site/docbook/reference/readersAndWriters.xml
+++ b/src/site/docbook/reference/readersAndWriters.xml
@@ -1437,14 +1437,14 @@ assertEquals(born, values[2]);</programlisting>
     corresponding to individual records:</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
-          <imagedata align="center" fileref="images/xmlinput.png" format="PNG"
-                     scale="80" width="40%" />
-        </imageobject>
-
         <imageobject role="html">
           <imagedata align="center" fileref="images/xmlinput.png" format="PNG"
-                     scale="70" />
+                     scale="65" />
+        </imageobject>
+
+        <imageobject role="fo">
+          <imagedata align="center" fileref="images/xmlinput.png" format="PNG"
+                     scale="45" />
         </imageobject>
 
         <caption><para>Figure 3.1: XML Input</para></caption>
@@ -1463,14 +1463,14 @@ assertEquals(born, values[2]);</programlisting>
     following:</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
-          <imagedata align="center" fileref="images/oxm-fragments.png"
-                     format="PNG" scale="80" width="40%" />
-        </imageobject>
-
         <imageobject role="html">
           <imagedata align="center" fileref="images/oxm-fragments.png"
-                     format="PNG" scale="50" />
+                     format="PNG" scale="60" />
+        </imageobject>
+
+        <imageobject role="fo">
+          <imagedata align="center" fileref="images/oxm-fragments.png"
+                     format="PNG" scale="45" />
         </imageobject>
 
         <caption><para>Figure 3.2: OXM Binding</para></caption>
@@ -1764,7 +1764,7 @@ staxItemWriter.write(trade);</programlisting>
 
         <imageobject role="fo">
           <imagedata align="center" fileref="images/cursorExample.png"
-                     scale="40" />
+                     scale="35" />
         </imageobject>
       </mediaobject>
 
@@ -2230,7 +2230,7 @@ itemReader.close(executionContext);</programlisting>
       <para><mediaobject>
           <imageobject role="html">
             <imagedata align="center" fileref="images/errorOnFlush.png"
-                       scale="80" />
+                       scale="95" />
           </imageobject>
 
           <imageobject role="fo">
@@ -2257,7 +2257,7 @@ itemReader.close(executionContext);</programlisting>
       <mediaobject>
         <imageobject>
           <imagedata align="center" fileref="images/errorOnWrite.png"
-                     scale="80" />
+                     scale="95" />
         </imageobject>
 
         <imageobject role="fo">
diff --git a/src/site/docbook/reference/scalability.xml b/src/site/docbook/reference/scalability.xml
index d27c0e505..0f265626f 100644
--- a/src/site/docbook/reference/scalability.xml
+++ b/src/site/docbook/reference/scalability.xml
@@ -124,7 +124,7 @@
     <mediaobject>
       <imageobject>
         <imagedata align="center" fileref="images/remote-chunking.png"
-                   scale="70" width="75%" />
+                   scale="85" />
       </imageobject>
     </mediaobject>
 
@@ -173,7 +173,7 @@
     <mediaobject>
       <imageobject>
         <imagedata align="center" fileref="images/partitioning-overview.png"
-                   scale="70" width="75%" />
+                   scale="80" />
       </imageobject>
     </mediaobject>
 
@@ -197,7 +197,7 @@
     <mediaobject>
       <imageobject>
         <imagedata align="center" fileref="images/partitioning-spi.png"
-                   scale="70" width="75%" />
+                   scale="90" />
       </imageobject>
     </mediaobject>
 
diff --git a/src/site/docbook/reference/schema-appendix.xml b/src/site/docbook/reference/schema-appendix.xml
index 1309941e9..9bf439dec 100644
--- a/src/site/docbook/reference/schema-appendix.xml
+++ b/src/site/docbook/reference/schema-appendix.xml
@@ -26,14 +26,14 @@
     their relationships to one another:</para>
 
     <mediaobject>
-      <imageobject role="fo">
-        <imagedata align="center" fileref="images/meta-data-erd.png"
-                   scale="80" width="" />
-      </imageobject>
-
       <imageobject role="html">
         <imagedata align="center" fileref="images/meta-data-erd.png"
-                   scale="80" width="45%" />
+                   scale="80" />
+      </imageobject>
+
+      <imageobject role="fo">
+        <imagedata align="center" fileref="images/meta-data-erd.png"
+                   scale="45" />
       </imageobject>
     </mediaobject>
 
diff --git a/src/site/docbook/reference/spring-batch-intro.xml b/src/site/docbook/reference/spring-batch-intro.xml
index 68a5eea0b..0d940acdb 100644
--- a/src/site/docbook/reference/spring-batch-intro.xml
+++ b/src/site/docbook/reference/spring-batch-intro.xml
@@ -168,18 +168,20 @@
   <section id="springBatchArchitecture">
     <title id="s.1.1">Spring Batch Architecture</title>
 
+    <para></para>
+
     <para>Spring Batch is designed with extensibility and a diverse group of
     end users in mind. The figure below shows a sketch of the layered
     architecture that supports the extensibility and ease of use for end-user
     developers. <mediaobject>
         <imageobject role="fo">
           <imagedata align="center" fileref="images/spring-batch-layers.png"
-                     format="PNG" scale="40" width="35%" />
+                     format="PNG" scale="40" />
         </imageobject>
 
         <imageobject role="html">
           <imagedata align="center" fileref="images/spring-batch-layers.png"
-                     format="PNG" scale="40" scalefit="" width="35%" />
+                     format="PNG" scale="40" />
         </imageobject>
 
         <caption><para>Figure 1.1: Spring Batch Layered
diff --git a/src/site/docbook/reference/step.xml b/src/site/docbook/reference/step.xml
index c659e6d95..27bfa1070 100644
--- a/src/site/docbook/reference/step.xml
+++ b/src/site/docbook/reference/step.xml
@@ -19,11 +19,11 @@
 
   <mediaobject>
     <imageobject role="html">
-      <imagedata align="center" fileref="images/step.png" scale="50" />
+      <imagedata align="center" fileref="images/step.png" scale="60" />
     </imageobject>
 
     <imageobject role="fo">
-      <imagedata align="center" fileref="images/step.png" scale="30" />
+      <imagedata align="center" fileref="images/step.png" scale="50" />
     </imageobject>
   </mediaobject>
 
@@ -42,12 +42,12 @@
     <mediaobject>
       <imageobject role="html">
         <imagedata align="center"
-                   fileref="images/chunk-oriented-processing.png" scale="75" />
+                   fileref="images/chunk-oriented-processing.png" scale="100" />
       </imageobject>
 
       <imageobject role="fo">
         <imagedata align="center"
-                   fileref="images/chunk-oriented-processing.png" scale="75" />
+                   fileref="images/chunk-oriented-processing.png" scale="55" />
       </imageobject>
     </mediaobject>
 
@@ -1115,12 +1115,12 @@ itemWriter.write(items);</programlisting>
       <mediaobject>
         <imageobject role="html">
           <imagedata align="center" fileref="images/sequential-flow.png"
-                     scale="80" />
+                     scale="20" />
         </imageobject>
 
         <imageobject role="fo">
           <imagedata align="center" fileref="images/sequential-flow.png"
-                     scale="40" />
+                     scale="45" />
         </imageobject>
       </mediaobject>
 
@@ -1169,12 +1169,12 @@ itemWriter.write(items);</programlisting>
       failure? <mediaobject>
           <imageobject role="html">
             <imagedata align="center" fileref="images/conditional-flow.png"
-                       scale="" width="40%" />
+                       scale="50" />
           </imageobject>
 
           <imageobject role="fo">
             <imagedata align="center" fileref="images/conditional-flow.png"
-                       width="40%" />
+                       scale="50" />
           </imageobject>
         </mediaobject></para>
 
diff --git a/src/site/docbook/reference/testing.xml b/src/site/docbook/reference/testing.xml
index 56a6257af..4a586efda 100644
--- a/src/site/docbook/reference/testing.xml
+++ b/src/site/docbook/reference/testing.xml
@@ -154,7 +154,8 @@ AssertFile.assertFileEquals(new FileSystemResource(EXPECTED_FILE),
 @Test
 public void testAfterStep() {
     <emphasis role="bold">StepExecution stepExecution = new StepExecution("NoProcessingStep",
-                new JobExecution(new JobInstance(1L, new JobParameters(), "NoProcessingJob")));</emphasis>
+                new JobExecution(new JobInstance(1L, new JobParameters(), 
+                                 "NoProcessingJob")));</emphasis>
 
     stepExecution.setReadCount(0);
 
diff --git a/src/site/docbook/reference/whatsnew.xml b/src/site/docbook/reference/whatsnew.xml
index 18bcfafce..e717846c7 100644
--- a/src/site/docbook/reference/whatsnew.xml
+++ b/src/site/docbook/reference/whatsnew.xml
@@ -84,8 +84,7 @@
 
       <imageobject role="fo">
         <imagedata align="center"
-                   fileref="images/item-oriented-processing.png" scale="60"
-                   width="50%" />
+                   fileref="images/item-oriented-processing.png" scale="60" />
       </imageobject>
     </mediaobject>
 
@@ -151,7 +150,7 @@
       <imageobject role="fo">
         <imagedata align="center"
                    fileref="images/simplified-chunk-oriented-processing.png"
-                   scale="60" width="60%" />
+                   scale="60" />
       </imageobject>
     </mediaobject>
 
@@ -209,13 +208,11 @@ itemWriter.write(items);</programlisting>
 
       <mediaobject>
         <imageobject role="html">
-          <imagedata align="center" fileref="images/1-1-step.png" scale="50"
-                     width="50%" />
+          <imagedata align="center" fileref="images/1-1-step.png" scale="60" />
         </imageobject>
 
         <imageobject role="fo">
-          <imagedata align="center" fileref="images/1-1-step.png" scale="30"
-                     width="50%" />
+          <imagedata align="center" fileref="images/1-1-step.png" scale="50" />
         </imageobject>
       </mediaobject>
 
@@ -226,12 +223,12 @@ itemWriter.write(items);</programlisting>
       <mediaobject>
         <imageobject role="html">
           <imagedata align="center" fileref="images/composite-transformer.png"
-                     scale="80" width="70%" />
+                     scale="95" />
         </imageobject>
 
         <imageobject role="fo">
           <imagedata align="center" fileref="images/composite-transformer.png"
-                     scale="40" width="" />
+                     scale="55" />
         </imageobject>
       </mediaobject>
 
@@ -247,11 +244,11 @@ itemWriter.write(items);</programlisting>
 
       <mediaobject>
         <imageobject role="html">
-          <imagedata align="center" fileref="images/step.png" scale="50" />
+          <imagedata align="center" fileref="images/step.png" scale="60" />
         </imageobject>
 
         <imageobject role="fo">
-          <imagedata align="center" fileref="images/step.png" scale="30" />
+          <imagedata align="center" fileref="images/step.png" scale="50" />
         </imageobject>
       </mediaobject>
     </section>
@@ -303,12 +300,12 @@ itemWriter.write(items);</programlisting>
     <mediaobject>
       <imageobject role="html">
         <imagedata align="center" fileref="images/job-repository-advanced.png"
-                   scale="90" width="" />
+                   scale="115" />
       </imageobject>
 
       <imageobject role="fo">
         <imagedata align="center" fileref="images/job-repository-advanced.png"
-                   scale="60" width="" />
+                   scale="60" />
       </imageobject>
     </mediaobject>
 
@@ -328,12 +325,12 @@ itemWriter.write(items);</programlisting>
     <mediaobject>
       <imageobject role="html">
         <imagedata align="center" fileref="images/sequential-flow.png"
-                   scale="50" />
+                   scale="20" />
       </imageobject>
 
       <imageobject role="fo">
         <imagedata align="center" fileref="images/sequential-flow.png"
-                   scale="50" width="" />
+                   scale="45" />
       </imageobject>
     </mediaobject>
 
@@ -342,12 +339,12 @@ itemWriter.write(items);</programlisting>
     <mediaobject>
       <imageobject role="html">
         <imagedata align="center" fileref="images/conditional-flow.png"
-                   scale="50" width="" />
+                   scale="50" />
       </imageobject>
 
       <imageobject role="fo">
         <imagedata align="center" fileref="images/conditional-flow.png"
-                   scale="50" width="" />
+                   scale="45" />
       </imageobject>
     </mediaobject>