diff options
| author | Ted Ross <tross@apache.org> | 2015-03-27 20:07:07 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2015-03-27 20:07:07 +0000 |
| commit | d216f4bd35020956848d38182148ba6b5a10efa4 (patch) | |
| tree | efc596b3d72cdccfc986953be06b6af264410f4d /qpid/tools/src/java | |
| parent | be7e028eda0b4880686e8b069e36a1946164fb67 (diff) | |
| download | qpid-python-d216f4bd35020956848d38182148ba6b5a10efa4.tar.gz | |
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
Diffstat (limited to 'qpid/tools/src/java')
3 files changed, 2 insertions, 42 deletions
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=<policy> * Action to take when queue limit is reached * --order=<ordering> Queue ordering policy - * --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. * --flow-stop-size=<n> * 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="}; * |