QPID-6347: Remove the now obsolete queue_event_generation option; this is a patch from Irina Boverman

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

2 files changed, 1 insertions, 23 deletions

diff --git a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java b/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
index 04a0642e2e..8cca763e4c 100644
--- a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
+++ b/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
@@ -344,7 +344,6 @@ public final class QpidConfig
     private String _order = "fifo";
     private boolean _msgSequence = false;
     private boolean _ive = false;
-    private long _eventGeneration = 0;
     private String _file = null;
 
     // New to Qpid 0.10 qpid-config
@@ -364,7 +363,6 @@ public final class QpidConfig
     private static final String LVQNB = "qpid.last_value_queue_no_browse";
     private static final String MSG_SEQUENCE = "qpid.msg_sequence";
     private static final String IVE = "qpid.ive";
-    private static final String QUEUE_EVENT_GENERATION = "qpid.queue_event_generation";
     private static final String FLOW_STOP_COUNT   = "qpid.flow_stop_count";
     private static final String FLOW_RESUME_COUNT = "qpid.flow_resume_count";
     private static final String FLOW_STOP_SIZE    = "qpid.flow_stop_size";
@@ -387,7 +385,6 @@ public final class QpidConfig
         SPECIAL_ARGS.add(LVQNB);
         SPECIAL_ARGS.add(MSG_SEQUENCE);
         SPECIAL_ARGS.add(IVE);
-        SPECIAL_ARGS.add(QUEUE_EVENT_GENERATION);
         SPECIAL_ARGS.add(FLOW_STOP_COUNT);
         SPECIAL_ARGS.add(FLOW_RESUME_COUNT);
         SPECIAL_ARGS.add(FLOW_STOP_SIZE);
@@ -714,11 +711,6 @@ for (Map.Entry<String, Object> entry  : args.entrySet()) {
                     System.out.printf("--order lvq-no-browse ");
                 }
 
-                if (args.containsKey(QUEUE_EVENT_GENERATION))
-                {
-                    System.out.printf("--generate-queue-events=%d ", QmfData.getLong(args.get(QUEUE_EVENT_GENERATION)));
-                }
- 
                 if (queue.hasValue("altExchange"))
                 {
                     ObjectId altExchangeRef = queue.getRefValue("altExchange");
@@ -936,11 +928,6 @@ for (Map.Entry<String, Object> entry  : args.entrySet()) {
             properties.put(LVQNB, 1l);
         }
 
-        if (_eventGeneration > 0)
-        {
-            properties.put(QUEUE_EVENT_GENERATION, _eventGeneration);
-        }
-
         if (_altExchange != null)
         {
             properties.put("alternate-exchange", _altExchange);
@@ -1393,11 +1380,6 @@ for (Map.Entry<String, Object> entry  : args.entrySet()) {
                     _ive = true;
                 }
 
-                if (opt[0].equals("--generate-queue-events"))
-                {
-                    _eventGeneration = Long.parseLong(opt[1]);
-                }
-
                 if (opt[0].equals("--force"))
                 {
                     _ifEmpty  = false;
diff --git a/tools/src/py/qpid-config b/tools/src/py/qpid-config
index 8d38b1a342..816e0f0a08 100755
--- a/tools/src/py/qpid-config
+++ b/tools/src/py/qpid-config
@@ -147,7 +147,6 @@ POLICY_TYPE  = "qpid.policy_type"
 LVQ_KEY = "qpid.last_value_queue_key"
 MSG_SEQUENCE = "qpid.msg_sequence"
 IVE = "qpid.ive"
-QUEUE_EVENT_GENERATION = "qpid.queue_event_generation"
 FLOW_STOP_COUNT   = "qpid.flow_stop_count"
 FLOW_RESUME_COUNT = "qpid.flow_resume_count"
 FLOW_STOP_SIZE    = "qpid.flow_stop_size"
@@ -164,7 +163,7 @@ REPLICATE = "qpid.replicate"
 SPECIAL_ARGS=[
     FILECOUNT,FILESIZE,EFP_PARTITION_NUM,EFP_POOL_FILE_SIZE,
     MAX_QUEUE_SIZE,MAX_QUEUE_COUNT,POLICY_TYPE,
-    LVQ_KEY,MSG_SEQUENCE,IVE,QUEUE_EVENT_GENERATION,
+    LVQ_KEY,MSG_SEQUENCE,IVE,
     FLOW_STOP_COUNT,FLOW_RESUME_COUNT,FLOW_STOP_SIZE,FLOW_RESUME_SIZE,
     MSG_GROUP_HDR_KEY,SHARED_MSG_GROUP,REPLICATE]
 
@@ -541,7 +540,6 @@ class BrokerManager:
                 if MAX_QUEUE_COUNT in args: print "--max-queue-count=%s" % args[MAX_QUEUE_COUNT],
                 if POLICY_TYPE in args: print "--limit-policy=%s" % args[POLICY_TYPE].replace("_", "-"),
                 if LVQ_KEY in args: print "--lvq-key=%s" % args[LVQ_KEY],
-                if QUEUE_EVENT_GENERATION in args: print "--generate-queue-events=%s" % args[QUEUE_EVENT_GENERATION],
                 if q.altExchange:
                     print "--alternate-exchange=%s" % q.altExchange,
                 if FLOW_STOP_SIZE in args: print "--flow-stop-size=%s" % args[FLOW_STOP_SIZE],
@@ -638,8 +636,6 @@ class BrokerManager:
 
         if config._lvq_key:
             declArgs[LVQ_KEY] = config._lvq_key
-        if config._eventGeneration:
-            declArgs[QUEUE_EVENT_GENERATION]  = config._eventGeneration
 
         if config._flowStopSize is not None:
             declArgs[FLOW_STOP_SIZE]  = config._flowStopSize