From 330aed70c282fd84d0110082f674f259bc1cf738 Mon Sep 17 00:00:00 2001
From: Robert Godfrey
 <rgodfrey@apache.org =  rgodfrey = Robert Godfrey rgodfrey@apache.org@apache.org>
Date: Mon, 14 Apr 2014 18:03:23 +0000
Subject: QPID-5698 : [Java Broker] remove duplicate definitions of the DURABLE
 attribute name

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1587266 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/qpid/server/model/AccessControlProvider.java     | 1 -
 .../java/org/apache/qpid/server/model/AuthenticationProvider.java    | 1 -
 .../src/main/java/org/apache/qpid/server/model/Broker.java           | 1 -
 .../src/main/java/org/apache/qpid/server/model/Connection.java       | 1 -
 .../src/main/java/org/apache/qpid/server/model/Consumer.java         | 1 -
 .../src/main/java/org/apache/qpid/server/model/Exchange.java         | 3 ---
 .../src/main/java/org/apache/qpid/server/model/Group.java            | 1 -
 .../src/main/java/org/apache/qpid/server/model/GroupMember.java      | 5 -----
 .../src/main/java/org/apache/qpid/server/model/GroupProvider.java    | 1 -
 .../src/main/java/org/apache/qpid/server/model/KeyStore.java         | 1 -
 .../src/main/java/org/apache/qpid/server/model/Plugin.java           | 1 -
 .../broker-core/src/main/java/org/apache/qpid/server/model/Port.java | 1 -
 .../main/java/org/apache/qpid/server/model/PreferencesProvider.java  | 1 -
 .../src/main/java/org/apache/qpid/server/model/Queue.java            | 1 -
 .../src/main/java/org/apache/qpid/server/model/Session.java          | 1 -
 .../src/main/java/org/apache/qpid/server/model/TrustStore.java       | 1 -
 .../broker-core/src/main/java/org/apache/qpid/server/model/User.java | 1 -
 .../src/main/java/org/apache/qpid/server/model/VirtualHost.java      | 1 -
 18 files changed, 24 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
index 11b97474c5..d1819445a8 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
@@ -29,7 +29,6 @@ import org.apache.qpid.server.security.AccessControl;
 @ManagedObject
 public interface AccessControlProvider<X extends AccessControlProvider<X>> extends ConfiguredObject<X>
 {
-    public static final String DURABLE = "durable";
     public static final String LIFETIME_POLICY = "lifetimePolicy";
     public static final String TYPE = "type";
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
index 4c8b5bd083..0ec5927484 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
@@ -34,7 +34,6 @@ public interface AuthenticationProvider<X extends AuthenticationProvider<X>> ext
 {
 
     public static final String DESCRIPTION = "description";
-    public static final String DURABLE = "durable";
     public static final String LIFETIME_POLICY = "lifetimePolicy";
 
     //children
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
index aabcc5844e..08cf85e65b 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
@@ -45,7 +45,6 @@ public interface Broker<X extends Broker<X>> extends ConfiguredObject<X>, EventL
     String SUPPORTED_VIRTUALHOST_STORE_TYPES = "supportedVirtualHostStoreTypes";
     String SUPPORTED_AUTHENTICATION_PROVIDERS = "supportedAuthenticationProviders";
     String SUPPORTED_PREFERENCES_PROVIDER_TYPES = "supportedPreferencesProviderTypes";
-    String DURABLE = "durable";
     String LIFETIME_POLICY = "lifetimePolicy";
     String DEFAULT_VIRTUAL_HOST = "defaultVirtualHost";
     String STATISTICS_REPORTING_PERIOD = "statisticsReportingPeriod";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
index 0c535ba34d..e2e4011abe 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
@@ -29,7 +29,6 @@ public interface Connection<X extends Connection<X>> extends ConfiguredObject<X>
     // Attributes
 
     public static final String STATE = "state";
-    public static final String DURABLE = "durable";
     public static final String LIFETIME_POLICY = "lifetimePolicy";
 
     public static final String CLIENT_ID = "clientId";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
index 65d87ba623..38c488c1f3 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
@@ -32,7 +32,6 @@ public interface Consumer<X extends Consumer<X>> extends ConfiguredObject<X>
     public String NO_LOCAL = "noLocal";
     public String SELECTOR = "selector";
     public String SETTLEMENT_MODE = "settlementMode";
-    public String DURABLE = "durable";
     public String LIFETIME_POLICY = "lifetimePolicy";
     public String STATE = "state";
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
index b1646e87c8..9f8c4321a1 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
@@ -20,15 +20,12 @@
  */
 package org.apache.qpid.server.model;
 
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Map;
 
 @ManagedObject
 public interface Exchange<X extends Exchange<X>> extends ConfiguredObject<X>
 {
-    String DURABLE                              = "durable";
     String LIFETIME_POLICY                      = "lifetimePolicy";
     String STATE                                = "state";
     String ALTERNATE_EXCHANGE                   = "alternateExchange";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
index 33cefe4bf0..bafd93268a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
@@ -22,7 +22,6 @@ package org.apache.qpid.server.model;
 @ManagedObject
 public interface Group<X extends Group<X>> extends ConfiguredObject<X>
 {
-    String DURABLE         = "durable";
     String LIFETIME_POLICY = "lifetimePolicy";
     String STATE           = "state";
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
index d5f964b93f..ffd1eea942 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
@@ -19,14 +19,9 @@
  */
 package org.apache.qpid.server.model;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-
 @ManagedObject
 public interface GroupMember<X extends GroupMember<X>> extends ConfiguredObject<X>
 {
-    String DURABLE         = "durable";
     String LIFETIME_POLICY = "lifetimePolicy";
     String STATE           = "state";
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
index 4d29d27951..8d498c0a5c 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
@@ -29,7 +29,6 @@ import java.util.Set;
 public interface GroupProvider<X extends GroupProvider<X>> extends ConfiguredObject<X>
 {
     public static final String DESCRIPTION = "description";
-    public static final String DURABLE = "durable";
     public static final String LIFETIME_POLICY = "lifetimePolicy";
 
     Set<Principal> getGroupPrincipalsForUser(String username);
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
index 5d574055a4..61b0edd3c7 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
@@ -26,7 +26,6 @@ import javax.net.ssl.KeyManager;
 @ManagedObject( defaultType = "FileKeyStore" )
 public interface KeyStore<X extends KeyStore<X>> extends ConfiguredObject<X>
 {
-    String DURABLE = "durable";
     String LIFETIME_POLICY = "lifetimePolicy";
     String STATE = "state";
     String DESCRIPTION = "description";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
index 5c311908f6..4671e2c55c 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
@@ -24,7 +24,6 @@ package org.apache.qpid.server.model;
 public interface Plugin<X extends Plugin<X>> extends ConfiguredObject<X>
 {
     //Hack, using it for the class name only for consistency with the other things.
-    String DURABLE                              = "durable";
     String LIFETIME_POLICY                      = "lifetimePolicy";
 
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
index b7dd15997b..93b7347159 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
@@ -27,7 +27,6 @@ import java.util.Set;
 @ManagedObject
 public interface Port<X extends Port<X>> extends ConfiguredObject<X>
 {
-    String DURABLE                              = "durable";
     String LIFETIME_POLICY                      = "lifetimePolicy";
     String BINDING_ADDRESS                      = "bindingAddress";
     String PORT                                 = "port";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
index 521450894f..2f8ffa1a1e 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
@@ -27,7 +27,6 @@ import java.util.Set;
 @ManagedObject
 public interface PreferencesProvider<X extends PreferencesProvider<X>> extends ConfiguredObject<X>
 {
-    String DURABLE         = "durable";
     String LIFETIME_POLICY = "lifetimePolicy";
 
     /**
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
index a819a0181c..b8485ee26b 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
@@ -29,7 +29,6 @@ import org.apache.qpid.server.queue.QueueEntryVisitor;
 public interface Queue<X extends Queue<X>> extends ConfiguredObject<X>
 {
 
-    public static final String DURABLE = "durable";
     public static final String LIFETIME_POLICY = "lifetimePolicy";
 
     public static final String ALERT_REPEAT_GAP = "alertRepeatGap";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
index 0eaf014d4e..a2229cb513 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
@@ -28,7 +28,6 @@ import java.util.Collections;
 public interface Session<X extends Session<X>> extends ConfiguredObject<X>
 {
     public static final String STATE = "state";
-    public static final String DURABLE = "durable";
     public static final String LIFETIME_POLICY = "lifetimePolicy";
 
     public static final String CHANNEL_ID = "channelId";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
index d1b1a3d7a5..935424d2da 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
@@ -26,7 +26,6 @@ import javax.net.ssl.TrustManager;
 @ManagedObject( defaultType = "FileTrustStore" )
 public interface TrustStore<X extends TrustStore<X>> extends ConfiguredObject<X>
 {
-    String DURABLE = "durable";
     String LIFETIME_POLICY = "lifetimePolicy";
     String DESCRIPTION = "description";
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
index 9d6c228a70..07ee51c052 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
@@ -29,7 +29,6 @@ import java.util.Map;
 @ManagedObject
 public interface User<X extends User<X>> extends ConfiguredObject<X>
 {
-    String DURABLE         = "durable";
     String LIFETIME_POLICY = "lifetimePolicy";
     String STATE           = "state";
     String PASSWORD        = "password";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
index d7b4868fb4..88fe19e02f 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
@@ -42,7 +42,6 @@ public interface VirtualHost<X extends VirtualHost<X, Q, E>, Q extends Queue<?>,
     String STORE_TRANSACTION_OPEN_TIMEOUT_WARN  = "storeTransactionOpenTimeoutWarn";
     String SUPPORTED_EXCHANGE_TYPES             = "supportedExchangeTypes";
     String SUPPORTED_QUEUE_TYPES                = "supportedQueueTypes";
-    String DURABLE                              = "durable";
     String LIFETIME_POLICY                      = "lifetimePolicy";
     String SECURITY_ACL                         = "securityAcl";
     String HOUSE_KEEPING_THREAD_COUNT           = "houseKeepingThreadCount";
-- 
cgit v1.2.1