Author: orudyy
Date: Thu Nov 26 14:32:36 2015
New Revision: 1716689
URL: http://svn.apache.org/viewvc?rev=1716689&view=rev
Log:
QPID-6805: Update and correct java component documentation
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1716489 https://svn.apache.org/repos/asf/qpid/java/trunk
Modified:
qpid/java/branches/6.0.x/ (props changed)
qpid/java/branches/6.0.x/doc/book/src/java-broker/ (props changed)
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Miscellaneous.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Initial-Configuration.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Installation.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/commonEntities.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Other-Services.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Flow-To-Disk.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Memory.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-ACLs.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Group-Providers.xml
qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/ (props changed)
qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/commonEntities.xml
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:32:36 2015
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489
/qpid/trunk/qpid:796646-796653
Propchange: qpid/java/branches/6.0.x/doc/book/src/java-broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:32:36 2015
@@ -7,4 +7,4 @@
/qpid/branches/mcpierce-QPID-4719/qpid/doc/book/src/java-broker:1477004-1477093
/qpid/branches/qpid-2935/qpid/doc/book/src/java-broker:1061302-1072333
/qpid/branches/qpid-3346/qpid/doc/book/src/java-broker:1144319-1179855
-/qpid/java/trunk/doc/book/src/java-broker:1716086-1716087,1716455
+/qpid/java/trunk/doc/book/src/java-broker:1716086-1716087,1716455,1716489
Modified:
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Miscellaneous.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Miscellaneous.xml?rev=1716689&r1=1716688&r2=1716689&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Miscellaneous.xml
(original)
+++
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Miscellaneous.xml
Thu Nov 26 14:32:36 2015
@@ -35,14 +35,14 @@
following at the command prompt: </para>
<programlisting><![CDATA[echo %JAVA_HOME%]]></programlisting>
<para> If JAVA_HOME is set you will see something similar to the
following: </para>
- <screen><![CDATA[c:"\PROGRA~1"\Java\jdk1.7.0_60\]]>
+ <screen><![CDATA[c:"\PROGRA~1"\Java\jdk1.7.0_79\]]>
</screen>
<para> Then confirm that a Java installation (1.7 or higher) is
available: </para>
<programlisting><![CDATA[java -version]]></programlisting>
<para> If java is available on the path, output similar to the following
will be seen: </para>
- <screen><![CDATA[java version "1.7.0_60"
-Java(TM) SE Runtime Environment (build 1.7.0_60-b19)
-Java HotSpot(TM) 64-Bit Server VM (build 24.60-b09, mixed mode)]]></screen>
+ <screen><![CDATA[java version "1.7.0_79"
+Java(TM) SE Runtime Environment (build 1.7.0_79-b15)
+Java HotSpot(TM) 64-Bit Server VM (build 24.79-b02, mixed mode)]]></screen>
</section>
<section role="h2" id="Java-Broker-Miscellaneous-JVM-Verification-Unix">
@@ -51,26 +51,26 @@ Java HotSpot(TM) 64-Bit Server VM (build
following at the command prompt: </para>
<programlisting><![CDATA[echo $JAVA_HOME]]></programlisting>
<para> If JAVA_HOME is set you will see something similar to the
following: </para>
- <screen><![CDATA[/usr/java/jdk1.7.0_60]]>
+ <screen><![CDATA[/usr/java/jdk1.7.0_80]]>
</screen>
<para> Then confirm that a Java installation (1.7 or higher) is
available: </para>
<programlisting><![CDATA[java -version]]></programlisting>
<para> If java is available on the path, output similar to the following
will be seen: </para>
- <screen><![CDATA[java version "1.7.0_60"
-Java(TM) SE Runtime Environment (build 1.7.0_60-b19)
-Java HotSpot(TM) 64-Bit Server VM (build 24.60-b09, mixed mode)]]></screen>
+ <screen><![CDATA[java version "1.7.0_80"
+Java(TM) SE Runtime Environment (build 1.7.0_80-b15)
+Java HotSpot(TM) 64-Bit Server VM (build 24.80-b11, mixed mode)]]></screen>
</section>
</section>
<section role="h2"
id="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver">
<title>Installing External JDBC Driver</title>
<para>In order to use a JDBC Virtualhost Node or a JDBC Virtualhost, you
must make the
Database's JDBC 4.0 compatible drivers available on the Broker's
classpath. To do this copy
- the driver's JAR file into the <literal>${QPID_HOME}/lib/opt</literal>
folder.</para>
+ the driver's JAR file into the <literal>${QPID_HOME}/lib</literal>
folder.</para>
<programlisting>Unix:
-cp <literal>driver</literal>.jar
qpid-broker-&qpidCurrentRelease;/lib/opt</programlisting>
+cp <literal>driver</literal>.jar
qpid-broker-&qpidCurrentRelease;/lib</programlisting>
<programlisting>Windows:
-copy <literal>driver</literal>.jar
qpid-broker-&qpidCurrentRelease;\lib\opt</programlisting>
+copy <literal>driver</literal>.jar
qpid-broker-&qpidCurrentRelease;\lib</programlisting>
</section>
<section role="h2" id="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE">
@@ -84,13 +84,13 @@ copy <literal>driver</literal>.jar qpid-
<para> The download has a name in the form
je-&oracleBdbProductVersion;.tar.gz. It is
recommended that you confirm the integrity of the download by verifying
the MD5. </para>
<para>Copy the je-&oracleBdbProductVersion;.jar from within the release
into
- <literal>${QPID_HOME}/lib/opt</literal> folder.</para>
+ <literal>${QPID_HOME}/lib</literal> folder.</para>
<programlisting>Unix:
-cp je-&oracleBdbProductVersion;.jar
qpid-broker-&qpidCurrentRelease;/lib/opt</programlisting>
+cp je-&oracleBdbProductVersion;.jar
qpid-broker-&qpidCurrentRelease;/lib</programlisting>
<programlisting>Windows:
-copy je-&oracleBdbProductVersion;.jar
qpid-broker-&qpidCurrentRelease;\lib\opt</programlisting>
+copy je-&oracleBdbProductVersion;.jar
qpid-broker-&qpidCurrentRelease;\lib</programlisting>
</section>
Modified:
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Initial-Configuration.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Initial-Configuration.xml?rev=1716689&r1=1716688&r2=1716689&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Initial-Configuration.xml
(original)
+++
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Initial-Configuration.xml
Thu Nov 26 14:32:36 2015
@@ -43,25 +43,25 @@
<para>Loggers</para>
</listitem>
<listitem>
- <para>Port</para>
+ <para>Ports</para>
</listitem>
<listitem>
- <para>Authentication Provider</para>
+ <para>Authentication Providers (optionally with Users for
managing users Authentication Providers)</para>
</listitem>
<listitem>
- <para>Access Control Provider</para>
+ <para>Access Control Providers</para>
</listitem>
<listitem>
- <para>Group Provider</para>
+ <para>Group Providers (optionally with Groups and
GroupMembers for managing groups Group Providers)</para>
</listitem>
<listitem>
- <para>Key store</para>
+ <para>Key stores</para>
</listitem>
<listitem>
- <para>Trust store</para>
+ <para>Trust stores</para>
</listitem>
<listitem>
- <para>Plugin</para>
+ <para>Plugins</para>
</listitem>
</itemizedlist>
</para>
@@ -172,16 +172,38 @@ $ ./qpid-server -os -icp ./my-initial-co
<section id="Java-Broker-Initial-Configuration-Type">
<title>Configuration Store Type</title>
- <para> There are currently two implementations of the pluggable Broker
Configuration Store,
- the default one which persists content to disk in a JSON file, and
another which
- operates only in-memory and so does not retain changes across
broker restarts and always
- relies on the current <link
-
linkend="Java-Broker-Initial-Configuration-Initial-Config-Location">'Initial
- Configuration'</link> to provide the configuration to start
the broker with. </para>
+ <para> There are currently several implementations of the pluggable
Broker Configuration Store:
+ <variablelist>
+ <varlistentry>
+ <term>JSON</term>
+ <listitem><para>the default one which persists content to
disk in a JSON file</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Memory</term>
+ <listitem><para>operates only in-memory and so does not
retain changes across broker
+ restarts and always relies on the current <link
+
linkend="Java-Broker-Initial-Configuration-Initial-Config-Location">'Initial
+ Configuration'</link> to provide the configuration
to start the broker with.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>DERBY</term>
+ <listitem><para>stores configuration in embedded derby
store</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>BDB</term>
+ <listitem><para>stores configuration in Berkeley DB
store</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>JDBC</term>
+ <listitem><para>stores configuration in external RDBMS
using JDBC</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
<para> The command line argument <emphasis>-st</emphasis> (or
<emphasis>--store-type</emphasis>) can be used to override the
default
<emphasis>json</emphasis>)configuration store type and allow
choosing an alternative,
- such as <emphasis>memory</emphasis>) </para>
+ such as <emphasis>Memory</emphasis>) </para>
<screen>
$ ./qpid-server -st memory
</screen>
@@ -189,6 +211,12 @@ $ ./qpid-server -st memory
same <link
linkend="Java-Broker-Initial-Configuration-Initial-Config-Location">'Initial
Configuration'</link>
</para>
+ <para>Another example of broker startup with configuration in DERBY
network server</para>
+ <screen>
+$ ./qpid-server -st JDBC \
+ -prop
"systemConfig.connectionUrl=jdbc:derby://localhost:1527/path/to/store;create=true"
\
+ -prop "systemConfig.username=test" -prop "systemConfig.password=password"
+ </screen>
</section>
<section id="Java-Broker-Initial-Configuration-Configuration-Properties">
Modified:
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Installation.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Installation.xml?rev=1716689&r1=1716688&r2=1716689&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Installation.xml
(original)
+++
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Installation.xml
Thu Nov 26 14:32:36 2015
@@ -107,14 +107,16 @@
<screen>
Directory of c:\qpid\&windowsExtractedBrokerDirName;
-07/25/2012 11:22 PM .
-09/30/2012 10:51 AM ..
-09/30/2012 12:24 AM bin
-08/21/2012 11:17 PM etc
-07/25/2012 11:22 PM lib
-07/20/2012 08:10 PM 65,925 LICENSE
-07/20/2012 08:10 PM 3,858 NOTICE
-07/20/2012 08:10 PM 1,346 README.txt
+25/11/2015 11:29 <DIR> .
+25/11/2015 11:29 <DIR> ..
+25/11/2015 10:56 <DIR> bin
+03/07/2015 08:06 <DIR> etc
+25/11/2015 11:25 <DIR> lib
+25/11/2015 10:56 28,143 LICENSE
+25/11/2015 10:56 3,409 NOTICE
+29/04/2015 09:13 116 README.txt
+3 File(s) 31,668 bytes
+5 Dir(s) 25,981,767,680 bytes free
</screen>
<section role="h3"
id="Java-Broker-Installation-InstallationWindows-SettingQPIDWORK">
<title>Setting the working directory</title>
@@ -147,15 +149,15 @@ tar xvzf &unixBrokerDownloadFileName;</p
<para>The extraction of the broker package will have created a directory
&unixExtractedBrokerDirName; within /usr/local/qpid</para>
<screen>ls -la &unixExtractedBrokerDirName;/
-total 152
-drwxr-xr-x 8 qpid qpid 272 25 Jul 23:22 .
-drwxr-xr-x 45 qpid qpid 1530 30 Sep 10:51 ..
--rw-r--r--@ 1 qpid qpid 65925 20 Jul 20:10 LICENSE
--rw-r--r--@ 1 qpid qpid 3858 20 Jul 20:10 NOTICE
--rw-r--r--@ 1 qpid qpid 1346 20 Jul 20:10 README.txt
-drwxr-xr-x 10 qpid qpid 340 30 Sep 00:24 bin
-drwxr-xr-x 9 qpid qpid 306 21 Aug 23:17 etc
-drwxr-xr-x 34 qpid qpid 1156 25 Jul 23:22 lib
+total 56
+drwxrwxr-x. 5 alex alex 4096 Nov 25 11:43 .
+drwxrwxr-x. 3 alex alex 4096 Nov 25 11:43 ..
+drwxr-xr-x. 2 alex alex 4096 Nov 24 23:38 bin
+drwxr-xr-x. 2 alex alex 4096 Nov 24 23:38 etc
+drwxrwxr-x. 2 alex alex 4096 Nov 25 11:43 lib
+-rw-r--r--. 1 alex alex 28143 Nov 24 23:38 LICENSE
+-rw-r--r--. 1 alex alex 3409 Nov 24 23:38 NOTICE
+-rw-r--r--. 1 alex alex 116 Nov 24 23:38 README.txt
</screen>
<section role="h3"
id="Java-Broker-Installation-InstallationUnix-SettingQPIDWORK">
<title>Setting the working directory</title>
Modified: qpid/java/branches/6.0.x/doc/book/src/java-broker/commonEntities.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/commonEntities.xml?rev=1716689&r1=1716688&r2=1716689&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/book/src/java-broker/commonEntities.xml
(original)
+++ qpid/java/branches/6.0.x/doc/book/src/java-broker/commonEntities.xml Thu
Nov 26 14:32:36 2015
@@ -22,7 +22,7 @@
<!ENTITY qpidDownloadUrl "http://qpid.apache.org/download.html";>
<!ENTITY qpidCppBook "../../AMQP-Messaging-Broker-CPP-Book/html/">
-<!ENTITY qpidCurrentRelease "0.32-SNAPSHOT">
+<!ENTITY qpidCurrentRelease "6.1.0-SNAPSHOT">
<!ENTITY windowsBrokerDownloadFileName
"qpid-java-broker-&qpidCurrentRelease;.zip">
<!ENTITY windowsExtractedBrokerDirName "qpid-broker-&qpidCurrentRelease;">
Modified:
qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Other-Services.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Other-Services.xml?rev=1716689&r1=1716688&r2=1716689&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Other-Services.xml
(original)
+++
qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Other-Services.xml
Thu Nov 26 14:32:36 2015
@@ -42,16 +42,15 @@
<section id="Java-Broker-Concepts-Keystores">
<title>Keystores</title>
- <para><emphasis>Keystores</emphasis> are used to configure details of
keystores holding SSL keys and certificates
+ <para><emphasis>Keystores</emphasis> are used to configure SSL private
and public keys and certificates
for the SSL transports on Ports.</para>
<para>Keystore configuration and management is covered in <xref
linkend="Java-Broker-Management-Managing-Keystores"/>.</para>
</section>
<section id="Java-Broker-Concepts-Truststores">
<title>Truststores</title>
- <para><emphasis>Truststores</emphasis> are used to configure details
of keystores holding SSL certificates
- for trusting Client Certificate on SSL ports.
- </para>
+ <para><emphasis>Truststores</emphasis> are used to configure SSL
certificates for trusting Client Certificate
+ on SSL ports or making SSL connections to other external services
like LDAP, etc.</para>
<para>Truststore configuration and management is covered in <xref
linkend="Java-Broker-Management-Managing-Truststores"/>.</para>
</section>
Modified:
qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml?rev=1716689&r1=1716688&r2=1716689&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml
(original)
+++
qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml
Thu Nov 26 14:32:36 2015
@@ -30,7 +30,7 @@
hold/buffer messages for later delivery to consumer applications. An <link
linkend="Java-Broker-Concepts-Exchanges">Exchange</link> for passing
messages to a queue.
Consumers subscribe to a queue in order to receive messages for it. </para>
- <para>The Broker supports different queue types, each with different delivery
semantics. It also messages on a queue to be treated as a group.</para>
+ <para>The Broker supports different queue types, each with different delivery
semantics. It also supports messages on a queue to be treated as a
group.</para>
<section id="Java-Broker-Concepts-Queues-Types">
<title>Types</title>
<para>The Broker supports four different queue types, each with different
delivery semantics.<itemizedlist>
Modified:
qpid/java/branches/6.0.x/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml?rev=1716689&r1=1716688&r2=1716689&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml
(original)
+++
qpid/java/branches/6.0.x/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml
Thu Nov 26 14:32:36 2015
@@ -553,4 +553,159 @@ curl --user admin -X PUT -d '{}' http:/
off by default). For details see <xref
linkend="Java-Broker-Management-Managing-Plugin-HTTP"/>
</para>
</section>
+
+ <section id="Java-Broker-Management-Channel-REST-API-Docs">
+ <title>Web interfaces with REST API Documentation</title>
+ <para>Java Broker provides auxiliary web interfaces containing basic
description of available REST services and their attributes.</para>
+ <para>Such services are available under /apidocs/* and can be accessed by
authenticated users.</para>
+ <table>
+ <title>Rest services documentation</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>REST Service URI</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>/api/latest/broker</para>
+ </entry>
+ <entry>
+ <para>Provides information about Broker REST interfaces</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/virtualhostnode</para>
+ </entry>
+ <entry>
+ <para>Provides information about Virtual Host Node attributes and
types</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/virtualhost</para>
+ </entry>
+ <entry>
+ <para>Provides information about Virtual Host Node attributes and
types</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/port</para>
+ </entry>
+ <entry>
+ <para>Provides information about Port attributes and types</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/authenticationprovider</para>
+ </entry>
+ <entry>
+ <para>Provides information about Authentication Provider attributes
and types</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/accesscontrolprovider</para>
+ </entry>
+ <entry>
+ <para>Provides information about Access Control Provider attributes
and types</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/keystore</para>
+ </entry>
+ <entry>
+ <para>Provides information about Keystore attributes and
types</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/truststore</para>
+ </entry>
+ <entry>
+ <para>Provides information about Truststore attributes and
types</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/queue</para>
+ </entry>
+ <entry>
+ <para>Provides information about Queue attributes and types</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/exchange</para>
+ </entry>
+ <entry>
+ <para>Provides information about Exchange attributes and
types</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/binding</para>
+ </entry>
+ <entry>
+ <para>Provides information about Binding attributes and types</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/groupprovider</para>
+ </entry>
+ <entry>
+ <para>Provides information about Group Provider attributes and
types</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/brokerlogger</para>
+ </entry>
+ <entry>
+ <para>Provides information about Broker Logger attributes and
types</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/virtualhostlogger</para>
+ </entry>
+ <entry>
+ <para>Provides information about Virtual Host Logger attributes and
types</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/group</para>
+ </entry>
+ <entry>
+ <para>Provides information about Group attributes and types</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/groupmember</para>
+ </entry>
+ <entry>
+ <para>Provides information about Group Member attributes and
types</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>/api/latest/user</para>
+ </entry>
+ <entry>
+ <para>Provides information about User attributes and types</para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
</section>
Modified:
qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Flow-To-Disk.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Flow-To-Disk.xml?rev=1716689&r1=1716688&r2=1716689&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Flow-To-Disk.xml
(original)
+++
qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Flow-To-Disk.xml
Thu Nov 26 14:32:36 2015
@@ -22,16 +22,17 @@
<section id="Java-Broker-Runtime-Flow-To-Disk">
<title>Flow to Disk</title>
- <para>Flow to disk limits the amount of heap memory that can be occupied by
messages. Once this
+ <para>Flow to disk limits the amount of <link
linkend="Java-Broker-Runtime-Memory">direct and heap memory</link>
+ that can be occupied by messages. Once this
limit is reached any new transient messages and all existing transient
messages will be
transferred to disk. Newly arriving transient messages will continue to go
to the disk until the
cumulative size of all messages falls below the limit once again.</para>
- <para>By default the Broker makes 40% of the max available memory for
messages. This memory is
+ <para>By default the Broker makes 40% of the max direct available memory for
messages. This memory is
divided between all the queues across all virtual hosts defined on the
Broker with a percentage
calculated according to their current queue size. These calculations are
refreshed periodically
by the housekeeping cycle.</para>
<para>For example if there are two queues, one containing 75MB and the
second 100MB messages
- respectively and the Broker has 1GB heap memory with the default of 40%
available for messages.
+ respectively and the Broker has 1GB direct memory with the default of 40%
available for messages.
The first queue will have a target size of 170MB and the second 230MB.
Once 400MB is taken by
messages, messages will begin to flow to disk. New messages will cease to
flow to disk when
their cumulative size falls beneath 400MB.</para>
Modified:
qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Memory.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Memory.xml?rev=1716689&r1=1716688&r2=1716689&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Memory.xml
(original)
+++
qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Memory.xml
Thu Nov 26 14:32:36 2015
@@ -98,7 +98,8 @@
When many small messages accumulate on the broker the 1 kB heap memory
overhead can become a <link
linkend="Java-Broker-Runtime-Memory-Low-Memory-Heap">limiting factor</link>.
</para>
<para>
- When the broker is <link
linkend="Java-Broker-Runtime-Memory-Low-Memory-Direct">running low on direct
memory</link> it will evict messages from memory and flow them to disk.
+ When the broker is <link
linkend="Java-Broker-Runtime-Memory-Low-Memory-Direct">running low on direct
memory</link>
+ it will evict messages from memory and <link
linkend="Java-Broker-Runtime-Flow-To-Disk">flow them to disk</link>.
For persistent messages this only means freeing the direct memory
representation because they always have an on-disk representation to guard
against unexpected failure (e.g., a power cut).
For transient messages this implies additional disk I/O.
After being flown to disk messages need to be re-read from disk before
delivery.
Modified:
qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-ACLs.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-ACLs.xml?rev=1716689&r1=1716688&r2=1716689&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-ACLs.xml
(original)
+++
qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-ACLs.xml
Thu Nov 26 14:32:36 2015
@@ -468,6 +468,37 @@
</tbody>
</tgroup>
</table>
+ <table id="table-Java-Broker-Security-ACLs-Queue-Exchnage-Operations">
+ <title>ACL for Queue management operations invoked via REST
interfaces</title>
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry> <command>Operation</command> </entry>
+ <entry> <para>Component</para> </entry>
+ <entry> <para>Method</para> </entry>
+ <entry> <para>Description</para> </entry>
+ </row>
+ <row>
+ <entry> <command>UPDATE</command> </entry>
+ <entry> <para>VirtualHost.Queue</para> </entry>
+ <entry> <para>copyMessages</para> </entry>
+ <entry> <para>Copy messages</para> </entry>
+ </row>
+ <row>
+ <entry> <command>UPDATE</command> </entry>
+ <entry> <para>VirtualHost.Queue</para> </entry>
+ <entry> <para>moveMessages</para> </entry>
+ <entry> <para>Move messages</para> </entry>
+ </row>
+ <row>
+ <entry> <command>UPDATE</command> </entry>
+ <entry> <para>VirtualHost.Queue</para> </entry>
+ <entry> <para>deleteMessages</para> </entry>
+ <entry> <para>Delete messages</para> </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
<section role="h4" id="Java-Broker-Security-ACLs-WorkedExamples">
<title>
Worked Examples
Modified:
qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Group-Providers.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Group-Providers.xml?rev=1716689&r1=1716688&r2=1716689&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Group-Providers.xml
(original)
+++
qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Group-Providers.xml
Thu Nov 26 14:32:36 2015
@@ -59,4 +59,12 @@
</para>
</section>
</section>
+
+ <section role="h3"
id="Java-Broker-Security-Group-Providers-ManagedGroupProvider">
+ <title>ManagedGroupProvider</title>
+ <para>
+ The <emphasis>ManagedGroupProvider</emphasis> allows specifying
group membership as part of broker configuration.
+ In future version of Brokers GroupFile Provider will be replaced
by this one.
+ </para>
+ </section>
</section>
Propchange: qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:32:36 2015
@@ -7,4 +7,4 @@
/qpid/branches/mcpierce-QPID-4719/qpid/doc/book/src/jms-client-0-8:1477004-1477093
/qpid/branches/qpid-2935/qpid/doc/book/src/jms-client-0-8:1061302-1072333
/qpid/branches/qpid-3346/qpid/doc/book/src/jms-client-0-8:1144319-1179855
-/qpid/java/trunk/doc/book/src/jms-client-0-8:1716086
+/qpid/java/trunk/doc/book/src/jms-client-0-8:1716086,1716489
Modified:
qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/commonEntities.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/commonEntities.xml?rev=1716689&r1=1716688&r2=1716689&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/commonEntities.xml
(original)
+++ qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/commonEntities.xml Thu
Nov 26 14:32:36 2015
@@ -19,7 +19,7 @@
-->
-<!ENTITY qpidVersion "0.32-SNAPSHOT">
+<!ENTITY qpidVersion "6.1.0-SNAPSHOT">
<!ENTITY qpidDownloadUrlDesc "the Apache Qpid project web site">
<!ENTITY qpidDownloadUrl "http://qpid.apache.org/download.html";>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
