QPID-3722 : Tidy up Makefile and images

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1331043 13f79535-47bb-0310-9956-ffa450edef68

26 files changed, 38 insertions, 350 deletions

diff --git a/qpid/doc/book/src/Makefile b/qpid/doc/book/src/Makefile
deleted file mode 100644
index 7ae82ba754..0000000000
--- a/qpid/doc/book/src/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-DIRS = java-broker cpp-broker programming
-
-
-.PHONY: all $(DIRS)
-
-all: $(DIRS)     
-
-clean: TARGET = clean
-clean: all
-
-html: TARGET = html
-html: all
-
-pdf: TARGET = pdf
-pdf: all
-
-$(DIRS):
-	$(MAKE) -C $@ $(TARGET) OUTPUTDIR=../../build/
-
diff --git a/qpid/doc/book/src/Makefile.inc b/qpid/doc/book/src/Makefile.inc
index ee42cc3ea3..12cab54f8a 100644
--- a/qpid/doc/book/src/Makefile.inc
+++ b/qpid/doc/book/src/Makefile.inc
@@ -18,14 +18,26 @@
 #
 
 BOOK=$(wildcard *Book.xml)
+XML=$(wildcard *.xml) $(wildcard ../common/*.xml)
+IMAGES=$(wildcard images/*.png) 
+CSS=$(wilcard ../common/css/*.css)
+
 OUTPUTDIR=output
 OUTPUT= $(BOOK:%.xml=$(OUTPUTDIR)/%/)
 
-all: html pdf
+all: html pdf 
+
+pdf: $(OUTPUT)/pdf $(BOOK:%.xml=$(OUTPUT)/pdf/%.pdf) 
 
-pdf: $(OUTPUT)/html $(BOOK:%.xml=$(OUTPUT)/pdf/%.pdf)
+html: $(OUTPUT)/html $(BOOK:%.xml=$(OUTPUT)/html/index.html) 
 
-html: $(OUTPUT)/pdf $(BOOK:%.xml=output/%/html/index.html)
+$(OUTPUT)/html/images: $(IMAGES)
+	-mkdir -p $(OUTPUT)/html/images
+	-cp images/*.png $(OUTPUT)/html/images/
+
+$(OUTPUT)/html/css: $(CSS)
+	-mkdir -p $(OUTPUT)/html/css
+	-cp ../common/css/*.css $(OUTPUT)/html/css
 
 $(OUTPUT)/html:
 	-mkdir -p $(OUTPUT)/html
@@ -33,14 +45,7 @@ $(OUTPUT)/html:
 $(OUTPUT)/pdf:
 	-mkdir -p $(OUTPUT)/pdf
 
-$(OUTPUT)/html/images:
-	cp -R images $(OUTPUT)/html
-
-$(OUTPUT)/html/css:
-	-mkdir -p $(OUTPUT)/html/css
-	cp -R ../common/css $(OUTPUT)/html
-
-output/%/html/index.html: %.xml $(OUTPUT)/html/css $(OUTPUT)/html/images
+$(OUTPUT)/html/index.html: $(BOOK) $(OUTPUT)/html/css $(OUTPUT)/html/images $(XML)
 	xsltproc -o $(OUTPUT)/html/ --xinclude --stringparam  chunk.section.depth 1  --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 --stringparam use.id.as.filename 1 --stringparam html.stylesheet css/style.css --stringparam section.autolabel.max.depth 3 --stringparam toc.section.depth 2 --stringparam chunker.output.encoding UTF-8 --stringparam css.decoration 0 ../../xsl/html-custom.xsl $<
 
 %.fo: %.xml
diff --git a/qpid/doc/book/src/css/style.css b/qpid/doc/book/src/css/style.css
deleted file mode 100644
index c681596592..0000000000
--- a/qpid/doc/book/src/css/style.css
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-ul {
-    list-style-type:square;
-}
-
-th { 
-    font-weight: bold;
-}
-
-.navfooter td { 
-    font-size:10pt;
-}
-
-.navheader td { 
-    font-size:10pt;
-}
-
-body {
-    margin:0;
-    background:#FFFFFF;
-    font-family:"Verdana", sans-serif;
-    font-size:10pt;
-}
-
-.container {
-    width:950px;
-    margin:0 auto;
-}
-
-body a {
-    color:#000000;
-}
-
-
-div.book {
-    margin-left:10pt;
-    margin-right:10pt;
-}
-
-div.preface {
-    margin-left:10pt;
-    margin-right:10pt;
-}
-
-div.chapter {
-    margin-left:10pt;
-    margin-right:10pt;
-}
-
-div.section {
-    margin-left:10pt;
-    margin-right:10pt;
-}
-
-div.titlepage {
-    margin-left:-10pt;
-    margin-right:-10pt;
-}
-
-.calloutlist td {
-    font-size:10pt;
-}
-
-.table-contents table {
-    border-spacing: 0px;
-}
-
-.table-contents td {
-    font-size:10pt;
-    padding-left:6px;
-    padding-right:6px;
-}
-
-div.breadcrumbs {
-    font-size:9pt;
-    margin-right:10pt;
-    padding-bottom:16px;
-}
-
-.chapter h2.title {
-    font-size:20pt;
-    color:#0c3b82;
-}
-
-.chapter .section h2.title {
-    font-size:18pt;
-    color:#0c3b82;
-}
-
-.section h2.title {
-    font-size:16pt;
-    color:#0c3b82;
-}
-
-.section h3.title {
-    font-size:14pt;
-    color:#0c3b82;
-}
-
-.section h4.title {
-    font-size:12pt;
-    color:#0c3b82;
-}
-
-.section h5.title {
-    font-size:12pt;
-    color:#0c3b82;
-}
-
-.section h6.title {
-    font-size:12pt;
-    color:#0c3b82;
-}
-
-.toc a {
-    font-size:9pt;
-}
-
-.header {
-    height:100px;
-    width:950px;
-    background:url(http://qpid.apache.org/images/header.png)
-}
-
-.logo {
-    text-align:center;
-    font-weight:600;
-    padding:0 0 0 0;
-    font-size:14px;
-    font-family:"Verdana", cursive;
-}
-
-.logo a {
-    color:#000000;
-    text-decoration:none;
-}
-
-.main_text_area {
-    margin-left:200px;
-}
-
-.main_text_area_top {
-    height:14px;
-    font-size:1px;
-}
-
-.main_text_area_bottom {
-    display:none;
-/*  height:14px;
-    margin-bottom:4px;*/
-}
-
-.main_text_area_body {
-    padding:5px 24px;
-}
-
-.main_text_area_body p {
-    text-align:justify;
-}
-
-.main_text_area br {
-    line-height:10px;
-}
-
-.main_text_area h1 {
-    font-size:28px;
-    font-weight:600;
-    margin:0 0 24px 0;
-    color:#0c3b82;
-    font-family:"Verdana", Times, serif;
-}
-
-.main_text_area h2 {
-    font-size:24px;
-    font-weight:600;
-    margin:24px 0 8px 0;
-    color:#0c3b82;
-    font-family:"Verdana",Times, serif;
-}
-
-.main_text_area ol, .main_text_area ul {
-    padding:0;
-    margin:10px 0;
-    margin-left:20px;
-}
-
-.main_text_area li {
-/*    margin-left:40px; */
-}
-
-.main_text_area, .menu_box {
-    font-size:13px;
-    line-height:17px;
-    color:#000000;
-}
-
-.main_text_area {
-    font-size:14px;
-}
-
-.main_text_area a {
-    color:#000000;
-}
-
-.main_text_area a:hover {
-    color:#000000;
-}
-
-.menu_box {
-    width:196px;
-    float:left;
-    margin-left:4px;
-}
-
-.menu_box_top {
-    background:url(http://qpid.apache.org/images/menu_top.png) no-repeat; 
-    height:14px;
-    font-size:1px;
-}
-
-.menu_box_body {
-    background:url(http://qpid.apache.org/images/menu_body.png) repeat-y; 
-    padding:5px 24px 5px 24px;
-}
-
-.menu_box_bottom {
-    background:url(http://qpid.apache.org/images/menu_bottom.png) no-repeat; 
-    height:14px;
-    font-size:1px;
-    margin-bottom:1px;
-}
-
-.menu_box h3 {
-    font-size:20px;
-    font-weight:500;
-    margin:0 0 8px 0;
-    color:#0c3b82;
-    font-family:"Verdana",Times, serif;
-}
-
-.menu_box ul {
-    margin:12px;
-    padding:0px;
-}
-
-.menu_box li {
-    list-style:square; 
-}
-
-.menu_box a {
-    color:#000000;
-    text-decoration:none;
-}
-
-.menu_box a:hover {
-    color:#000000;
-    text-decoration:underline;
-}
-
-
diff --git a/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-User-Guide.xml b/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-User-Guide.xml
index 55e1f8e829..35bb5dfbe8 100644
--- a/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-User-Guide.xml
+++ b/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-User-Guide.xml
@@ -178,7 +178,7 @@
             connection tree, disconnecting the selected server connection,
             and removing the server from the connection tree.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113098.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113098.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
             
             
             Beside these buttons is a combo for selecting the refresh
@@ -202,7 +202,7 @@
             hostname, management port, and a username and password. An
             example is shown below:
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113099.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113099.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             
             Once all the required details are entered, pressing Connect will
@@ -214,7 +214,7 @@
             VirtualHosts present on the server, as can be seen in the figure
             below.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113100.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113100.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             
             If the server supports a newer management API than the console in
@@ -284,7 +284,7 @@
             the left side of the application. To open a particular MBean from
             the tree for viewing, simply select it in the tree and it will be
             opened in the main view.
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113101.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113101.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             As there may be vast numbers of Queues, Connections, and
             Exchanges on the server these MBeans are not automatically added
@@ -302,7 +302,7 @@
             from the tree by right clicking on them to expose a context menu
             allowing deletion.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113102.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113102.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             As an alternative way to open a particular MBean for viewing,
             without first adding it to the tree, you can simply double click
@@ -334,7 +334,7 @@
             without a restart, and can be performed by clicking the Execute
             button and confirming the prompt which follows.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113103.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113103.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para>
 <!--h1--></section>
 
@@ -362,7 +362,7 @@
 
 	 <para>
             
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113104.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113104.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             The Runtime Options tab allows manipulation of the logging
             settings without affecting the configuration files (this means
@@ -395,7 +395,7 @@
             parent by setting it to an INHERITED level that removes any
             previously set Level of its own.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113105.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113105.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             In order to set one of more Loggers to a new Level, they should
             be selected in the table (or double click an individual Logger to
@@ -436,7 +436,7 @@
             Loggers and use the button to load the dialog to set the new
             Level.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113106.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113106.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             One issue to note of when reloading the configuration file
             settings, either automatically using LogWatch or manually, is
@@ -469,7 +469,7 @@
 
 	 <para>
             
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113107.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113107.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             The ServerInformation MBean currently only conveys various pieces
             of version information to allow precise identification of the
@@ -490,13 +490,13 @@
             allows manipulation of existing user accounts and creation of new
             user accounts.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113108.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113108.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             
             To add a new user, press the <emphasis>Add New User</emphasis> button, which
             will load the dialog shown below.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113109.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113109.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             Here you may enter the new users Username, Password, and select
             their JMX Management Rights. This controls whether or not they
@@ -561,7 +561,7 @@
             The console will prompt for confirmation before undertaking the
             operation.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113110.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113110.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             Clicking the <emphasis>Create</emphasis> button in the Exchange section will
             open a dialog allowing specification of the Name, Type, and
@@ -602,7 +602,7 @@
             MBeans in that VirtualHost. An example of this can be seen in the
             figure below.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113111.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113111.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             All received Notifications will be displayed until such time as
             the user removes them, either in this aggregated view, or in the
@@ -638,7 +638,7 @@
             Attributes</emphasis> button at the bottom right corner of the
             table)<emphasis>.</emphasis>
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113112.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113112.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             Upon opening a Queue MBean, the Attributes tab is displayed, as
             shown below. This allows viewing the value all attributes,
@@ -647,7 +647,7 @@
             their purpose, and graphing certain numerical attribute values as
             they change over time.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113113.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113113.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             The next tab contains the operations that can be performed on the
             queue. The main table serves as a means of viewing the messages
@@ -664,7 +664,7 @@
             information to show this (unless only a single message position
             is requested).
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113114.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113114.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             Upon selecting a message in the table, its header properties and
             redelivery status are updated in the area below the table. Double
@@ -700,7 +700,7 @@
             fashion as described for Queues, again showing an Attributes tab
             initially, with the Operations tab next:
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113115.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113115.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             Of the four default Exchange Types <emphasis>(direct, fanout, headers,
             and topic)</emphasis> all but <emphasis>headers</emphasis> have their bindings
@@ -711,12 +711,12 @@
             button opens a dialog allowing association of an existing queue
             with the entered Binding.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113116.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113116.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             The <emphasis>headers</emphasis> Exchange type (default instantiation
             <emphasis>amq.match or amq.headers</emphasis>) is presented as below:
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113117.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113117.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             In the previous figure, the left table indicates the binding
             number, and the Queue associated with the binding. Selecting one
@@ -724,7 +724,7 @@
             the header values that control when the binding matches an
             incoming message.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113118.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113118.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             Pressing the <emphasis>Create</emphasis> button when managing a
             <emphasis>headers</emphasis> Exchange opens a dialog allowing creation of a
@@ -760,7 +760,7 @@
             Notifications. The Operations tab can be seen in the figure
             below.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113119.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113119.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
             The main table shows the properties of all the Channels that are
             present on the Connection, including whether they are
             <emphasis>Transactional</emphasis>, the <emphasis>Number of Unacked Messages</emphasis>
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113098.png b/qpid/doc/book/src/java-broker/images/3113098.png
index 7de85030c6..7de85030c6 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113098.png
+++ b/qpid/doc/book/src/java-broker/images/3113098.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113099.png b/qpid/doc/book/src/java-broker/images/3113099.png
index fb6fc65d73..fb6fc65d73 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113099.png
+++ b/qpid/doc/book/src/java-broker/images/3113099.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113100.png b/qpid/doc/book/src/java-broker/images/3113100.png
index a7d727b854..a7d727b854 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113100.png
+++ b/qpid/doc/book/src/java-broker/images/3113100.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113101.png b/qpid/doc/book/src/java-broker/images/3113101.png
index 30731277c2..30731277c2 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113101.png
+++ b/qpid/doc/book/src/java-broker/images/3113101.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113102.png b/qpid/doc/book/src/java-broker/images/3113102.png
index f150a21b10..f150a21b10 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113102.png
+++ b/qpid/doc/book/src/java-broker/images/3113102.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113103.png b/qpid/doc/book/src/java-broker/images/3113103.png
index a91efb4306..a91efb4306 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113103.png
+++ b/qpid/doc/book/src/java-broker/images/3113103.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113104.png b/qpid/doc/book/src/java-broker/images/3113104.png
index c5ef12d8b1..c5ef12d8b1 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113104.png
+++ b/qpid/doc/book/src/java-broker/images/3113104.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113105.png b/qpid/doc/book/src/java-broker/images/3113105.png
index b155f9d9a1..b155f9d9a1 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113105.png
+++ b/qpid/doc/book/src/java-broker/images/3113105.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113106.png b/qpid/doc/book/src/java-broker/images/3113106.png
index 22bcdd084e..22bcdd084e 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113106.png
+++ b/qpid/doc/book/src/java-broker/images/3113106.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113107.png b/qpid/doc/book/src/java-broker/images/3113107.png
index cf5dd97e89..cf5dd97e89 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113107.png
+++ b/qpid/doc/book/src/java-broker/images/3113107.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113108.png b/qpid/doc/book/src/java-broker/images/3113108.png
index c0e5eafde2..c0e5eafde2 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113108.png
+++ b/qpid/doc/book/src/java-broker/images/3113108.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113109.png b/qpid/doc/book/src/java-broker/images/3113109.png
index 139d81d849..139d81d849 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113109.png
+++ b/qpid/doc/book/src/java-broker/images/3113109.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113110.png b/qpid/doc/book/src/java-broker/images/3113110.png
index 2207f15cd7..2207f15cd7 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113110.png
+++ b/qpid/doc/book/src/java-broker/images/3113110.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113111.png b/qpid/doc/book/src/java-broker/images/3113111.png
index 5737f41caf..5737f41caf 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113111.png
+++ b/qpid/doc/book/src/java-broker/images/3113111.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113112.png b/qpid/doc/book/src/java-broker/images/3113112.png
index d9ee094ab4..d9ee094ab4 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113112.png
+++ b/qpid/doc/book/src/java-broker/images/3113112.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113113.png b/qpid/doc/book/src/java-broker/images/3113113.png
index e80812f83c..e80812f83c 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113113.png
+++ b/qpid/doc/book/src/java-broker/images/3113113.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113114.png b/qpid/doc/book/src/java-broker/images/3113114.png
index b237181150..b237181150 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113114.png
+++ b/qpid/doc/book/src/java-broker/images/3113114.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113115.png b/qpid/doc/book/src/java-broker/images/3113115.png
index 84ad42b567..84ad42b567 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113115.png
+++ b/qpid/doc/book/src/java-broker/images/3113115.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113116.png b/qpid/doc/book/src/java-broker/images/3113116.png
index 18b979792f..18b979792f 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113116.png
+++ b/qpid/doc/book/src/java-broker/images/3113116.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113117.png b/qpid/doc/book/src/java-broker/images/3113117.png
index 3b33ef67ac..3b33ef67ac 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113117.png
+++ b/qpid/doc/book/src/java-broker/images/3113117.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113118.png b/qpid/doc/book/src/java-broker/images/3113118.png
index 60451f88cf..60451f88cf 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113118.png
+++ b/qpid/doc/book/src/java-broker/images/3113118.png
diff --git a/qpid/doc/book/src/java-broker/images/jmx_console/3113119.png b/qpid/doc/book/src/java-broker/images/3113119.png
index 16ded074bd..16ded074bd 100644
--- a/qpid/doc/book/src/java-broker/images/jmx_console/3113119.png
+++ b/qpid/doc/book/src/java-broker/images/3113119.png