You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/04/14 20:03:23 UTC
svn commit: r1587266 -
/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/
Author: rgodfrey
Date: Mon Apr 14 18:03:23 2014
New Revision: 1587266
URL: http://svn.apache.org/r1587266
Log:
QPID-5698 : [Java Broker] remove duplicate definitions of the DURABLE attribute name
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java Mon Apr 14 18:03:23 2014
@@ -29,7 +29,6 @@ import org.apache.qpid.server.security.A
@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";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java Mon Apr 14 18:03:23 2014
@@ -34,7 +34,6 @@ public interface AuthenticationProvider<
{
public static final String DESCRIPTION = "description";
- public static final String DURABLE = "durable";
public static final String LIFETIME_POLICY = "lifetimePolicy";
//children
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java Mon Apr 14 18:03:23 2014
@@ -45,7 +45,6 @@ public interface Broker<X extends Broker
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";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java Mon Apr 14 18:03:23 2014
@@ -29,7 +29,6 @@ public interface Connection<X extends Co
// 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";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java Mon Apr 14 18:03:23 2014
@@ -32,7 +32,6 @@ public interface Consumer<X extends Cons
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";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java Mon Apr 14 18:03:23 2014
@@ -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";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java Mon Apr 14 18:03:23 2014
@@ -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";
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java Mon Apr 14 18:03:23 2014
@@ -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";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java Mon Apr 14 18:03:23 2014
@@ -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);
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java Mon Apr 14 18:03:23 2014
@@ -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";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java Mon Apr 14 18:03:23 2014
@@ -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";
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java Mon Apr 14 18:03:23 2014
@@ -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";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java Mon Apr 14 18:03:23 2014
@@ -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";
/**
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java Mon Apr 14 18:03:23 2014
@@ -29,7 +29,6 @@ import org.apache.qpid.server.queue.Queu
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";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java Mon Apr 14 18:03:23 2014
@@ -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";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java Mon Apr 14 18:03:23 2014
@@ -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";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java Mon Apr 14 18:03:23 2014
@@ -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";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1587266&r1=1587265&r2=1587266&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java Mon Apr 14 18:03:23 2014
@@ -42,7 +42,6 @@ public interface VirtualHost<X extends V
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";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org