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

5 files changed, 4 insertions, 46 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidQueueOptions.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidQueueOptions.java
index 04aa7d146f..5b6c027f4a 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidQueueOptions.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidQueueOptions.java
@@ -27,7 +27,6 @@ public class QpidQueueOptions extends HashMap<String,Object>
 	public static final String QPID_MAX_COUNT = "qpid.max_count";
     public static final String QPID_MAX_SIZE = "qpid.max_size";
     public static final String QPID_POLICY_TYPE = "qpid.policy_type";    
-    public static final String QPID_PERSIST_LAST_NODE = "qpid.persist_last_node";
     public static final String QPID_LVQ_KEY = "qpid.LVQ_key";
     public static final String QPID_LAST_VALUE_QUEUE = "qpid.last_value_queue";
     public static final String QPID_LAST_VALUE_QUEUE_NO_BROWSE = "qpid.last_value_queue_no_browse";
@@ -60,11 +59,7 @@ public class QpidQueueOptions extends HashMap<String,Object>
         this.put(QPID_MAX_SIZE, i);
     }
     
-    public void setPersistLastNode()
-    {
-        this.put(QPID_PERSIST_LAST_NODE, 1);
-    }
-    
+
     public void setOrderingPolicy(String s)
     {
         if (QpidQueueOptions.QPID_LAST_VALUE_QUEUE.equals(s))
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>
diff --git a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
index e4f44e5db5..8c9d41e199 100644
--- a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
@@ -139,8 +139,6 @@ import org.apache.qpid.qmf2.util.GetOpt;
  *     --durable           The new queue or exchange is durable.
  * 
  *   Options for Adding Queues:
- *     --cluster-durable   The new queue becomes durable if there is only one
- *                         functioning cluster node
  *     --file-count=&lt;n&gt;    Number of files in queue's persistence journal
  *     --file-size=&lt;n&gt;     File size in pages (64Kib/page)
  *     --max-queue-size=&lt;n&gt;
@@ -277,8 +275,6 @@ public final class QpidConfig
     "    --durable           The new queue or exchange is durable.\n" +
     "\n" +
     "  Options for Adding Queues:\n" +
-    "    --cluster-durable   The new queue becomes durable if there is only one\n" +
-    "                        functioning cluster node\n" +
     "    --file-count=<n>    Number of files in queue's persistence journal\n" +
     "    --file-size=<n>     File size in pages (64Kib/page)\n" +
     "    --max-queue-size=<n>\n" +
@@ -337,7 +333,6 @@ public final class QpidConfig
     private String _altExchange = null;
     private boolean _passive = false;
     private boolean _durable = false;
-    private boolean _clusterDurable = false;
     private boolean _ifEmpty = true;
     private boolean _ifUnused = true;
     private long _fileCount = 8;
@@ -364,7 +359,6 @@ public final class QpidConfig
     private static final String MAX_QUEUE_SIZE  = "qpid.max_size";
     private static final String MAX_QUEUE_COUNT  = "qpid.max_count";
     private static final String POLICY_TYPE  = "qpid.policy_type";
-    private static final String CLUSTER_DURABLE = "qpid.persist_last_node";
     private static final String LVQ = "qpid.last_value_queue";
     private static final String LVQNB = "qpid.last_value_queue_no_browse";
     private static final String MSG_SEQUENCE = "qpid.msg_sequence";
@@ -388,7 +382,6 @@ public final class QpidConfig
         SPECIAL_ARGS.add(MAX_QUEUE_SIZE);
         SPECIAL_ARGS.add(MAX_QUEUE_COUNT);
         SPECIAL_ARGS.add(POLICY_TYPE);
-        SPECIAL_ARGS.add(CLUSTER_DURABLE);
         SPECIAL_ARGS.add(LVQ);
         SPECIAL_ARGS.add(LVQNB);
         SPECIAL_ARGS.add(MSG_SEQUENCE);
@@ -673,11 +666,6 @@ for (Map.Entry<String, Object> entry  : args.entrySet()) {
                     System.out.printf("--durable ");
                 }
 
-                if (args.containsKey(CLUSTER_DURABLE) && QmfData.getLong(args.get(CLUSTER_DURABLE)) == 1)
-                {
-                    System.out.printf("--cluster-durable ");
-                }
-
                 if (queue.getBooleanValue("autoDelete"))
                 {
                     System.out.printf("auto-del ");
@@ -936,11 +924,6 @@ for (Map.Entry<String, Object> entry  : args.entrySet()) {
             properties.put(POLICY_TYPE, "ring_strict");
         }
 
-        if (_clusterDurable)
-        {
-            properties.put(CLUSTER_DURABLE, 1l);
-        }
-
         if (_order.equals("lvq"))
         {
             properties.put(LVQ, 1l);
@@ -1255,7 +1238,7 @@ for (Map.Entry<String, Object> entry  : args.entrySet()) {
      */
     public QpidConfig(final String[] args)
     {
-        String[] longOpts = {"help", "durable", "cluster-durable", "bindings", "broker-addr=", "file-count=",
+        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",
                              "force-if-used", "alternate-exchange=", "passive", "timeout=", "file=", "flow-stop-size=",
@@ -1313,11 +1296,6 @@ for (Map.Entry<String, Object> entry  : args.entrySet()) {
                     _durable = true;
                 }
 
-                if (opt[0].equals("--cluster-durable"))
-                {
-                    _clusterDurable = true;
-                }
-
                 if (opt[0].equals("--file-count"))
                 {
                     _fileCount = Long.parseLong(opt[1]);
diff --git a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java
index a99ced9682..a4436b0105 100644
--- a/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java
+++ b/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java
@@ -34,7 +34,7 @@ import java.util.ArrayList;
  * <p>
  * Example usage (paraphrased from QpidConfig):
  * <pre>
- * String[] longOpts = {"help", "durable", "cluster-durable", "bindings", "broker-addr=", "file-count=",
+ * 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",
  *                      "force-if-used", "alternate-exchange=", "passive", "timeout=", "file=", "flow-stop-size=",