Author: timfox Date: 2009-12-04 12:25:32 -0500 (Fri, 04 Dec 2009) New Revision: 8562 Modified: trunk/docs/user-manual/en/paging.xml trunk/docs/user-manual/en/queue-attributes.xml trunk/docs/user-manual/en/send-guarantees.xml Log: more docs changes Modified: trunk/docs/user-manual/en/paging.xml =================================================================== --- trunk/docs/user-manual/en/paging.xml 2009-12-04 17:12:44 UTC (rev 8561) +++ trunk/docs/user-manual/en/paging.xml 2009-12-04 17:25:32 UTC (rev 8562) @@ -85,7 +85,7 @@ &lt;address-setting match="jms.someaddress"> &lt;max-size-bytes>104857600&lt;/max-size-bytes> &lt;page-size-bytes>10485760&lt;/page-size-bytes> - &lt;drop-messages-when-full>false&lt;/drop-messages-when-full> + &lt;address-full-policy>PAGE&lt;/address-full-policy> &lt;/address-setting> &lt;/address-settings> </programlisting> @@ -117,11 +117,11 @@ <entry>10MiB (10 * 1024 * 1024 bytes)</entry> </row> <row> - <entry><literal>drop-messages-when-full</literal></entry> - <entry>if true, messages are dropped instead of paged when <literal - >used-memory</literal> is greater than <literal - >max-size</literal></entry> - <entry>false</entry> + <entry><literal>address-full-message-policy</literal></entry> + <entry>This must be set to PAGE for paging to enable. If the value is PAGE then further messages will be paged to disk. + If the value is DROP then further messages will be silently dropped. + If the value is BLOCK then client message producers will block when they try and send further messages.</entry> + <entry>PAGE</entry> </row> </tbody> </tgroup> Modified: trunk/docs/user-manual/en/queue-attributes.xml =================================================================== --- trunk/docs/user-manual/en/queue-attributes.xml 2009-12-04 17:12:44 UTC (rev 8561) +++ trunk/docs/user-manual/en/queue-attributes.xml 2009-12-04 17:25:32 UTC (rev 8562) @@ -100,6 +100,7 @@ &lt;page-size-bytes>20000&lt;/page-size-bytes> &lt;redistribution-delay>0&lt;/redistribution-delay> &lt;send-to-dla-on-no-route>true&lt;/send-to-dla-on-no-route> + &lt;address-full-policy>PAGE&lt;/address-full-policy> &lt;/address-setting> &lt;/address-settings></programlisting> <para>The idea with address settings, is you can provide a block of settings which will be @@ -131,5 +132,14 @@ for example, there might be no queues bound to that address, or none of the queues have filters that match, then normally that message would be discarded. However if this parameter is set to true for that address, if the message is not routed to any queues it will instead be sent to the dead letter address (DLA) for that address, if it exists.</para> + <para><literal>address-full-policy</literal>. This attribute can have one of the following values: PAGE, DROP or BLOCK and determines what happens when + an address where <literal>max-size-bytes</literal> is specified becomes full. The default value is PAGE. If the value is PAGE then further messages will be paged to disk. + If the value is DROP then further messages will be silently dropped. + If the value is BLOCK then client message producers will block when they try and send further messages. + + See the following chapters for more info <xref linkend="flow-control"/>, <xref linkend="paging"/>. + </para> + + </section> </chapter> Modified: trunk/docs/user-manual/en/send-guarantees.xml =================================================================== --- trunk/docs/user-manual/en/send-guarantees.xml 2009-12-04 17:12:44 UTC (rev 8561) +++ trunk/docs/user-manual/en/send-guarantees.xml 2009-12-04 17:25:32 UTC (rev 8562) @@ -127,6 +127,8 @@ the network RTT, but is limited by the network bandwidth. Consequently better throughput can be achieved than is possible using a blocking approach, while at the same time having absolute guarantees that messages have successfully reached the server.</para> + <para>The window size for send acknowledgements is determined by the confirmation-window-size parameter on + the connection factory or client session factory. Please see <xref linkend="client-reconnection"/> for more info on this.</para> <section> <title>Asynchronous Send Acknowledgements</title> <para>To use the feature using the core API, you implement the interface <literal