Author: rgodfrey
Date: Thu Apr 24 20:07:43 2014
New Revision: 1589862
URL: http://svn.apache.org/r1589862
Log:
QPID-5698 : Address review comments by Keith Wall
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/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/Session.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.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=1589862&r1=1589861&r2=1589862&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
Thu Apr 24 20:07:43 2014
@@ -24,8 +24,6 @@ import org.apache.qpid.server.security.A
@ManagedObject
public interface AccessControlProvider<X extends AccessControlProvider<X>>
extends ConfiguredObject<X>
{
- public static final String TYPE = "type";
-
//retrieve the underlying AccessControl object
AccessControl getAccessControl();
}
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=1589862&r1=1589861&r2=1589862&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
Thu Apr 24 20:07:43 2014
@@ -32,9 +32,6 @@ import org.apache.qpid.server.security.a
@ManagedObject( creatable = false )
public interface AuthenticationProvider<X extends AuthenticationProvider<X>>
extends ConfiguredObject<X>
{
-
- public static final String DESCRIPTION = "description";
-
//children
Collection<VirtualHostAlias> getVirtualHostPortBindings();
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=1589862&r1=1589861&r2=1589862&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
Thu Apr 24 20:07:43 2014
@@ -28,7 +28,6 @@ public interface Consumer<X extends Cons
public String NO_LOCAL = "noLocal";
public String SELECTOR = "selector";
public String SETTLEMENT_MODE = "settlementMode";
- public String STATE = "state";
@ManagedAttribute( automate = true )
String getDistributionMode();
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=1589862&r1=1589861&r2=1589862&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
Thu Apr 24 20:07:43 2014
@@ -28,7 +28,6 @@ import org.apache.qpid.server.message.Me
@ManagedObject
public interface Exchange<X extends Exchange<X>> extends ConfiguredObject<X>,
MessageDestination
{
- String STATE = "state";
String ALTERNATE_EXCHANGE = "alternateExchange";
// Attributes
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=1589862&r1=1589861&r2=1589862&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
Thu Apr 24 20:07:43 2014
@@ -22,5 +22,4 @@ package org.apache.qpid.server.model;
@ManagedObject
public interface Group<X extends Group<X>> extends ConfiguredObject<X>
{
- 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=1589862&r1=1589861&r2=1589862&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
Thu Apr 24 20:07:43 2014
@@ -22,6 +22,4 @@ package org.apache.qpid.server.model;
@ManagedObject
public interface GroupMember<X extends GroupMember<X>> extends
ConfiguredObject<X>
{
- 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=1589862&r1=1589861&r2=1589862&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
Thu Apr 24 20:07:43 2014
@@ -25,7 +25,5 @@ import java.util.Set;
@ManagedObject
public interface GroupProvider<X extends GroupProvider<X>> extends
ConfiguredObject<X>
{
- public static final String DESCRIPTION = "description";
-
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=1589862&r1=1589861&r2=1589862&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
Thu Apr 24 20:07:43 2014
@@ -26,9 +26,5 @@ import javax.net.ssl.KeyManager;
@ManagedObject( defaultType = "FileKeyStore" )
public interface KeyStore<X extends KeyStore<X>> extends ConfiguredObject<X>
{
- String STATE = "state";
- String DESCRIPTION = "description";
-
public KeyManager[] getKeyManagers() throws GeneralSecurityException;
-
}
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=1589862&r1=1589861&r2=1589862&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
Thu Apr 24 20:07:43 2014
@@ -25,8 +25,6 @@ import java.util.Collection;
@ManagedObject
public interface Session<X extends Session<X>> extends ConfiguredObject<X>
{
- String STATE = "state";
-
String CHANNEL_ID = "channelId";
// PRODUCER_FLOW_BLOCKED is exposed as an interim step. We will expose
attribute(s) that exposing
// available credit of both producer and consumer sides.
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=1589862&r1=1589861&r2=1589862&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
Thu Apr 24 20:07:43 2014
@@ -26,12 +26,9 @@ import javax.net.ssl.TrustManager;
@ManagedObject( defaultType = "FileTrustStore" )
public interface TrustStore<X extends TrustStore<X>> extends
ConfiguredObject<X>
{
- String DESCRIPTION = "description";
-
@ManagedAttribute( secure = true, automate = true, mandatory = true)
public String getPassword();
-
public void setPassword(String password);
public TrustManager[] getTrustManagers() throws GeneralSecurityException;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
