From 9e1b387c6b52bc8077650fbc96bf0329e05c1f27 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Fri, 4 Oct 2013 15:53:05 +0000
Subject: QPID-5197: Remove obsolete --cluster-durable/persistLastNode options
 in java code.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1529200 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js | 11 -----------
 qpid/tools/src/java/bin/qpid-web/web/ui/qmf.html              |  6 +-----
 2 files changed, 1 insertion(+), 16 deletions(-)

(limited to 'qpid/tools/src/java/bin')

diff --git a/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
index 6ec55cbcb2..b59099a797 100644
--- a/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
+++ b/qpid/tools/src/java/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
@@ -1747,10 +1747,6 @@ qmfui.AddQueue = new function() {
             } else if (!parseIntegerProperty("#file-count", "qpid.file_count")) {
                 return;
             }
-
-            if ($("#queue-cluster-durable")[0].checked) {
-                _properties["qpid.persist_last_node"] = 1;
-            }
         } else {
             _properties["durable"] = false;
         }
@@ -1831,7 +1827,6 @@ qmfui.AddQueue = new function() {
 
         if (durable) {
             setTimeout(function() {
-                $("#queue-cluster-durable").parent().appendTo(durableList);
                 iTablet.renderList(durableList);
                 setTimeout(function() {
                     $("#file-size").parent().appendTo(durableList);
@@ -1846,17 +1841,11 @@ qmfui.AddQueue = new function() {
 
             $("#add-queue-additional-journal-note").show();
         } else {
-            if ($("#queue-cluster-durable").is(":checked")) {
-                // Have to use a timeout to call click() within an event handler.
-                setTimeout(function() {$("#queue-cluster-durable").click();}, 0);
-            }
-
             setTimeout(function() {
                 $("#file-count").parent().appendTo(hiddenList);
                 setTimeout(function() {
                     $("#file-size").parent().appendTo(hiddenList);
                     setTimeout(function() {
-                        $("#queue-cluster-durable").parent().appendTo(hiddenList);
                         iTablet.renderList(durableList);
                         $("#add-queue-additional").trigger("refresh"); // Refresh touch scroller.
                     }, 30);
diff --git a/qpid/tools/src/java/bin/qpid-web/web/ui/qmf.html b/qpid/tools/src/java/bin/qpid-web/web/ui/qmf.html
index 9709489e3a..4737294c70 100644
--- a/qpid/tools/src/java/bin/qpid-web/web/ui/qmf.html
+++ b/qpid/tools/src/java/bin/qpid-web/web/ui/qmf.html
@@ -976,11 +976,7 @@ these are used to enable a semi-transparent "smoked glass" background behind the
                             <label for="queue-durable">Durable</label>
                             <input type="checkbox" id="queue-durable"/>
                         </li>
-                        <li> 
-                            <label for="queue-cluster-durable">Cluster Durable</label>
-                            <input type="checkbox" id="queue-cluster-durable"/>
-                        </li>
-	        	        <li>
+			<li>
                             <label for="file-size">File Size</label>
                             <input type="text" id="file-size" placeholder="24"/>
                         </li>
-- 
cgit v1.2.1