QPID-6347 - Committed a patch from Irina Boverman

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1669669 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 2 insertions, 49 deletions

diff --git a/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml b/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml
index d6e52c4fdf..ab72bf286b 100644
--- a/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml
+++ b/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml
@@ -86,10 +86,6 @@ Add Queue Options:
                              fifo (default) - First in, first out
                              lvq            - Last Value Queue ordering, allows queue browsing
                              lvq-no-browse  - Last Value Queue ordering, browsing clients may lose data
-    --generate-queue-events N
-                         If set to 1, every enqueue will generate an event that can be processed by
-                         registered listeners (e.g. for replication). If set to 2, events will be
-                         generated for enqueues and dequeues
 
 Add Exchange Options:
     --durable    Exchange is durable
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/ui/qmf.html b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/ui/qmf.html
index 4737294c70..60977fbad0 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/ui/qmf.html
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/ui/qmf.html
@@ -857,9 +857,6 @@ these are used to enable a semi-transparent "smoked glass" background behind the
         		            <li id="add-queue-ordering-policy" class="arrow">
                                 <a href="#ordering-policy">Order Policy<p>Fifo (default)</p></a>
                             </li>
-        		            <li id="add-queue-generate-queue-events" class="arrow">
-                                <a href="#generate-queue-events">Event Policy<p>Off (default)</p></a>
-                            </li>
         		            <li class="arrow"><a href="#add-queue-additional">Additional Options</a></li>
         	            </ul>
                     </form>
@@ -928,33 +925,6 @@ these are used to enable a semi-transparent "smoked glass" background behind the
             </div> <!-- End of ordering-policy-scroller -->
         </div> <!-- End of ordering-policy -->
 
-        <div id="generate-queue-events" class="popup">
-            <div class="header">
-		        <a class="back button" href="#">Add Queue</a>
-                <h1>Event Policy</h1>
-            </div>
-
-            <div id="generate-queue-events-scroller" class="scroll-area">
-                <div class="page">
-	                <ul class="list">
-                        <li>
-                            <label for="generate-no-events">Off (default)</label>
-                            <input type="radio" id="generate-no-events" name="generate-queue-events" value="" checked />
-                        </li>
-                        <li>
-                            <label for="generate-enqueue-events">Enqueue</label>
-                            <input type="radio" id="generate-enqueue-events" name="generate-queue-events" value="1" />
-                        </li>
-                        <li>
-                            <label for="generate-enqueue-dequeue-events">Enqueue & Dequeue</label>
-                            <input type="radio" id="generate-enqueue-dequeue-events" name="generate-queue-events" value="2" />
-                        </li>
-	                </ul>
-                    <p class="note">Generate an event that can be processed by registered listeners (e.g. for replication).</p>
-                </div> <!-- End of page -->
-            </div> <!-- End of generate-queue-events-scroller -->
-        </div> <!-- End of generate-queue-events -->
-
         <div id="add-queue-additional" class="popup">
             <div class="header">
 		        <a class="back button" href="#">Add Que...</a>
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
index 8cca763e4c..e4262b0577 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
@@ -149,11 +149,6 @@ import org.apache.qpid.qmf2.util.GetOpt;
  *     --limit-policy=&lt;policy&gt;
  *                         Action to take when queue limit is reached
  *     --order=&lt;ordering&gt;  Queue ordering policy
- *     --generate-queue-events=&lt;n&gt;
- *                         If set to 1, every enqueue will generate an event that
- *                         can be processed by registered listeners (e.g. for
- *                         replication). If set to 2, events will be generated
- *                         for enqueues and dequeues.
  *     --flow-stop-size=&lt;n&gt;
  *                         Turn on sender flow control when the number of queued
  *                         bytes exceeds this value.
@@ -285,11 +280,6 @@ public final class QpidConfig
     "    --limit-policy=<policy>\n" +
     "                        Action to take when queue limit is reached\n" +
     "    --order=<ordering>  Queue ordering policy\n" +
-    "    --generate-queue-events=<n>\n" +
-    "                        If set to 1, every enqueue will generate an event that\n" +
-    "                        can be processed by registered listeners (e.g. for\n" +
-    "                        replication). If set to 2, events will be generated\n" +
-    "                        for enqueues and dequeues.\n" +
     "    --flow-stop-size=<n>\n" +
     "                        Turn on sender flow control when the number of queued\n" +
     "                        bytes exceeds this value.\n" +
@@ -1230,7 +1220,7 @@ for (Map.Entry<String, Object> entry  : args.entrySet()) {
     {
         String[] longOpts = {"help", "durable", "bindings", "broker-addr=", "file-count=",
                              "file-size=", "max-queue-size=", "max-queue-count=", "limit-policy=",
-                             "order=", "sequence", "ive", "generate-queue-events=", "force", "force-if-not-empty",
+                             "order=", "sequence", "ive", "force", "force-if-not-empty",
                              "force-if-used", "alternate-exchange=", "passive", "timeout=", "file=", "flow-stop-size=",
                              "flow-resume-size=", "flow-stop-count=", "flow-resume-count=", "argument="};
 
diff --git a/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java
index aaf1d1afce..d38fa03b5a 100644
--- a/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java
@@ -36,7 +36,7 @@ import java.util.ArrayList;
  * <pre>{@code
  * String[] longOpts = {"help", "durable", "bindings", "broker-addr=", "file-count=",
  *                      "file-size=", "max-queue-size=", "max-queue-count=", "limit-policy=",
- *                      "order=", "sequence", "ive", "generate-queue-events=", "force", "force-if-not-empty",
+ *                      "order=", "sequence", "ive", "force", "force-if-not-empty",
  *                      "force-if-used", "alternate-exchange=", "passive", "timeout=", "file=", "flow-stop-size=",
  *                      "flow-resume-size=", "flow-stop-count=", "flow-resume-count=", "argument="};
  *
diff --git a/qpid/tools/src/py/qpid-config b/qpid/tools/src/py/qpid-config
index 816e0f0a08..aaae4d7860 100755
--- a/qpid/tools/src/py/qpid-config
+++ b/qpid/tools/src/py/qpid-config
@@ -225,7 +225,6 @@ def OptionsAndArguments(argv):
     group3.add_option("--max-queue-count", action="store", type="int", metavar="<n>", help="Maximum in-memory queue size as a number of messages")
     group3.add_option("--limit-policy", action="store", choices=["none", "reject", "ring", "ring-strict"], metavar="<policy>", help="Action to take when queue limit is reached")
     group3.add_option("--lvq-key", action="store", metavar="<key>", help="Last Value Queue key")
-    group3.add_option("--generate-queue-events", action="store", type="int", metavar="<n>", help="If set to 1, every enqueue will generate an event that can be processed by registered listeners (e.g. for replication). If set to 2, events will be generated for enqueues and dequeues.")
     group3.add_option("--flow-stop-size", action="store", type="int", metavar="<n>",
                       help="Turn on sender flow control when the number of queued bytes exceeds this value.")
     group3.add_option("--flow-resume-size", action="store", type="int", metavar="<n>",
@@ -316,8 +315,6 @@ def OptionsAndArguments(argv):
         config._lvq_key = opts.lvq_key
     if opts.ive:
         config._ive = True
-    if opts.generate_queue_events:
-        config._eventGeneration = opts.generate_queue_events
     if opts.force:
         config._if_empty = False
         config._if_unused = False