qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject svn commit: r1480684 [1/2] - in /qpid/branches/0.22/qpid: ./ doc/ doc/book/src/java-broker/ doc/book/src/java-broker/images/
Date Thu, 09 May 2013 15:17:34 GMT
Author: orudyy
Date: Thu May  9 15:17:33 2013
New Revision: 1480684

URL: http://svn.apache.org/r1480684
Log:
QPID-4685: Update documentation to reflect changes to configuration

merged from trunk r1480672

Added:
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Web-Management.xml
      - copied unchanged from r1480672, qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Web-Management.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Ports.xml
      - copied unchanged from r1480672, qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Ports.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml
      - copied unchanged from r1480672, qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/images/Broker-Model.png
      - copied unchanged from r1480672, qpid/trunk/qpid/doc/book/src/java-broker/images/Broker-Model.png
    qpid/branches/0.22/qpid/doc/book/src/java-broker/images/VirtualHost-Model.png
      - copied unchanged from r1480672, qpid/trunk/qpid/doc/book/src/java-broker/images/VirtualHost-Model.png
Removed:
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Protocols.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Queues-Messaging-Groups.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Security-Users-And-Groups.xml
Modified:
    qpid/branches/0.22/qpid/   (props changed)
    qpid/branches/0.22/qpid/doc/   (props changed)
    qpid/branches/0.22/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Authentication-Providers.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Exchanges.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Other-Services.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Ports.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Queues.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Virtual-Hosts.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-JMX.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-REST-API.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Web-Console.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Exchanges.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Queues.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Handling-Undeliverable-Messages.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Producer-Transaction-Timeout.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Security-ACLs.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Security-Authentication-Providers.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Security-Group-Providers.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Security-SSL.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Security.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Stores-BDB-Store.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Stores-Derby-Store.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Stores-HA-BDB-Store.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Stores-Memory-Store.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Stores-SQL-Store.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Stores.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts.xml
    qpid/branches/0.22/qpid/doc/book/src/java-broker/images/Management-Web-Console.png

Propchange: qpid/branches/0.22/qpid/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid:r1480672

Propchange: qpid/branches/0.22/qpid/doc/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/doc:r1480672

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml Thu May  9 15:17:33 2013
@@ -27,11 +27,12 @@
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Installation.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Getting-Started.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Concepts.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Configuring-And-Managing.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Ports.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Virtual-Hosts.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Exchanges.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Queues.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Stores.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Configuring-And-Managing.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Security.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Runtime.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-High-Availability.xml"/>

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Authentication-Providers.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Authentication-Providers.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Authentication-Providers.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Authentication-Providers.xml Thu May  9 15:17:33 2013
@@ -22,5 +22,31 @@
 
 <section id="Java-Broker-Concepts-Authentication-Providers">
 <title>Authentication Providers</title>
-
+<para><emphasis>Authentication Providers</emphasis> authenticate AMQP and non-AMQP connections on Broker <emphasis>Ports</emphasis>.
+Multiple <emphasis>Authentication Providers</emphasis> can be configured on the Broker at the same time,
+however, only one can be assigned to the concrete Port.</para>
+<para>
+    The following authentication providers are implemented and supported:
+    <itemizedlist>
+        <listitem><para><link linkend= "Java-Broker-Security-Anonymous-Provider">Anonymous</link>
+        allows anonymous connections to the broker</para></listitem>
+        <listitem><para><link linkend= "Java-Broker-Security-External-Provider">External</link>
+        delegates authentication to the external authentication mechanisms like Client Certificate Authentication etc</para></listitem>
+        <listitem><para><link linkend= "Java-Broker-Security-Kerberos-Provider">Kerberos</link>
+        uses GSS-API SASL mechanism to authenticate connections</para></listitem>
+        <listitem><para><link linkend= "Java-Broker-Security-LDAP-Provider">SimpleLDAP</link>
+        authenticate users against LDAP server.</para></listitem>
+        <listitem><para><link linkend= "Java-Broker-Security-PlainPasswordFile-Provider">PlainPasswordFile</link>
+        authenticate users against credentials stored in local file.</para></listitem>
+        <listitem><para><link linkend= "Java-Broker-Security-Base64MD5PasswordFile-Provider">Base64MD5PasswordFile</link>
+        similar to the above but the password credentials are encoded and different SASL mechanisms are used for authentication.</para></listitem>
+    </itemizedlist>
+</para>
+<para><emphasis>Authentication Providers</emphasis> can be split into two categories:
+    <itemizedlist>
+        <listitem><para><emphasis>User managing providers</emphasis> allowing to add/delete credentials using Broker management interfaces.</para></listitem>
+        <listitem><para><emphasis>User non-managing providers</emphasis> using externally stored credentials for authentication.</para></listitem>
+    </itemizedlist>
+</para>
+<para>The configuration details for Authentication Providers are covered in <xref linkend= "Java-Broker-Security-Authentication-Providers"/>.</para>
 </section>

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Exchanges.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Exchanges.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Exchanges.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Exchanges.xml Thu May  9 15:17:33 2013
@@ -22,5 +22,27 @@
 
 <section id="Java-Broker-Concepts-Exchanges">
 <title>Exchanges</title>
-
+<para><emphasis>Exchange</emphasis> is the named entity within the <emphasis>Virtual Host</emphasis> which receives messages from producer applications and
+optionally routes them to message queues within the <emphasis>Virtual Host</emphasis>. The message routing occurs based on exchange routing algorithm
+and queue <emphasis>Bindings</emphasis>.</para>
+<para>
+The following <emphasis>Exchanges</emphasis> are implemented and supported by the <emphasis>Broker</emphasis>:
+    <itemizedlist>
+        <listitem><para><emphasis>Direct Exchange</emphasis> provides routing of messages to zero or more queues based on an exact match between
+the routing key of the message, and the binding key used to bind the queue to the exchange
+        </para></listitem>
+        <listitem><para><emphasis>Topic Exchange</emphasis> provides routing to bound queues based on a pattern match between the binding key and the
+routing key of the message. This exchange type is used to support the classic publish/subscribe paradigm using a topic namespace as the
+addressing model to select and deliver messages across multiple consumers based on a partial or full match on a topic pattern.
+        </para></listitem>
+        <listitem><para><emphasis>Fanout Exchange</emphasis> provides routing of messages to all bound queues regardless of the message's routing key.
+        </para></listitem>
+        <listitem><para><emphasis>Headers Exchange</emphasis> provides routing based on header properties within the AMQP message.
+        The message is passed to the queue if the headers property matches the arguments with which the queue was bound.
+        </para></listitem>
+     </itemizedlist>
+</para>
+<para>Also, Broker supports the concept of a Default Exchange to which all queues are bound using their name as a binding key.</para>
+<para>Any number of exchanges of any type can be created on <emphasis>Virtual Host</emphasis>.</para>
+<para>Exchange configuration is covered in <xref linkend="Java-Broker-Exchanges"/>.</para>
 </section>

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Other-Services.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Other-Services.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Other-Services.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Other-Services.xml Thu May  9 15:17:33 2013
@@ -22,5 +22,34 @@
 
 <section id="Java-Broker-Concepts-Other-Services">
 <title>Other Services</title>
+<para>The Broker can also contain Access Control Providers, Group Providers, Keystore, Trustores and Management Plugins.</para>
+
+    <section id="Java-Broker-Concepts-Access-Control-Providers">
+        <title>Access Control Providers</title>
+        <para><emphasis>Access Control Providers</emphasis> are used to authorize the access to the various Broker objects.</para>
+        <para>The ACL configuration and management details are covered in <xref linkend="Java-Broker-Security-ACLs"/>.</para>
+    </section>
+
+    <section id="Java-Broker-Concepts-Group-Providers">
+        <title>Group Providers</title>
+        <para><emphasis>Group Providers</emphasis> are used to aggregate Broker authenticated principals into groups
+        which can be used to define ACL rules applicable to the whole group.</para>
+        <para>The Group Provider configuration and management is covered in <xref linkend="Java-Broker-Security-Group-Providers"/>.</para>
+    </section>
+
+    <section id="Java-Broker-Keystore-Providers">
+        <title>Keystores</title>
+        <para><emphasis>Keystore</emphasis> are used to configure keystores holding SSL keys and certificates
+        for the SSL transports on Ports.</para>
+        <para>The Keystore configuration and management is covered in <xref linkend="Java-Broker-SSL-Keystore"/>.</para>
+    </section>
+
+    <section id="Java-Broker-Truststore-Providers">
+        <title>Truststores</title>
+        <para><emphasis>Truststore </emphasis> are used to configure keystores holding SSL certificates
+        for Client Certificate Authentication on SSL ports.
+        </para>
+        <para>The Truststore configuration and management is covered in <xref linkend="SSL-Truststore-ClientCertificate"/>.</para>
+    </section>
 
 </section>

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Ports.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Ports.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Ports.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Ports.xml Thu May  9 15:17:33 2013
@@ -22,5 +22,29 @@
 
 <section id="Java-Broker-Concepts-Ports">
 <title>Ports</title>
+<para><emphasis>Port</emphasis> is a named broker entity serving as a communications end-point
+and providing the AMQP transport layer over the given TCP port. The particular AMQP protocols can be configured on the Port.
+As result, different <emphasis>Ports</emphasis> can support different protocols. Any number of <emphasis>Ports</emphasis>
+can be configured on the Broker.</para>
+<para>
+    The following AMQP protocols are currently supported by the Broker:
+    <itemizedlist>
+        <listitem><para><emphasis>AMQP 0.8</emphasis></para></listitem>
+        <listitem><para><emphasis>AMQP 0.9</emphasis></para></listitem>
+        <listitem><para><emphasis>AMQP 0.9.1</emphasis></para></listitem>
+        <listitem><para><emphasis>AMQP 0.10</emphasis></para></listitem>
+        <listitem><para><emphasis>AMQP 1.0</emphasis></para></listitem>
+    </itemizedlist>
+</para>
+<para>Ports are also responsible for the authentication of all incoming connections
+by mean of <emphasis>Authentication Provider</emphasis> configured on the Port.
+Each Port can have its own <emphasis>Authentication Provider</emphasis>.</para>
 
+<para>Both TCP and SSL transports are supported and can be configured on the <emphasis>Ports</emphasis>.
+AMQP ports also support Client Certificate Authentication.</para>
+
+<para>Besides AMQP ports HTTP and JMX ports can be configured for use by management plugins.
+They can be configured by specifying HTTP and RMI/JMX_RMI protocols respectively.</para>
+
+<para>Configuration details for the Ports are covered in <xref linkend="Java-Broker-Ports"/>.</para>
 </section>

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Queues.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Queues.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Queues.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Queues.xml Thu May  9 15:17:33 2013
@@ -22,5 +22,18 @@
 
 <section id="Java-Broker-Concepts-Queues">
 <title>Queues</title>
-
+<para>Message queues are named entities that store messages in memory or on the disk and deliver them in sequence
+to connected consumer applications.</para>
+<para>The queues are hosted by the <link linkend="Java-Broker-Concepts-Virtual-Hosts">Virtual Hosts</link>.
+Any number of queues can be created on <emphasis>Virtual Host</emphasis>.</para>
+<para>The following types of Queues are currently supported:
+    <itemizedlist>
+        <listitem><para><link linkend="Java-Broker-Queues">Simple</link> is a simple FIFO queue</para></listitem>
+        <listitem><para><link linkend="Java-Broker-Queues-OtherTypes-Priority">Priority</link> where messages delivery order depends from the message priority</para></listitem>
+        <listitem><para><link linkend="Java-Broker-Queues-OtherTypes-Sorted">Sorted</link> where messages delivery order depends from the message sorting key value</para></listitem>
+        <listitem><para><link linkend="Java-Broker-Queues-OtherTypes-LVQ">Last Value Queue</link> automatically discards older message when
+        a newer message arrives with the same key value</para></listitem>
+     </itemizedlist>
+</para>
+<para>Queue configuration details are covered in <xref linkend="Java-Broker-Queues"/>.</para>
 </section>

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Virtual-Hosts.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Virtual-Hosts.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Virtual-Hosts.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Virtual-Hosts.xml Thu May  9 15:17:33 2013
@@ -22,5 +22,36 @@
 
 <section id="Java-Broker-Concepts-Virtual-Hosts">
 <title>Virtual Hosts</title>
-
+<para>Broker comprises from one or many <emphasis>Virtual Hosts</emphasis>.
+<emphasis>Virtual Host</emphasis> can be defined as a collection of exchanges, message queues and associated objects and
+is an independent server domain that share a common authentication, encryption and transport environment.
+</para>
+<para>
+    The following diagram depicts the Virtual Host model:
+    <figure>
+        <title>Virtual Host Model</title>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/VirtualHost-Model.png" format="PNG" scalefit="1"/>
+          </imageobject>
+          <textobject>
+            <phrase>Virtual Host Model</phrase>
+          </textobject>
+        </mediaobject>
+    </figure>
+</para>
+<para>Each <emphasis>Virtual Host</emphasis> has its own <emphasis>Message Store</emphasis>
+which is used to store the persistent messages from all <link linkend="Java-Broker-Concepts-Queues">Queues</link>
+declared on the <emphasis>Virtual Host</emphasis>.</para>
+<para>
+    The following message stores are currently supported:
+    <itemizedlist>
+        <listitem><para><link linkend="Java-Broker-Stores-SQL-Store">JDBC Message Store</link></para></listitem>
+        <listitem><para><link linkend="Java-Broker-Stores-Derby-Store">Derby Message Store</link></para></listitem>
+        <listitem><para><link linkend="Java-Broker-Stores-BDB-Store">Berkeley DB Message Store</link></para></listitem>
+        <listitem><para><link linkend="Java-Broker-Stores-HA-BDB-Store">Berkeley DB HA Message Store</link></para></listitem>
+        <listitem><para><link linkend="Java-Broker-Stores-Memory-Store">Memory Message Store</link></para></listitem>
+     </itemizedlist>
+</para>
+<para>Virtual Hosts configuration is covered in <xref linkend="Java-Broker-Virtual-Hosts"/>.</para>
 </section>

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Concepts.xml Thu May  9 15:17:33 2013
@@ -22,11 +22,37 @@
 
 <chapter  id="Java-Broker-Concepts">
     <title>Concepts</title>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Concepts-Virtual-Hosts.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Concepts-Exchanges.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Concepts-Queues.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Concepts-Ports.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Concepts-Protocols.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Concepts-Authentication-Providers.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Concepts-Other-Services.xml"/>
+
+    <section id="Java-Broker-Concepts-Broker">
+        <title>Broker</title>
+        <para>The Qpid Broker can be defined as a collection of <emphasis>Virtual Hosts</emphasis> (independent containers of <emphasis>Queues</emphasis>,
+        <emphasis>Exchanges</emphasis>, etc) sharing the same authentication model provided by the broker <emphasis>Authentication Providers</emphasis>
+        and the transport model defined as <emphasis>Port</emphasis> configured objects. The authorization model is either provided by the broker
+        <emphasis>Access Control Providers</emphasis> or <emphasis>Access Control List</emphasis> defined on the <emphasis>Virtual Hosts</emphasis>.
+        The Broker also provides the management plugins to manage and configure Broker's and Virtual Hosts' configured objects.
+        Additionally, <emphasis>Keystores</emphasis> and <emphasis>Truststores</emphasis> can be defined on the broker level to configure Port SSL transports.
+        The <emphasis>Group Providers</emphasis> can be configured to use groups with <emphasis>ACL Providers</emphasis>.
+        </para>
+        <para>
+        The following diagram depicts the Broker model:
+        <figure>
+            <title>Broker Model</title>
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="images/Broker-Model.png" format="PNG" scalefit="1"/>
+              </imageobject>
+              <textobject>
+                <phrase>Broker Model</phrase>
+              </textobject>
+            </mediaobject>
+        </figure>
+        </para>
+    </section>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Concepts-Virtual-Hosts.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Concepts-Exchanges.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Concepts-Queues.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Concepts-Ports.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Concepts-Authentication-Providers.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Concepts-Other-Services.xml"/>
 </chapter>

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml Thu May  9 15:17:33 2013
@@ -21,158 +21,156 @@
 -->
 
 <section id="Java-Broker-Configuring-And-Managing-Config-Files">
-<title>Config Files</title>
+<title>Broker Configuration</title>
 
-    <para>
-        This section shows how to configure and manage broker.
-    </para>
-
-    <section role="h2" id="Java-Broker-Configuring-And-Managing-Config-Files-Configuration">
-        <title>Configuration file</title>
-        <para>Broker can be configured using XML configuration files. By default, broker is looking for configuration file at ${QPID_HOME}/etc/config.xml. The default configuration location can be overridden by specifying command line option <emphasis>-c &lt;path to configuration&gt;</emphasis> on broker start up.</para>
-    </section>
+    <para>This section provides the details about broker configuration store.</para>
 
-    <section role="h2" id="Java-Broker-Configuring-And-Managing-Config-Files-Management">
-        <title>Management Configuration</title>
-        <para>
-        Management interfaces can be configured in <emphasis>management</emphasis> section of broker configuration file. The example of the management section is provided below.
+    <section id="Java-Broker-Configuring-And-Managing-Configuration-Store-Introduction">
+        <title>Configuration store</title>
+        <para>The Broker has a configuration store and provides management interfaces to manage the broker components.
+        The configuration for each broker component is stored in the store as a configuration entry.
+        The following configuration entries can be stored there:
+        <itemizedlist>
+            <listitem><para>Broker</para></listitem>
+            <listitem><para>Port</para></listitem>
+            <listitem><para>Authentication Provider</para></listitem>
+            <listitem><para>Virtual Host</para></listitem>
+            <listitem><para>Access Control Provider</para></listitem>
+            <listitem><para>Group Provider</para></listitem>
+            <listitem><para>Key store</para></listitem>
+            <listitem><para>Trust store</para></listitem>
+            <listitem><para>Plugin</para></listitem>
+        </itemizedlist>
         </para>
-         <example>
-    <title>Management configuration</title>
-    <programlisting><![CDATA[
-    <broker>
-    ...
-        <management>
-            <enabled>true</enabled>
-            <jmxport>
-                <registryServer>8999</registryServer>
-            </jmxport>
-            <ssl>
-                <enabled>false</enabled>
-                <keyStorePath>${conf}/qpid.keystore</keyStorePath>
-                <keyStorePassword>password</keyStorePassword>
-            </ssl>
-            <http>
-                <enabled>true</enabled>
-            </http>
-            <https>
-                <enabled>false</enabled>
-            </https>
-        </management>
-    ...
-    </broker>]]></programlisting>
-  </example>
-    </section>
-    <section role="h2" id="Java-Broker-Configuring-And-Managing-Config-Files-JMX-Management">
-        <title>JMX Management Configuration</title>
+        <para>When broker is started for a first time a configuration store is created automatically from
+        the internal initial configuration. The created broker configuration is placed into broker working folder
+        if the broker configuration store location is not specified.</para>
+        <para>The predefined initial configuration can be overridden using command line argument <emphasis>-icp</emphasis>
+        with path to the initial configuration as in the example below:</para>
+        <screen>
+$ ./qpid-server -icp ./my-initial-configuration.json
+        </screen>
+        <para>In this example the initial configuration from file "./my-initial-configuration.json" is used
+        to create the broker configuration store on the broker startup.</para>
+        <para>If broker configuration store already exists the command line argument <emphasis>-icp</emphasis> with the path
+        to a custom initial configuration is ignored. The command line argument <emphasis>-os</emphasis> can be used
+        to force the (re)creation of broker configuration store from initial store even when broker configuration store exists.
+        The example below demonstrates this:</para>
+        <screen>
+$ ./qpid-server -os -icp ./my-initial-configuration.json
+        </screen>
         <para>
-        JMX management can be configured in <emphasis>management</emphasis> section of broker configuration file.
-        </para>
-        <para>An <emphasis>enabled</emphasis> element in the <emphasis>management</emphasis> section is used to enable or disable the JMX interfaces. Setting it to <emphasis>true</emphasis> causes the broker to start the management plugin if such is available on the broker classpath.</para>
-        <para>JMX management requires two ports which can be configured in <emphasis>jmxport</emphasis> sub-section of <emphasis>management</emphasis>:
+         The default initial configuration can be retrieved from the broker and stored into a file
+         using a command line argument <emphasis>-cic &lt;path to file &gt;</emphasis>, for example:</para>
+        <screen>
+$ ./qpid-server -cic ./initial-config.json
+        </screen>
+        <para>In the example above the broker default initial configuration saved at "./initial-config.json".
+        A custom initial configuration can be created from the default one by using this command line argument.</para>
+        <para>The default initial configuration declares four ports:
         <itemizedlist>
-            <listitem><para>RMI port (8999 by default) can be configured in an element <emphasis>jmxport/registryServer</emphasis></para></listitem>
-            <listitem><para>Connector port can be configured in an element <emphasis>jmxport/connectorServer</emphasis>. If configuration element <emphasis>connectorServer</emphasis> is not provided than the connector port defaults to <emphasis>100 + registryServer port</emphasis>.</para></listitem>
+            <listitem><para><emphasis>AMQP</emphasis>, the default port number is 5672. The port number
+            can be overridden using configuration parameter <emphasis>qpid.amqp_port</emphasis>.</para></listitem>
+            <listitem><para><emphasis>HTTP</emphasis>, the default port number is 8080. The port number
+            can be overridden using configuration parameter <emphasis>qpid.HTTP_port</emphasis>.</para></listitem>
+            <listitem><para><emphasis>RMI</emphasis>, the default port number is 8999. The port number
+            can be overridden using configuration parameter <emphasis>qpid.rmi_port</emphasis>.</para></listitem>
+            <listitem><para><emphasis>JMX</emphasis>, the default port number is 9099. The port number
+            can be overridden using configuration parameter <emphasis>qpid.jmx_port</emphasis>.</para></listitem>
         </itemizedlist>
+        It is also possible to override the port numbers in a default initial configuration using a command line
+        argument <emphasis>-prop</emphasis> like in an example below:
         </para>
-        <example>
-            <title>Enabling JMX Management and configuring JMX ports</title>
-            <programlisting>
-&lt;broker&gt;
-...
-&lt;management&gt;
-    <emphasis>&lt;enabled>true&lt;/enabled&gt;</emphasis>                     <co id="java-broker-example-jmx-management-0"/>
-    &lt;jmxport&gt;
-        <emphasis>&lt;registryServer>7999&lt;/registryServer&gt;</emphasis>   <co id="java-broker-example-jmx-management-1"/>
-        <emphasis>&lt;connectorServer>7998&lt;/connectorServer&gt;</emphasis> <co id="java-broker-example-jmx-management-2"/>
-    &lt;/jmxport&gt;
-&lt;/management&gt;
-...
-&lt;/broker&gt;</programlisting>
-        </example>
-        <para>In the snippet above the following is configured:</para>
-        <calloutlist>
-            <callout arearefs="java-broker-example-jmx-management-0"><para>Enable JMX management</para></callout>
-            <callout arearefs="java-broker-example-jmx-management-1"><para>Set RMI port to 7999</para></callout>
-            <callout arearefs="java-broker-example-jmx-management-2"><para>Set connector port to 7998</para></callout>
-        </calloutlist>
-        <para>SSL can be configured to use on the connector port in the sub-section <emphasis>ssl</emphasis> of the <emphasis>management</emphasis> section. See <xref linkend="Java-Broker-Configuring-And-Managing-Config-Files-SSL-keystore-configuration"/> for details.</para>
-        <para>In order to use SSL with JMX management an element <emphasis>ssl/enabled</emphasis> needs to be set to <emphasis>true</emphasis>.</para>
-    </section>
-    <section role="h2" id="Java-Broker-Configuring-And-Managing-Config-Files-SSL-keystore-configuration">
-        <title>Management SSL key store configuration</title>
-        <para>
-            This section describes how to configure the key store to use in SSL connections in both JMX and Web management interfaces.
+        <screen>
+$ ./qpid-server -prop qpid.amqp_port=10000 -prop qpid.http_port=10001 -prop qpid.jmx_port=10002 -prop qpid.rmi_port=10003
+        </screen>
+        <para>In the example above, port number 10000 is specified for AMQP port, port number 10001 is specified for HTTP port,
+        port number 10002 is specified for JMX port and port number 1003 is specified for RMI port. When specified,
+        these port numbers will be used to create the broker configuration store  from initial configuration on first broker start-up.
+        If configuration store already exists the settings will not have any effect. The command line argument <emphasis>-os</emphasis>
+        can be used to force (re)creation of broker configuration store from initial store.
         </para>
-        <para>The following examples demonstrates how to configure keystore for management</para>
-        <example>
-            <title>Management key store configuration</title>
-            <programlisting>
-&lt;broker&gt;
-...
-&lt;management&gt;
-...
-    &lt;ssl&gt;
-        &lt;enabled&gt;true&lt;/enabled&gt;                            <co id="java-broker-example-management-keystore-0"/>
-        &lt;keyStorePath&gt;${conf}/qpid.keystore&lt;/keyStorePath&gt; <co id="java-broker-example-management-keystore-1"/>
-        &lt;keyStorePassword&gt;password&lt;/keyStorePassword&gt;      <co id="java-broker-example-management-keystore-2"/>
-    &lt;/ssl&gt;
-...
-&lt;/management&gt;
-...
-&lt;/broker&gt;</programlisting>
-        </example>
-        <calloutlist>
-            <callout arearefs="java-broker-example-management-keystore-0"><para>Enable SSL on JMX connector port only. This setting does not effect the web management interfaces.</para></callout>
-            <callout arearefs="java-broker-example-management-keystore-1"><para>Set path to the key store file</para></callout>
-            <callout arearefs="java-broker-example-management-keystore-2"><para>Set keystore password</para></callout>
-        </calloutlist>
+        <para>The command line argument <emphasis>-sp</emphasis> is used to specify a relative or absolute path to a broker
+        configuration store to start broker with. If the store at specified location does not exist it will be created from
+        the initial configuration. It is not required to provide the path to configuration store on broker on start-up.</para>
+        <screen>
+$ ./qpid-server -sp ./my-broker-configuration.json
+        </screen>
+        <para>In the example above the broker is started with configuration store at "./my-broker-configuration.json".</para>
      </section>
-     <section role="h2" id="Java-Broker-Configuring-And-Managing-Config-Files-Web-Management">
-        <title>Web Management Configuration</title>
-        <para>
-        Web management can be configured in <emphasis>management</emphasis> section of broker configuration file.
-        </para>
-        <para>Sub-section <emphasis>http</emphasis> is used to enable web management on http port.</para>
-        <para>Sub-section <emphasis>https</emphasis> is used to enable web management on https port.</para>
-        <para>The following example shows how to configure http and https ports</para>
+
+     <section id="Java-Broker-Configuring-And-Managing-Configuration-Store-Example">
+        <title>Example of JSON configuration store</title>
+        <para>The JSON configuration store is used as a default configuration store.
+         An example of the JSON store is provided below:</para>
         <example>
-            <title>Enabling web management</title>
-            <programlisting>
-&lt;broker&gt;
-...
-&lt;management&gt;
-...
-    &lt;http&gt;
-        &lt;enabled&gt;true&lt;/enabled&gt;                       <co id="java-broker-example-management-web-0"/>
-        &lt;port&gt;9090&lt;/port&gt;                             <co id="java-broker-example-management-web-1"/>
-        &lt;basic-auth&gt;false&lt;/basic-auth&gt;                <co id="java-broker-example-management-web-2"/>
-        &lt;sasl-auth&gt;true&lt;/sasl-auth&gt;                   <co id="java-broker-example-management-web-3"/>
-        &lt;session-timeout&gt;600&lt;/session-timeout&gt;        <co id="java-broker-example-management-web-4"/>
-    &lt;/http&gt;
-
-    &lt;https&gt;
-        &lt;enabled&gt;true&lt;/enabled&gt;                       <co id="java-broker-example-management-web-5"/>
-        &lt;port&gt;9443&lt;/port&gt;                             <co id="java-broker-example-management-web-6"/>
-        &lt;sasl-auth&gt;true&lt;/sasl-auth&gt;                   <co id="java-broker-example-management-web-7"/>
-        &lt;basic-auth&gt;true&lt;/basic-auth&gt;                 <co id="java-broker-example-management-web-8"/>
-    &lt;/https&gt;
-...
-&lt;/management&gt;
-...
-&lt;/broker&gt;</programlisting>
-        </example>
-        <calloutlist>
-            <callout arearefs="java-broker-example-management-web-0"><para>Enable web management on http port. Default is true.</para></callout>
-            <callout arearefs="java-broker-example-management-web-1"><para>Set web management http port to 9090. Default is 8080.</para></callout>
-            <callout arearefs="java-broker-example-management-web-2"><para>Disable basic authentication on http port for REST services only. Default is false.</para></callout>
-            <callout arearefs="java-broker-example-management-web-3"><para>Enable SASL authentication on http port for REST services and web console. Default is true.</para></callout>
-            <callout arearefs="java-broker-example-management-web-4"><para>Set session timeout in seconds. Default is 15 minutes.</para></callout>
-            <callout arearefs="java-broker-example-management-web-5"><para>Enable web management on https port. Default is false.</para></callout>
-            <callout arearefs="java-broker-example-management-web-6"><para>Set web management https port to 9443. Default is 8443.</para></callout>
-            <callout arearefs="java-broker-example-management-web-7"><para>Enable SASL authentication on https port for REST services and web console. Default is true.</para></callout>
-            <callout arearefs="java-broker-example-management-web-8"><para>Enable basic authentication on https port for REST services only. Default is true.</para></callout>
-        </calloutlist>
-        <note><para>Please configure the keystore to use with the https web management port. See <xref linkend="Java-Broker-Configuring-And-Managing-Config-Files-SSL-keystore-configuration"/> for details.</para></note>
-     </section>
-</section>
+            <title>JSON configuration store</title>
+            <programlisting><![CDATA[
+{
+  "name" : "Broker",
+  "defaultVirtualHost" : "default",
+  "modelVersion" : "1.0",
+  "storeVersion" : 1,
+  "authenticationproviders" : [ {
+    "name" : "passwordFile",
+    "path" : "${qpid.work_dir}/etc/passwd",
+    "type" : "PlainPasswordFile"
+  } ],
+  "ports" : [ {
+    "authenticationProvider" : "passwordFile",
+    "name" : "HTTP",
+    "port" : "8080",
+    "protocols" : [ "HTTP" ]
+  }, {
+    "authenticationProvider" : "passwordFile",
+    "name" : "JMX_CONNECTOR",
+    "port" : "9099",
+    "protocols" : [ "JMX_RMI" ]
+  }, {
+    "name" : "RMI_REGISTRY",
+    "port" : "8999",
+    "protocols" : [ "RMI" ]
+  }, {
+    "name" : "AMQP",
+    "port" : "5672"
+  } ],
+  "virtualhosts" : [ {
+    "name" : "default",
+    "storePath" : "${qpid.work_dir}/derbystore/default",
+    "storeType" : "DERBY"
+  } ],
+  "plugins" : [ {
+    "name" : "jmxManagement",
+    "pluginType" : "MANAGEMENT-JMX"
+  }, {
+    "name" : "httpManagement",
+    "pluginType" : "MANAGEMENT-HTTP"
+  } ]
+}
+]]></programlisting>
+            <para>In the configuration above the following entries are stored:
+                <itemizedlist>
+                    <listitem><para>Authentication Provider of type <emphasis>PlainPasswordFile</emphasis> with name "passwordFile"</para></listitem>
+                    <listitem><para>Four Port entries: "AMQP", "HTTP", "RMI_REGISTRY", "JMX_CONNECTOR"</para></listitem>
+                    <listitem><para>Virtual Host with name "default" and DERBY message store type at location "${qpid.work_dir}/derbystore/default".</para></listitem>
+                    <listitem><para>Two management plugins: "jmxManagement" of type "MANAGEMENT-JMX" and "httpManagement" of type "MANAGEMENT-HTTP".</para></listitem>
+                    <listitem><para>Broker attributes are stored as a root entry.</para></listitem>
+                </itemizedlist>
+            </para>
+            </example>
+    </section>
+
+    <section id="Java-Broker-Attributes-Configuring">
+        <title>Configuring Broker Attributes</title>
+
+        <para>The Broker Attributes can be configured using
+        <link linkend="Java-Broker-Configuring-And-Managing-REST-API">REST Management interfaces</link>
+        and <link linkend="Java-Broker-Configuring-And-Managing-Web-Console">Web Management Console</link>.</para>
+
+        <para>The Broker attributes can be changed from Web Management Console by clicking on "Edit" button
+        on "Broker Attributes" panel from Broker tab.
+        </para>
+
+    </section>
+
+</section>
\ No newline at end of file

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-JMX.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-JMX.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-JMX.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-JMX.xml Thu May  9 15:17:33 2013
@@ -21,6 +21,16 @@
 -->
 
 <section id="Java-Broker-Configuring-And-Managing-JMX">
-<title>JMX</title>
+    <title>JMX Plugin</title>
+
+    <para>JMX Management Plugin exposes JMX management interfaces to manage the Broker.
+    It is included into initial configuration by default and starts the RMI registry and JMX connector on pre-configured RMI and JMX ports.
+    If any or both JMX Ports are missed but JMX Management Plugin entry is present in the Broker configuration the Broker fails to start.
+    Only one JMX Management Plugin can be configured on the Broker.
+    </para>
+
+    <para>JMX Management Plugin can start its own MBean server or can use a platform MBean server.
+    By default, the platform MBean server is used. This is controlled by the value of the plugin attribute "Use Platform MBean Server".
+    The value of this attribute can be changed through REST management interface but takes effect only on next Broker restart.</para>
 
 </section>

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-REST-API.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-REST-API.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-REST-API.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-REST-API.xml Thu May  9 15:17:33 2013
@@ -24,12 +24,12 @@
 <title>REST API</title>
     <section id="Java-Broker-Configuring-And-Managing-REST-API-Overview">
         <title>REST API Overview</title>
-        <para>This section provides an overview of REST management API.</para>
-        <para>If web management is enabled (see <xref linkend="Java-Broker-Configuring-And-Managing-Config-Files-Web-Management"/>) 
-            the REST API can be used to monitor and manage the broker instance.</para>
-        <para>The Qpid broker REST services support traditional REST model which uses the GET method requests to retrieve 
+        <para>This section provides an overview of REST management interfaces.</para>
+        <para>If web management plugin is configured
+            the REST interfaces can be used to monitor and manage the Broker instance.</para>
+        <para>The Qpid broker REST interfaces support traditional REST model which uses the GET method requests to retrieve
             the information about broker configured objects, DELETE method requests to delete the configured object,
-            PUT to create the configured object and POST to update the configured objects.</para>
+            PUT to create or update the configured object and POST to perform the configured objects updates not available with the PUT requests.</para>
         <para>The table below lists the available REST services with brief description how they can be used.</para>
 
        <table>
@@ -50,7 +50,7 @@
               <entry><para>/rest/broker</para></entry>
               <entry><para>Rest service to manage broker instance</para></entry>
               <entry><para>Retrieves the details of broker configuration</para></entry>
-              <entry><para>Not implemented yet</para></entry>
+              <entry><para>Updates broker attributes</para></entry>
               <entry><para>Not implemented yet</para></entry>
               <entry><para>Not implemented yet</para></entry>
             </row>
@@ -60,9 +60,9 @@
               </entry>
               <entry>Rest service to manage authentication providers on the broker</entry>
               <entry>Retrieves the details about authentication providers</entry>
+              <entry>Creates or updates authentication providers</entry>
               <entry>Not implemented yet</entry>
-              <entry>Not implemented yet</entry>
-              <entry>Not implemented yet</entry>
+              <entry>Deletes authentication providers</entry>
             </row>
             <row>
               <entry><para>/rest/user</para>
@@ -70,8 +70,8 @@
               </entry>
               <entry>Rest service to manage user account</entry>
               <entry>Retrieves the details about user account</entry>
-              <entry>Creates user account</entry>
-              <entry>Updates user password</entry>
+              <entry>Creates user account, updates user password</entry>
+              <entry>Not implemented yet</entry>
               <entry>Deletes user account</entry>
             </row>
             <row>
@@ -80,9 +80,9 @@
               </entry>
               <entry>Rest service to manage group providers</entry>
               <entry>Retrieves the details about group provider(s)</entry>
+              <entry>Creates group provider</entry>
               <entry>Not implemented yet</entry>
-              <entry>Not implemented yet</entry>
-              <entry>Not implemented yet</entry>
+              <entry>Deletes groups providers</entry>
             </row>
             <row>
               <entry><para>/rest/group</para>
@@ -111,20 +111,9 @@
               </entry>
               <entry>Rest service to manage broker ports(s)</entry>
               <entry>Retrieves the details about the broker port(s)</entry>
+              <entry>Creates or updates port</entry>
               <entry>Not implemented yet</entry>
-              <entry>Not implemented yet</entry>
-              <entry>Not implemented yet</entry>
-            </row>
-            <row>
-              <entry>
-                    <para>/rest/port</para>
-                    <para>/rest/port/&lt;port name&gt;</para>
-              </entry>
-              <entry>Rest service to manage broker ports(s)</entry>
-              <entry>Retrieves the details about the broker port(s)</entry>
-              <entry>Not implemented yet</entry>
-              <entry>Not implemented yet</entry>
-              <entry>Not implemented yet</entry>
+              <entry>Deletes ports</entry>
             </row>
             <row>
               <entry>
@@ -231,10 +220,50 @@
               <entry>Not implemented yet</entry>
               <entry>Not implemented yet</entry>
             </row>
+            <row>
+              <entry>
+                    <para>/rest/accesscontrolprovider</para>
+              </entry>
+              <entry>Rest service to manage access control providers</entry>
+              <entry>Retrieves the details about access control providers</entry>
+              <entry>Creates access control provider</entry>
+              <entry>Not implemented yet</entry>
+              <entry>Deletes access control provider(s)</entry>
+            </row>
+            <row>
+              <entry>
+                    <para>/rest/keystore</para>
+              </entry>
+              <entry>Rest service to manage KeyStores</entry>
+              <entry>Retrieves the details about KeyStore</entry>
+              <entry>Creates or updates KeyStore</entry>
+              <entry>Not implemented yet</entry>
+              <entry>Deletes KeyStore(s)</entry>
+            </row>
+            <row>
+              <entry>
+                    <para>/rest/truststore</para>
+              </entry>
+              <entry>Rest service to manage TrustStore</entry>
+              <entry>Retrieves the details about TrustStore</entry>
+              <entry>Creates or updates TrustStore</entry>
+              <entry>Not implemented yet</entry>
+              <entry>Deletes TrustStore(s)</entry>
+            </row>
+            <row>
+              <entry>
+                    <para>/rest/plugin</para>
+              </entry>
+              <entry>Rest service to manage plugins</entry>
+              <entry>Retrieves the details about plugins</entry>
+              <entry>Updates plugin attributes</entry>
+              <entry>Not implemented yet</entry>
+              <entry>Not implemented yet</entry>
+            </row>
           </tbody>
           </tgroup>
         </table>
-        <para>Rest URL are hierarchical. It is permitted to replace rest URL elements with an "asterisks" in GET requests to denote
+        <para>Rest URLs are hierarchical. It is permitted to replace rest URL elements with an "asterisks" in GET requests to denote
         all object of a particular type. Additionally, trailing object type in the URL hierarchy can be omitted.
         In this case GET request will return all of the object underneath of the current object.</para>
         <para>For example, for binding URL http://localhost:8080/rest/binding/&lt;vhost&gt;/&lt;exchange&gt;/&lt;queue&gt;/&lt;binding&gt;
@@ -258,6 +287,6 @@ curl -X PUT  -d '{"durable":true,"type":
 curl  -X PUT  -d '{}' http://localhost:8080/rest/binding/<vhostname>/<exchangename>/<queue-name>/<binding-name>
             ]]></programlisting>
         </example>
-        <para>Qpid broker web management console calls rest interfaces internally to manage the broker.</para>
+        <para>Qpid broker Web Management Console calls rest interfaces internally to manage the broker.</para>
     </section>
 </section>

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Web-Console.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Web-Console.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Web-Console.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Web-Console.xml Thu May  9 15:17:33 2013
@@ -22,14 +22,14 @@
 
 <section id="Java-Broker-Configuring-And-Managing-Web-Console">
     <title>Web Console</title>
-    <para>If web management is enabled (see <xref linkend="Java-Broker-Configuring-And-Managing-Config-Files-Web-Management"/>) the web management console can be accessed from web browser using URL http(s)://&lt;hostname&gt;:&lt;port&gt;/management, where</para>
+    <para>If web management is configured the Web Mnagement Console can be accessed from web browser
+    using URL http(s)://&lt;hostname&gt;:&lt;port&gt;/management, where</para>
     <itemizedlist>
         <listitem><para><emphasis>hostname</emphasis> is the broker host</para></listitem>
-        <listitem><para><emphasis>port</emphasis> is the broker port(either http or https)</para></listitem>
+        <listitem><para><emphasis>port</emphasis> is the HTTP(s) port number</para></listitem>
     </itemizedlist>
-    <para>The page like following is displayed on navigation to the management URL.</para>
-    <figure>
-      <title>Web management Console</title>
-      <graphic fileref="images/Management-Web-Console.png"/>
-    </figure>
+    <para>For authenticated and authorized user the page like below should be displayed on navigation to the management URL:</para>
+    <ulink url="images/Management-Web-Console.png">
+        <graphic fileref="images/Management-Web-Console.png" width="600px"/>
+    </ulink>
 </section>

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing.xml Thu May  9 15:17:33 2013
@@ -23,8 +23,7 @@
 <chapter id="Java-Broker-Configuring-And-Managing">
   <title>Configuring And Managing</title>
         <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Configuring-And-Managing-Config-Files.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Configuring-And-Managing-Web-Console.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Configuring-And-Managing-REST-API.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Configuring-And-Managing-Web-Management.xml"/>
         <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Configuring-And-Managing-JMX.xml"/>
         <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Configuring-And-Managing-Other-Tooling.xml"/>
 </chapter>

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Exchanges.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Exchanges.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Exchanges.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Exchanges.xml Thu May  9 15:17:33 2013
@@ -23,4 +23,29 @@
 <chapter id="Java-Broker-Exchanges">
   <title>Exchanges</title>
 
+  <section id="Java-Broker-Exchanges-Configuring">
+    <title>Configuring Virtual Host Exchanges</title>
+
+    <para>The Virtual Host Exchanges can be configured using
+    <link linkend="Java-Broker-Configuring-And-Managing-REST-API">REST Management interfaces</link>,
+    <link linkend="Java-Broker-Configuring-And-Managing-Web-Console">Web Management Console</link> and Virtual Host configuration file.</para>
+
+    <para>The following Exchange managing operations are available from Web Management Console:
+    <itemizedlist>
+        <listitem><para>A new Exchange can be added by clicking on "Add Exchange" on the Virtual Host tab.</para></listitem>
+        <listitem><para>An existing Exchange details can be viewed the Exchange tab.
+        Exchange tab is shown after clicking on Exchange name in Broker object tree or by clicking on Exchange row in Exchanges grid on Virtual Host tab.</para></listitem>
+        <listitem><para>An existing Exchange can be deleted by clicking on "Delete Exchange" button
+        on Virtual Host tab or "Delete Exchange" button on the Exchange tab.</para></listitem>
+        <listitem><para>An existing Queue can be bound to the Exchange by clicking on "Add Binding" button
+        on the Exchange tab.</para></listitem>
+        <listitem><para>An existing Queue binding can be deleted from Exchange by clicking on "Delete Binding" button
+        on the Exchange tab.</para></listitem>
+    </itemizedlist>
+    </para>
+
+    <para>An example of configuring Exchanges in Virtual Host configuration file is provided
+    in <xref linkend="Java-Broker-Virtual-Host-Configuration-Exchange"/>.</para>
+  </section>
+
 </chapter>

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml Thu May  9 15:17:33 2013
@@ -26,7 +26,11 @@
 
 <chapter id="Java-Broker-Getting-Started">
   <title>Getting Started</title>
-  <para>This section describes how to start the Java Broker for the first time.</para>
+  <para>
+    This section describes how to start the Java Broker for the first time.
+    The Broker configuration details and configuration command line arguments are described in <xref linkend="Java-Broker-Configuring-And-Managing-Configuration-Store-Introduction"/>.
+  </para>
+
   <section role="h2" id="Java-Broker-Getting-Started-Starting">
     <title>Starting/Stopping the Broker</title>
     <para>To start the Broker, use the <command>qpid-server</command> script (UNIX) or <command>qpid-server.bat</command> (Windows)
@@ -39,19 +43,19 @@
     <para>Now use the <command>qpid-server.bat</command> to start the server</para>
     <programlisting><![CDATA[bin\qpid-server.bat]]></programlisting>
     <para>Output similar to the following will be seen:</para>
-    <screen>[Broker] BRK-1006 : Using configuration : C:\qpid\qpid-broker-&qpidCurrentRelease;\etc\config.xml
+    <screen>[Broker] BRK-1006 : Using configuration : C:\qpidwork\config.json
 [Broker] BRK-1007 : Using logging configuration : C:\qpid\qpid-broker-&qpidCurrentRelease;\etc\log4j.xml
-[Broker] BRK-1001 : Startup : Version: &qpidCurrentRelease; Build: 1411386
-[Broker] BRK-1010 : Platform : JVM : Sun Microsystems Inc. version: 1.6.0_24-b07 OS : Windows 7 version: 6.1 arch: amd64
-[Broker] BRK-1011 : Maximum Memory : 1,069,416,448 bytes
-[Broker] MNG-1001 : Web Management Startup
-[Broker] MNG-1002 : Starting : HTTP : Listening on port 8080
-[Broker] MNG-1004 : Web Management Ready
+[Broker] BRK-1001 : Startup : Version: &qpidCurrentRelease; Build: 1478262
+[Broker] BRK-1010 : Platform : JVM : Oracle Corporation version: 1.7.0_21-b11 OS : Windows 7 version: 6.1 arch: x86
+[Broker] BRK-1011 : Maximum Memory : 1,060,372,480 bytes
+[Broker] BRK-1002 : Starting : Listening on TCP port 5672
 [Broker] MNG-1001 : JMX Management Startup
 [Broker] MNG-1002 : Starting : RMI Registry : Listening on port 8999
 [Broker] MNG-1002 : Starting : JMX RMIConnectorServer : Listening on port 9099
 [Broker] MNG-1004 : JMX Management Ready
-[Broker] BRK-1002 : Starting : Listening on TCP port 5672
+[Broker] MNG-1001 : Web Management Startup
+[Broker] MNG-1002 : Starting : HTTP : Listening on port 8080
+[Broker] MNG-1004 : Web Management Ready
 [Broker] BRK-1004 : Qpid Broker Ready</screen>
     <para>The BRK-1004 message confirms that the Broker is ready for work.  The MNG-1002 and BRK-1002 confirm the ports to
       which the Broker is listening (for HTTP/JMX management and AMQP respectively).</para>
@@ -65,11 +69,12 @@
     <para>Now use the <command>qpid-server</command> script to start the server:</para>
     <programlisting><![CDATA[bin\qpid-server]]></programlisting>
     <para>Output similar to the following will be seen:</para>
-    <screen>[Broker] BRK-1006 : Using configuration : /usr/local/qpid/qpid-broker-&qpidCurrentRelease;/etc/config.xml
+    <screen>[Broker] BRK-1006 : Using configuration : /var/qpidwork/config.json
 [Broker] BRK-1007 : Using logging configuration : /usr/local/qpid/qpid-broker-&qpidCurrentRelease;/etc/log4j.xml
-[Broker] BRK-1001 : Startup : Version: &qpidCurrentRelease; Build: 1411386
-[Broker] BRK-1010 : Platform : JVM : Apple Inc. version: 1.6.0_35-b10-428-11M3811 OS : Mac OS X version: 10.8.2 arch: x86_64
-[Broker] BRK-1011 : Maximum Memory : 1,070,399,488 bytes
+[Broker] BRK-1001 : Startup : Version: &qpidCurrentRelease; Build: exported
+[Broker] BRK-1010 : Platform : JVM : Sun Microsystems Inc. version: 1.6.0_32-b05 OS : Linux version: 3.6.10-2.fc16.x86_64 arch: amd64
+[Broker] BRK-1011 : Maximum Memory : 1,065,025,536 bytes
+[Broker] BRK-1002 : Starting : Listening on TCP port 5672
 [Broker] MNG-1001 : Web Management Startup
 [Broker] MNG-1002 : Starting : HTTP : Listening on port 8080
 [Broker] MNG-1004 : Web Management Ready
@@ -77,7 +82,6 @@
 [Broker] MNG-1002 : Starting : RMI Registry : Listening on port 8999
 [Broker] MNG-1002 : Starting : JMX RMIConnectorServer : Listening on port 9099
 [Broker] MNG-1004 : JMX Management Ready
-[Broker] BRK-1002 : Starting : Listening on TCP port 5672
 [Broker] BRK-1004 : Qpid Broker Ready</screen>
     <para>The BRK-1004 message confirms that the Broker is ready for work.  The MNG-1002 and BRK-1002 confirm the ports to
     which the Broker is listening (for HTTP/JMX management and AMQP respectively).</para>
@@ -139,6 +143,11 @@
  -os                                            overwrite the broker configuration store
  --overwrite-store                              with the current initial configuration
 
+ -prop,--config-property <name=value>           set a configuration property to use when
+                                                resolving variables in the broker
+                                                configuration store, with format
+                                                'name=value'
+
  -sp <path>                                     use given configuration store location
  --store-path <path>
 

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml Thu May  9 15:17:33 2013
@@ -25,22 +25,23 @@
 -->
 
 <section id="Java-Broker-Queues-OtherTypes">
-  <title>Other Queue Types</title>
+  <title>Queue Types</title>
 
   <section role="h2" id="Java-Broker-Queues-OtherTypes-Introduction">
     <title>Introduction</title>
     <para> In addition to the standard queue type where messages are delivered in the same order
-      that they were sent, the Java Broker supports four additional queue types which allows for
+      that they were sent, the Java Broker supports three additional queue types which allows for
       alternative delivery behaviours. These are
       <link linkend="Java-Broker-Queues-OtherTypes-Priority">priority-queues</link>,
       <link linkend="Java-Broker-Queues-OtherTypes-Sorted">sorted-queues</link>-,
-      <link linkend="Java-Broker-Queues-OtherTypes-LVQ">last-value-queues</link> (LVQs), and
-      <link linkend="Java-Broker-Queues-OtherTypes-Message-Grouping">grouped queues</link>.
+      <link linkend="Java-Broker-Queues-OtherTypes-LVQ">last-value-queues</link> (LVQs).
+      Additionally, Java Broker supports <link linkend="Java-Broker-Queues-OtherTypes-Message-Grouping">message grouping</link>.
     </para>
     <para> In the following sections, the semantics of each queue type is described, followed by a
       description of how instances of these queue can be created via <link
-        linkend="Java-Broker-Queues-OtherTypes-CreateUsingConfig">configuration</link> or <link
-        linkend="Java-Broker-Queues-OtherTypes-CreateUsingJmsOrJmx">programmatically</link>. </para>
+        linkend="Java-Broker-Queues-OtherTypes-CreateUsingConfig">configuration</link>, <link
+        linkend="Java-Broker-Queues-OtherTypes-CreateUsingJmsOrJmx">programmatically</link> or
+        <link linkend="Java-Broker-Queues-OtherTypes-CreateUsingManagement">Web Management Console</link>.</para>
     <para>The final section discusses the importance of using a <link
         linkend="Java-Broker-Queues-OtherTypes-SetLowPrefetch">low client pre-fetch</link> with these queued.
     </para>
@@ -85,95 +86,28 @@
   <section role="h2" id="Java-Broker-Queues-OtherTypes-Create">
     <title>Creating a Priority, Sorted or LVQ Queue</title>
     <para>To create a priority, sorted or LVQ queue, it can be defined in the virtualhost
-      configuration file, or the queue can be created programmtically from a client via AMQP (using
-      an extension to JMS), or using JMX. These methods are described below. </para>
+      configuration file, can be created programmtically from a client via AMQP (using
+      an extension to JMS), using JMX, using REST interfaces or created in Web Management Console.
+      These methods are described below. </para>
     <para>Once a queue is created you cannot change its type (without deleting it and re-creating).
       Also note you cannot currently mix the natures of these queue types, for instance, you cannot
       define a queue which it both an LVQ and a priority-queue.</para>
+    <section role="h2" id="Java-Broker-Queues-OtherTypes-CreateUsingManagement">
+      <title>Using Web Management Console</title>
+      <para>On clicking on "Add Queue" button on Virtual Host tab the pop-up dialog to create a queue is displayed.</para>
+      <para>For a Simple queue a Queue Type "Standard" should be selected</para>
+      <para>For a Priority queue a Queue Type "Priority" and the priority value (10 by default) should be selected.</para>
+      <para>For a Sorted queue a Queue Type "Sorted" and Sort Message Property should be specified.</para>
+      <para>For a LVQ queue a Queue Type "LVQ" and LVQ Message Property should be specified.</para>
+      <para>Additionally, for each type of the queue Flow Control Thresholds and Alert Thresholds can be specified in optional fields.</para>
+      <para>Also, a Dead Letter Queue can be configured for the Queue by checking "Create DLQ" check box.
+      The maximum number of delivery retries before message is sent to the DLQ can be specified in "Maximum Delivery Retries" field.
+      However, configuring of maximum delivery retries on a queue without DLQ(AlternateExchange) will result in messages
+      being discarded after the limit is reached.</para>
+    </section>
     <section role="h2" id="Java-Broker-Queues-OtherTypes-CreateUsingConfig">
-      <title>Using configuration</title>
-      <para>To create a priority, sorted or LVQ queue within configuration, add the appropriate xml
-        to the virtualhost.xml configuration file within the <varname>queues</varname>
-        element.</para>
-      <section role="h3" id="Java-Broker-Queues-OtherTypes-CreateUsingConfig-Priority">
-        <title>Priority</title>
-        <para> To defining a priority queue, add a &lt;priority&gt;true&lt;/priority&gt; element. By
-          default the queue will have 10 distinct priorities. </para>
-        <example>
-          <title>Configuring a priority queue</title>
-          <programlisting><![CDATA[<queue>
-    <name>myqueue</name>
-    <myqueue>
-        <exchange>amq.direct</exchange>
-        <priority>true</priority>
-    </myqueue>
-</queue>]]></programlisting>
-        </example>
-        <para> If you require fewer priorities, it is possible to specify a
-            <varname>priorities</varname> element (whose value is a integer value between 2 and 10
-          inclusive) which will give the queue that number of distinct priorities. When messages are
-          sent to that queue, their effective priority will be calculated by partitioning the
-          priority space. If the number of effective priorities is 2, then messages with priority
-          0-4 are treated the same as "lower priority" and messages with priority 5-9 are treated
-          equivalently as "higher priority". </para>
-        <example>
-          <title>Configuring a priority queue with fewer priorities</title>
-          <programlisting><![CDATA[<queue>
-    <name>myqueue</name>
-    <myqueue>
-        <exchange>amq.direct</exchange>
-        <priority>true</priority>
-        <priorities>4</priorities>
-    </myqueue>
-</queue>]]></programlisting>
-        </example>
-      </section>
-      <section role="h3" id="Java-Broker-Queues-OtherTypes-CreateUsingConfig-Sorted">
-        <title>Sorted</title>
-        <para> To define a sorted queue, add a <varname>sortKey</varname> element. The value of the
-            <varname>sortKey</varname> element defines the message property to use the value of when
-          sorting the messages put onto the queue. </para>
-        <example>
-          <title>Configuring a sorted queue</title>
-          <programlisting><![CDATA[<queue>
-    <name>myqueue</name>
-    <myqueue>
-        <exchange>amq.direct</exchange>
-        <sortKey>message-property-to-sort-by</sortKey>
-    </myqueue>
-</queue>]]></programlisting>
-        </example>
-      </section>
-      <section role="h3" id="Java-Broker-Queues-OtherTypes-CreateUsingConfig-LVQ">
-        <title>LVQ</title>
-        <para> To define a LVQ, add a <varname>lvq</varname> element with the value
-            <constant>true</constant>. Without any further configuration this will define an LVQ
-          which uses the JMS message property <constant>qpid.LVQ_key</constant> as the key for
-          replacement. </para>
-        <example>
-          <title>Configuring a LVQ queue</title>
-          <programlisting><![CDATA[<queue>
-    <name>myqueue</name>
-    <myqueue>
-        <exchange>amq.direct</exchange>
-        <lvq>true</lvq>
-    </myqueue>
-</queue>]]></programlisting>
-        </example>
-        <para> If you wish to define your own property then you can do so using the
-            <varname>lvqKey</varname> element.</para>
-        <example>
-          <title>Configuring a LVQ queue with custom message property name</title>
-          <programlisting><![CDATA[<queue>
-    <name>myqueue</name>
-    <myqueue>
-        <exchange>amq.direct</exchange>
-        <lvq>true</lvq>
-        <lvqKey>ISIN</lvqKey>
-    </myqueue>
-</queue>]]></programlisting>
-        </example>
-      </section>
+        <title>Using configuration</title>
+        <para>How to declare queues in the Virtual Host configuration file is described in <xref linkend="Java-Broker-Virtual-Host-Declare-Queues"/>.</para>
     </section>
     <section role="h2" id="Java-Broker-Queues-OtherTypes-CreateUsingJmsOrJmx">
       <title>Using JMX or AMQP</title>

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Queues.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Queues.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Queues.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Queues.xml Thu May  9 15:17:33 2013
@@ -22,6 +22,5 @@
 
 <chapter id="Java-Broker-Queues">
   <title>Queues</title>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Queues-Messaging-Groups.xml"/>
         <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Queues-OtherTypes.xml"/>
 </chapter>

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml Thu May  9 15:17:33 2013
@@ -43,47 +43,17 @@
                 as overfull when the size (in bytes) of the messages on the queue exceeds the
                 "capacity" of the Queue. A Queue becomes "underfull" when its size becomes
                 less than the "flowResumeCapacity".
-
-
-             <example>
-               <title>Configuring a queue depth limit</title>
-                <programlisting>
-                <![CDATA[
-<queue>
-    <name>test</name>
-    <test>
-        <exchange>amq.direct</exchange>
-        <capacity>10485760</capacity>                     <!-- set the queue capacity to 10Mb -->
-        <flowResumeCapacity>8388608</flowResumeCapacity>  <!-- set the resume capacity to 8Mb -->
-    </test>
-</queue>
-                ]]>
-                </programlisting>
-             </example>
-
-                The default for all queues on a virtual host can also be set
-
-             <example>
-               <title>Configuring a default queue depth limit on a virtualhost</title>
-                <programlisting>
-                <![CDATA[
-<virtualhosts>
-    <virtualhost>
-        <name>localhost</name>
-        <localhost>
-            <capacity>10485760</capacity>                     <!-- set the queue capacity to 10Mb -->
-            <flowResumeCapacity>8388608</flowResumeCapacity>  <!-- set the resume capacity to 8Mb -->
-        </localhost>
-    </virtualhost>
-</virtualhosts>
-                ]]>
-                </programlisting>
-             </example>
-
+            </para>
+            <para>
+                Examples how to configure flow control in virtual host configuration are provided in
+                <xref linkend="Java-Broker-Virtual-Host-Configure-Flow-Control"/>.
+            </para>
+            <para>
                 Where no flowResumeCapacity is set, the flowResumeCapacity is set to be equal
                 to the capacity. Where no capacity is set, capacity is defaulted to 0 meaning
                 there is no capacity limit.
             </para>
+            <important>Flow control can be configured globally for all virtual hosts by specifying threshold values for Broker flow control attributes.</important>
             <section role="h4">
                 <title>Broker Log Messages</title>
                 <para>
@@ -131,23 +101,12 @@ MESSAGE [con:2(guest@anonymous(713889609
             <para>
                 underfull limit - when the space on disk drops below this limit, producers are allowed to resume publishing.
             </para>
+
             <para>
-                An example of quota configuration for the BDB message store is provided below.
+                An example how to configure disk quota-based flow control in virtual host configuration is provided in
+                <xref linkend="Java-Broker-Virtual-Host-Configure-Disk-Quotas"/>.
             </para>
 
-            <example>
-               <title>Configuring a limit on a store</title>
-            <programlisting>
-            <![CDATA[
-<store>
-   <class>org.apache.qpid.server.store.berkeleydb.BDBMessageStore</class>
-   <environment-path>${work}/bdbstore/test</environment-path>
-   <overfull-size>50000000</overfull-size>
-   <underfull-size>45000000</underfull-size>
-</store>
-            ]]>
-            </programlisting>
-            </example>
             <para>
                 The disk quota functionality is based on "best effort" principle. This means the broker
                 cannot guarantee that the disk space limit will not be exceeded. If several concurrent

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Handling-Undeliverable-Messages.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Handling-Undeliverable-Messages.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Handling-Undeliverable-Messages.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Handling-Undeliverable-Messages.xml Thu May  9 15:17:33 2013
@@ -102,67 +102,12 @@
 
  <section role="h2" id="Java-Broker-Runtime-Handling-Undeliverable-Messages-Configuration">
   <title>Configuration</title>
-  <para>In the below configuration it can be seen that DLQs/Maximum Delivery Count are enabled at
-   the broker level with maximum delivery count set to 5, disabled at the virtualhost level for the
-   'dev-only' virtualhost, and enabled specifically for the 'dev-only-main-queue' with maximum
-   delivery count overridden to 5. </para>
-  <para>As 'dev-only-main-queue' has its own configuration specified, this value overrides all
-   others and causes the features to be enabled for this queue. In contrast to this,
-   'dev-only-other-queue' does not specify its own value and picks up the false value specified for
-   its parent virtualhost, causing the DLQ/Maximum Delivery Count features to be disabled for this
-   queue. Any such queue in the 'dev-only' virtualhost which does not specify its own configuration
-   value will have the DLQ/Maximum Delivery Count feature disabled.</para>
-  <para>The queue 'localhost-queue' has the DLQ/Maximum Delivery Count features enabled, as neither
-   the queue itself or the 'localhost' virtualhost specifies a configuration value and so the broker
-   level value of true is used. Any such queue in the 'localhost' virtualhost which does not specify
-   its own configuration value will have the features enabled.</para>
-  <example>
-   <title>Enabling DLQs and maximum delivery count at broker level within config.xml</title>
-   <programlisting><![CDATA[<broker>
- ...
- <deadLetterQueues>true</deadLetterQueues>
- <maximumDeliveryCount>5</maximumDeliveryCount>
- ...
-</broker>]]></programlisting>
-  </example>
-  <example>
-   <title>Enabling DLQs and maximum delivery count at virtualhost and queue level within
-    virtualhosts.xml</title>
-   <programlisting><![CDATA[<virtualhosts>
- ...
- <virtualhost>
-  <name>dev-only</name>
-  <dev-only>
-   <queues>
-    <deadLetterQueues>false</deadLetterQueues>
-    <maximumDeliveryCount>0</maximumDeliveryCount>
-    <queue>
-     <name>dev-only-main-queue</name>
-     <dev-only-main-queue>
-      <deadLetterQueues>true</deadLetterQueues>
-      <maximumDeliveryCount>3</maximumDeliveryCount>
-     </dev-only-main-queue>
-    </queue>
-    <queue>
-     <name>dev-only-other-queue</name>
-    </queue>
-   </queues>
-  </dev-only>
- </virtualhost>
- <virtualhost>
-  <name>localhost</name>
-  <localhost>
-   <queues>
-    <queue>
-     <name>localhost-queue</name>
-    </queue>
-   </queues>
-  </localhost>
- </virtualhost>
- ...
-</virtualhosts>]]>
-   </programlisting>
-  </example>
+  <important>DLQs/Maximum Delivery can be configured globally for all Virtual Hosts by
+  specifying non-zero value for global Broker attribute
+  "queue.maximumDeliveryAttempts" and setting of Broker attribute "queue.deadLetterQueueEnabled" to true.</important>
+
+  <para>An examples of configuring DLQs/Maximum Delivery Count using Virtual Hosts configuration file
+   are described in <xref linkend="Java-Broker-Virtual-Host-Configuring-DLQ"/>.</para>
  </section>
 
 

Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Producer-Transaction-Timeout.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Producer-Transaction-Timeout.xml?rev=1480684&r1=1480683&r2=1480684&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Producer-Transaction-Timeout.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Producer-Transaction-Timeout.xml Thu May  9 15:17:33 2013
@@ -113,7 +113,8 @@ CHN-1003 : Close]]>
   <title>Configuration</title>
   <section role="h3" id="Java-Broker-Runtime-Producer-Transaction-Timeout-Configuration-Overview">
    <title>Configuration</title>
-   <para>Transaction timeouts are configurable separately on each defined virtual host, using the
+   <important>Transaction timeouts can be configured globally for all virtual hosts by setting corresponding Broker transaction timeout attributes.</important>
+   <para>Transaction timeouts can be configured separately on each defined virtual host, using the
     virtualhosts.xml file.</para>
    <para>We would recommend that only warnings are configured at first, which should allow broker
     administrators to obtain an idea of the distribution of transaction lengths on their systems,
@@ -135,47 +136,9 @@ CHN-1003 : Close]]>
   </section>
   <section role="h3"
    id="Java-Broker-Runtime-Producer-Transaction-Timeout-Configuration-Virtualhosts">
-   <title>Virtualhosts.xml</title>
-   <para> The JMS transaction timeouts are configured on each virtual host defined in the XML
-    configuration files.</para>
-   <para> The default values for each of the parameters is 0, indicating that the particular check
-    is disabled.</para>
-   <para> Any or all of the parameters can be set, using the desired value in milliseconds, and will
-    be checked each time the housekeeping process runs, usually set to run every 30 seconds in
-    standard configuration. The meaning of each property is as follows:</para>
-   <para>
-    <itemizedlist>
-     <listitem>
-      <para>openWarn - the time a transaction can be open for (with activity occurring on it) after
-       which a warning alert will be issued.</para>
-     </listitem>
-     <listitem>
-      <para>openClose - the time a transaction can be open for before the connection it is on is
-       closed.</para>
-     </listitem>
-     <listitem>
-      <para>idleWarn - the time a transaction can be idle for (with no activity occurring on it)
-       after which a warning alert will be issued.</para>
-     </listitem>
-     <listitem>
-      <para>idleClose - the time a transaction can be idle for before the connection it is on is
-       closed.</para>
-     </listitem>
-    </itemizedlist>
-   </para>
-   <para> The virtualhosts configuration is shown below, and must occur inside the
-   //virtualhosts/virtualhost/name/ elements: </para>
-   <example>
-<title>Configuring producer transaction timeout</title>
-   <programlisting><![CDATA[
-<transactionTimeout>
-    <openWarn>10000</openWarn>
-    <openClose>20000</openClose>
-    <idleWarn>5000</idleWarn>
-    <idleClose>15000</idleClose>
-</transactionTimeout>
-   ]]></programlisting>
-   </example>
+   <title>Virtualhost configuration</title>
+   <para>The details how to configure Transaction Timeouts in Virtual Host configuration file
+   are provided in <xref linkend="Java-Broker-Virtual-Host-Transaction-Timeout-Configuring"/></para>
   </section>
  </section>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message