svn commit: r1331043 - in /qpid/trunk/qpid/doc/book/src: ./ css/ java-broker/ java-broker/images/ java-broker/images/jmx_console/

[rgodfrey]

Author: rgodfrey
Date: Thu Apr 26 19:26:49 2012
New Revision: 1331043

URL: http://svn.apache.org/viewvc?rev=1331043&view=rev
Log:
QPID-3722 : Tidy up Makefile and images

Added:
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113098.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113098.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113099.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113099.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113100.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113100.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113101.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113101.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113102.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113102.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113103.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113103.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113104.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113104.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113105.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113105.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113106.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113106.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113107.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113107.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113108.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113108.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113109.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113109.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113110.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113110.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113111.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113111.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113112.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113112.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113113.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113113.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113114.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113114.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113115.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113115.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113116.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113116.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113117.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113117.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113118.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113118.png
    qpid/trunk/qpid/doc/book/src/java-broker/images/3113119.png
      - copied unchanged from r1331004, qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/3113119.png
Removed:
    qpid/trunk/qpid/doc/book/src/Makefile
    qpid/trunk/qpid/doc/book/src/css/
    qpid/trunk/qpid/doc/book/src/java-broker/images/jmx_console/
Modified:
    qpid/trunk/qpid/doc/book/src/Makefile.inc
    qpid/trunk/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-User-Guide.xml

Modified: qpid/trunk/qpid/doc/book/src/Makefile.inc
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Makefile.inc?rev=1331043&r1=1331042&r2=1331043&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Makefile.inc (original)
+++ qpid/trunk/qpid/doc/book/src/Makefile.inc Thu Apr 26 19:26:49 2012
@@ -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

Modified: qpid/trunk/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-User-Guide.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-User-Guide.xml?rev=1331043&r1=1331042&r2=1331043&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-User-Guide.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-User-Guide.xml Thu Apr 26 19:26:49 2012
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]