Remove duplicate imagedata from reference guide

Prior to this commit many imagedata elements were duplicated in
order to configure PDF sizes. Since HTML generation is configured
to ignore image scaling altogether this was unnecessary duplication.

Issue: SPR-10033

src/reference/docbook/aop.xml

@@ -2657,16 +2657,10 @@ public @interface Idempotent {
       be seen below.</para>
 
       <para><mediaobject>
-          <imageobject role="fo">
+          <imageobject>
             <imagedata align="center"
                        fileref="images/aop-proxy-plain-pojo-call.png"
-                       format="PNG" />
-          </imageobject>
-
-          <imageobject role="html">
-            <imagedata align="center"
-                       fileref="images/aop-proxy-plain-pojo-call.png"
-                       format="PNG" />
+                       format="PNG" width="400"/>
           </imageobject>
         </mediaobject></para>
 
@@ -2685,14 +2679,9 @@ public @interface Idempotent {
       a proxy. Consider the following diagram and code snippet.</para>
 
       <para><mediaobject>
-          <imageobject role="fo">
-            <imagedata align="center" fileref="images/aop-proxy-call.png"
-                       format="PNG" />
-          </imageobject>
-
-          <imageobject role="html">
+          <imageobject>
             <imagedata align="center" fileref="images/aop-proxy-call.png"
-                       format="PNG" />
+                       format="PNG" width="400" />
           </imageobject>
         </mediaobject></para>
 

src/reference/docbook/beans-scopes.xml

@@ -121,13 +121,8 @@
       bean return the cached object.</para>
 
     <para><mediaobject>
-      <imageobject role="fo">
-        <imagedata align="center" fileref="images/singleton.png" format="PNG"
-            width="400"/>
-      </imageobject>
-
-      <imageobject role="html">
-        <imagedata align="center" fileref="images/singleton.png" format="PNG"/>
+      <imageobject>
+        <imagedata align="center" fileref="images/singleton.png" format="PNG" width="400" />
       </imageobject>
       </mediaobject></para>
 
@@ -167,13 +162,8 @@
       diagram.</emphasis><!--First it says diagram illustrates scope, but then says it's not typical of a prototype scope. Why not use realistic one? --></para>
 
     <para><mediaobject>
-      <imageobject role="fo">
-        <imagedata align="center" fileref="images/prototype.png" format="PNG"
-            width="400" />
-      </imageobject>
-
-      <imageobject role="html">
-        <imagedata align="center" fileref="images/prototype.png" format="PNG"/>
+      <imageobject>
+        <imagedata align="center" fileref="images/prototype.png" format="PNG" width="400"/>
       </imageobject>
       </mediaobject></para>
 

src/reference/docbook/beans.xml

@@ -112,8 +112,7 @@ The footnote should x-ref to first section in that chapter but I can't find the
 
     <para><mediaobject>
       <imageobject>
-        <imagedata align="center" fileref="images/container-magic.png"
-          format="PNG" width="400" />
+        <imagedata align="center" fileref="images/container-magic.png" format="PNG" width="250" />
       </imageobject>
 
       <caption><para>The Spring IoC container</para></caption>

src/reference/docbook/dao.xml

@@ -63,14 +63,8 @@
     hierarchy.)</para>
 
     <mediaobject>
-      <imageobject role="fo">
-        <imagedata align="center" fileref="images/DataAccessException.gif"
-            format="PNG" width="400"/>
-      </imageobject>
-
-      <imageobject role="html">
-        <imagedata align="center" fileref="images/DataAccessException.gif"
-            format="PNG" width="400"/>
+      <imageobject>
+        <imagedata align="center" fileref="images/DataAccessException.gif" format="PNG" width="400" />
       </imageobject>
     </mediaobject>
   </section>

src/reference/docbook/mvc.xml

@@ -235,13 +235,8 @@
     Spring Web MVC shares with many other leading web frameworks).</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
-          <imagedata align="center" fileref="images/mvc.png" format="PNG"
-              width="400" />
-        </imageobject>
-
-        <imageobject role="html">
-          <imagedata align="center" fileref="images/mvc.png" format="PNG" />
+        <imageobject>
+          <imagedata align="center" fileref="images/mvc.png" format="PNG" width="400"/>
         </imageobject>
 
         <caption><para>The request processing workflow in Spring Web MVC (high
@@ -319,14 +314,8 @@
     new scope-specific beans local to a given Servlet instance.</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
-          <imagedata align="center" fileref="images/mvc-contexts.gif"
-                     format="GIF" width="400" />
-        </imageobject>
-
-        <imageobject role="html">
-          <imagedata align="center" fileref="images/mvc-contexts.gif"
-                     format="GIF" />
+        <imageobject>
+          <imagedata align="center" fileref="images/mvc-contexts.gif" format="GIF" width="400" />
         </imageobject>
 
         <caption>Context hierarchy in Spring Web MVC</caption>

src/reference/docbook/overview.xml

@@ -99,14 +99,8 @@ TR: This section doesn't read well and I think we should try to rewrite it.-->Nu
     Instrumentation, and Test, as shown in the following diagram.</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
-          <imagedata align="left" fileref="images/spring-overview.png"
-                     format="PNG" width="400" />
-        </imageobject>
-
-        <imageobject role="html">
-          <imagedata align="center" fileref="images/spring-overview.png"
-                     format="PNG" />
+        <imageobject>
+          <imagedata align="center" fileref="images/spring-overview.png" format="PNG" width="400" />
         </imageobject>
 
         <caption><para>Overview of the Spring Framework</para></caption>
@@ -261,14 +255,8 @@ TR: OK. Added to diagram.--></para>
     web framework integration.</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
-          <imagedata align="center" fileref="images/overview-full.png"
-                     format="PNG" width="400" />
-        </imageobject>
-
-        <imageobject role="html">
-          <imagedata align="center" fileref="images/overview-full.png"
-                     format="PNG" />
+        <imageobject>
+          <imagedata align="center" fileref="images/overview-full.png" format="PNG" width="400" />
         </imageobject>
 
         <caption><para>Typical full-fledged Spring web
@@ -291,17 +279,12 @@ TR: OK. Added to diagram.--></para>
     that transform HTTP parameters to values for your domain model.</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
+        <imageobject>
           <imagedata align="center"
                      fileref="images/overview-thirdparty-web.png" format="PNG"
                      width="400"/>
         </imageobject>
 
-        <imageobject role="html">
-          <imagedata align="center"
-                     fileref="images/overview-thirdparty-web.png" format="PNG" />
-        </imageobject>
-
         <caption><para>Spring middle-tier using a third-party web
         framework</para></caption>
       </mediaobject></para>
@@ -318,16 +301,10 @@ TR: OK. Added to diagram.--></para>
     layer.</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
+        <imageobject>
           <imagedata align="center" fileref="images/overview-remoting.png"
                      format="PNG" width="400" />
         </imageobject>
-
-        <imageobject role="html">
-          <imagedata align="center" fileref="images/overview-remoting.png"
-                     format="PNG" />
-        </imageobject>
-
         <caption><para>Remoting usage scenario</para></caption>
       </mediaobject></para>
 
@@ -338,16 +315,10 @@ TR: OK. Added to diagram.--></para>
     difficult.</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
+        <imageobject>
           <imagedata align="center" fileref="images/overview-ejb.png"
                      format="PNG" width="400" />
         </imageobject>
-
-        <imageobject role="html">
-          <imagedata align="center" fileref="images/overview-ejb.png"
-                     format="PNG" />
-        </imageobject>
-
         <caption><para>EJBs - Wrapping existing POJOs</para></caption>
       </mediaobject></para>
 

src/reference/docbook/oxm.xml

@@ -189,26 +189,11 @@ public interface Unmarshaller {
             <para>
                 The O/X Mapping exception hierarchy is shown in the following figure:
                 <mediaobject>
-                    <imageobject role="fo">
+                    <imageobject>
                       <imagedata align="center" fileref="images/oxm-exceptions.png"
                           format="PNG" width="400"/>
                     </imageobject>
-                    <caption>
-                        <para>
-                            O/X Mapping exception hierarchy
-                        </para>
-                    </caption>
-                </mediaobject>
-                <mediaobject>
-                    <imageobject role="html">
-                      <imagedata align="center" fileref="images/oxm-exceptions.png"
-                          format="PNG" width="400"/>
-                    </imageobject>
-                    <caption>
-                        <para>
-                            O/X Mapping exception hierarchy
-                        </para>
-                    </caption>
+                    <caption>O/X Mapping exception hierarchy</caption>
                 </mediaobject>
             </para>
         </section>

src/reference/docbook/transaction.xml

@@ -721,14 +721,10 @@ would be rolled back, not necessarily following the EJB rules-->
 TR: OK AS IS. images don't show up in the editor, but they do show up in the generated docs-->
 
       <para><mediaobject>
-          <imageobject role="fo">
+          <imageobject>
             <imagedata align="center" fileref="images/tx.png" format="PNG"
                 width="400"/>
           </imageobject>
-
-          <imageobject role="html">
-            <imagedata align="center" fileref="images/tx.png" format="PNG" />
-          </imageobject>
         </mediaobject></para>
     </section>
 
@@ -1869,17 +1865,11 @@ TR: REVISED, PLS REVIEW - changed it back; it's not just settings, the section d
         <title>Required</title>
 
         <para><mediaobject>
-            <imageobject role="fo">
-              <imagedata align="center" fileref="images/tx_prop_required.png"
-                  format="PNG" width="400"/>
-            </imageobject>
-
-            <imageobject role="html">
+            <imageobject>
               <imagedata align="center" fileref="images/tx_prop_required.png"
                   format="PNG" width="400"/>
             </imageobject>
-
-              <caption><para>PROPAGATION_REQUIRED</para></caption>
+            <caption>PROPAGATION_REQUIRED</caption>
             </mediaobject></para>
 
         <para>When the propagation setting is
@@ -1916,7 +1906,7 @@ TR: REVISED, PLS REVIEW - changed it back; it's not just settings, the section d
             <imageobject>
               <imagedata align="center"
                          fileref="images/tx_prop_requires_new.png"
-                         format="PNG" />
+                         format="PNG" width="400" />
             </imageobject>
 
             <caption><para>PROPAGATION_REQUIRES_NEW</para></caption>