qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lqu...@apache.org
Subject svn commit: r1746456 - in /qpid/java/branches/6.0.x/doc: ./ java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
Date Wed, 01 Jun 2016 13:13:03 GMT
Author: lquack
Date: Wed Jun  1 13:13:03 2016
New Revision: 1746456

URL: http://svn.apache.org/viewvc?rev=1746456&view=rev
Log:
QPID-7255 : Add documentation for delivery delay feature to 6.0.x branch

This was missed in the previous merge.
Merge was performed by the following command:
$ svn merge -c 1744250 ^/qpid/java/trunk/doc

Modified:
    qpid/java/branches/6.0.x/doc/   (props changed)
    qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
    qpid/java/branches/6.0.x/doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml
    qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml

Propchange: qpid/java/branches/6.0.x/doc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun  1 13:13:03 2016
@@ -9,5 +9,5 @@
 /qpid/branches/java-broker-vhost-refactor/java/doc:1493674-1494547
 /qpid/branches/java-network-refactor/qpid/java/doc:805429-821809
 /qpid/branches/qpid-2935/qpid/java/doc:1061302-1072333
-/qpid/java/trunk/doc: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,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720340,1720664,1721151,1721198,1722019-1722020,1722246,1722339,1722416,1722674,1722678,1722683,1722711,1723064,1723194,1723563,1724216,1724251,1724257,1724292,1724375,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1725760,1726176,1726244-1726246,1726249,1726358,1726436,1726449,1726456,1726646,1726653,1726755,1726778,1727532,1727555,1727608,1727951,1727954,1728089,1728167,1728302,1728497,1728501,1728524,1728639,1728651,1728772,1729215,1729297,1729347,1729356,1729406,1729408,1729412,1729515,1729638,1729656-
 1729657,1729783,1729828,1729832,1729841,1729851,1729886,1729904,1729973,1730019,1730025,1730052,1730072,1730088,1730494,1730499,1730547,1730559,1730567,1730578,1730585,1730651,1730697,1730712-1730713,1730805,1731029,1731110,1731210,1731225,1731444,1731551,1731612,1732184,1732452,1732461,1732525,1732812,1733467,1734452,1736478,1736751,1736838,1737804,1737835,1737853,1737984,1737992,1738119,1738135,1738231,1738271,1738607,1738610,1738731,1738914,1741702,1742257,1742284,1742544,1742900,1742926,1743161,1743228,1743383,1743759-1743916
+/qpid/java/trunk/doc: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,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720340,1720664,1721151,1721198,1722019-1722020,1722246,1722339,1722416,1722674,1722678,1722683,1722711,1723064,1723194,1723563,1724216,1724251,1724257,1724292,1724375,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1725760,1726176,1726244-1726246,1726249,1726358,1726436,1726449,1726456,1726646,1726653,1726755,1726778,1727532,1727555,1727608,1727951,1727954,1728089,1728167,1728302,1728497,1728501,1728524,1728639,1728651,1728772,1729215,1729297,1729347,1729356,1729406,1729408,1729412,1729515,1729638,1729656-
 1729657,1729783,1729828,1729832,1729841,1729851,1729886,1729904,1729973,1730019,1730025,1730052,1730072,1730088,1730494,1730499,1730547,1730559,1730567,1730578,1730585,1730651,1730697,1730712-1730713,1730805,1731029,1731110,1731210,1731225,1731444,1731551,1731612,1732184,1732452,1732461,1732525,1732812,1733467,1734452,1736478,1736751,1736838,1737804,1737835,1737853,1737984,1737992,1738119,1738135,1738231,1738271,1738607,1738610,1738731,1738914,1741702,1742257,1742284,1742544,1742900,1742926,1743161,1743228,1743383,1743759-1743916,1744250
 /qpid/trunk/qpid/doc:796646-796653

Modified: qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml?rev=1746456&r1=1746455&r2=1746456&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
(original)
+++ qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
Wed Jun  1 13:13:03 2016
@@ -358,4 +358,21 @@ amqp://guest:guest@client1/development?m
         </screen>
     </section>
   </section>
-</section>
+    <section xml:id="Java-Broker-Concepts-Queue-HoldingEntries">
+        <title>Holding messages on a Queue</title>
+        <para>Sometimes it is required that while a message has been placed on a queue,
it is not released to consumers
+            until some external condition is met. </para>
+        <section>
+            <title>Hold until valid</title>
+            <para>Currently Queues support the "holding" of messages until a (per-message)
provided point in time.
+                By default this support is not enabled (since it requires extra work to be
performed against every
+                message entering the queue.  To enable support, the attribute <varname>holdOnPublishEnabled</varname>
+                must evaluate to true for the Queue.  When enabled messages on the queue
will be checked for the header
+                (for AMQP 0-8, 0-9, 0-9-1 and 0-10 messages) or message annotation (for AMQP
1.0 messages)
+                <varname>x-qpid-not-valid-before</varname>. If this header/annotation
exists and contains a numeric value,
+                it will be treated as a point in time given in milliseconds since the UNIX
epoch.  The message will not
+                be released from the Queue to consumers until this time has been reached.
+            </para>
+        </section>
+      </section>
+    </section>

Modified: qpid/java/branches/6.0.x/doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml?rev=1746456&r1=1746455&r2=1746456&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml Wed Jun
 1 13:13:03 2016
@@ -2068,7 +2068,21 @@ spout - -content "$(cat rdu.xml | sed -e
 		    node creation.
 		  </entry>
 		</row>
-	      </tbody>
+	    <row>
+		  <entry>
+              delay
+          </entry>
+		  <entry>
+              long
+          </entry>
+		  <entry>
+              The delay (in milliseconds) between the time a message is sent by a MessageProducer,
and
+			  the earliest time it becomes visible to consumers on any queue onto which it has been
placed. Note that
+			  this value only has an affect on brokers which support the feature (currently only the
Qpid Java
+			  Broker), and only on queues where delivery delay has been enabled.
+		  </entry>
+	    </row>
+		  </tbody>
 	    </tgroup>
 	  </table>
 

Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml?rev=1746456&r1=1746455&r2=1746456&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml Wed
Jun  1 13:13:03 2016
@@ -138,6 +138,15 @@
                 is not specified, the messages won't be moved to the DLQ (or dropped) when
delivery
                 count exceeds the maximum. </para></entry>
           </row>
+
+            <row xml:id="JMS-Client-0-8-Binding-URL-Options-DeliveryDelay">
+                <entry><para>deliveryDelay</para></entry>
+                <entry><para>long </para></entry>
+                <entry><para>The delay (in milliseconds) between the time a message
is sent by a MessageProducer, and
+                    the earliest time it becomes visible to consumers on any queue onto which
it has been placed. Note that
+                    this value only has an affect on brokers which support the feature (currently
only the Qpid Java
+                    Broker), and only on queues where delivery delay has been enabled.</para></entry>
+            </row>
         </tbody>
       </tgroup>
     </table>



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


Mime
View raw message