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 2016/07/10 20:06:49 UTC
svn commit: r1752110 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/model/adapter/
broker-core/src/main/java/org/apache/qpid/server/security/
broker-plugins/access-control...
Author: rgodfrey
Date: Sun Jul 10 20:06:49 2016
New Revision: 1752110
URL: http://svn.apache.org/viewvc?rev=1752110&view=rev
Log:
QPID-7318 : Show priority in web console, order children according to priority in output
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractRuleBasedAccessControlProvider.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addAccessControlProvider.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java?rev=1752110&r1=1752109&r2=1752110&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java Sun Jul 10 20:06:49 2016
@@ -19,13 +19,35 @@
*/
package org.apache.qpid.server.model;
+import java.util.Comparator;
+
import org.apache.qpid.server.security.AccessControl;
@ManagedObject
-public interface AccessControlProvider<X extends AccessControlProvider<X>> extends ConfiguredObject<X>
+public interface AccessControlProvider<X extends AccessControlProvider<X>> extends ConfiguredObject<X>, Comparable<AccessControlProvider>
{
String PRIORITY = "priority";
+ Comparator<AccessControlProvider> ACCESS_CONTROL_POVIDER_COMPARATOR = new Comparator<AccessControlProvider>()
+ {
+ @Override
+ public int compare(final AccessControlProvider o1, final AccessControlProvider o2)
+ {
+ if(o1.getPriority() < o2.getPriority())
+ {
+ return -1;
+ }
+ else if (o1.getPriority() > o2.getPriority())
+ {
+ return 1;
+ }
+ else
+ {
+ return o1.getName().compareTo(o2.getName());
+ }
+ }
+ };
+
@ManagedAttribute(defaultValue = "10")
int getPriority();
//retrieve the underlying AccessControl object
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1752110&r1=1752109&r2=1752110&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java Sun Jul 10 20:06:49 2016
@@ -38,7 +38,6 @@ import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -149,25 +148,6 @@ public class BrokerAdapter extends Abstr
};
- private static Comparator<AccessControlProvider> ACCESS_CONTROL_POVIDER_COMPARATOR = new Comparator<AccessControlProvider>()
- {
- @Override
- public int compare(final AccessControlProvider o1, final AccessControlProvider o2)
- {
- if(o1.getPriority() < o2.getPriority())
- {
- return -1;
- }
- else if (o1.getPriority() > o2.getPriority())
- {
- return 1;
- }
- else
- {
- return o1.getName().compareTo(o2.getName());
- }
- }
- };
private final BrokerPrincipal _principal;
private String[] POSITIVE_NUMERIC_ATTRIBUTES = { CONNECTION_SESSION_COUNT_LIMIT,
@@ -517,8 +497,6 @@ public class BrokerAdapter extends Abstr
}
}
-
-
@Override
public String getBuildVersion()
{
@@ -842,7 +820,7 @@ public class BrokerAdapter extends Abstr
if(!isManagementMode())
{
List<AccessControlProvider> children = new ArrayList<>(getChildren(AccessControlProvider.class));
- Collections.sort(children, ACCESS_CONTROL_POVIDER_COMPARATOR);
+ Collections.sort(children, AccessControlProvider.ACCESS_CONTROL_POVIDER_COMPARATOR);
List<AccessControl<?>> accessControls = new ArrayList<>(children.size()+1);
accessControls.add(_systemUserAllowed);
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java?rev=1752110&r1=1752109&r2=1752110&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java Sun Jul 10 20:06:49 2016
@@ -28,6 +28,7 @@ import com.google.common.util.concurrent
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.messages.AccessControlMessages;
import org.apache.qpid.server.model.AbstractConfiguredObject;
+import org.apache.qpid.server.model.AccessControlProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
@@ -94,4 +95,9 @@ public class AllowAllAccessControlProvid
});
}
+ @Override
+ public int compareTo(final AccessControlProvider o)
+ {
+ return ACCESS_CONTROL_POVIDER_COMPARATOR.compare(this, o);
+ }
}
Modified: qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractRuleBasedAccessControlProvider.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractRuleBasedAccessControlProvider.java?rev=1752110&r1=1752109&r2=1752110&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractRuleBasedAccessControlProvider.java (original)
+++ qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractRuleBasedAccessControlProvider.java Sun Jul 10 20:06:49 2016
@@ -184,4 +184,10 @@ public abstract class AbstractRuleBasedA
{
return _priority;
}
+
+ @Override
+ public int compareTo(final AccessControlProvider o)
+ {
+ return ACCESS_CONTROL_POVIDER_COMPARATOR.compare(this, o);
+ }
}
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java?rev=1752110&r1=1752109&r2=1752110&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java Sun Jul 10 20:06:49 2016
@@ -268,15 +268,21 @@ public class ConfiguredObjectToMapConver
if(children != null)
{
List<? extends ConfiguredObject> sortedChildren = new ArrayList<ConfiguredObject>(children);
- Collections.sort(sortedChildren, new Comparator<ConfiguredObject>()
+ if(Comparable.class.isAssignableFrom(childClass))
{
- @Override
- public int compare(final ConfiguredObject o1, final ConfiguredObject o2)
+ Collections.sort((List)sortedChildren);
+ }
+ else
+ {
+ Collections.sort(sortedChildren, new Comparator<ConfiguredObject>()
{
- return o1.getName().compareTo(o2.getName());
- }
- });
-
+ @Override
+ public int compare(final ConfiguredObject o1, final ConfiguredObject o2)
+ {
+ return o1.getName().compareTo(o2.getName());
+ }
+ });
+ }
List<Map<String, Object>> childObjects = new ArrayList<>();
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addAccessControlProvider.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addAccessControlProvider.html?rev=1752110&r1=1752109&r2=1752110&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addAccessControlProvider.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addAccessControlProvider.html Sun Jul 10 20:06:49 2016
@@ -48,7 +48,19 @@
</select>
</div>
</div>
-
+ <div class="clear">
+ <div class="formLabel-labelCell tableContainer-labelCell">Priority:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell">
+ <input type="text" id="addAccessControlProvider.priority"
+ data-dojo-type="dijit/form/ValidationTextBox"
+ data-dojo-props="
+ name: 'priority',
+ placeHolder: 'priority',
+ required: false,
+ promptMessage: 'Priority of this provider (0 is highest priority)',
+ title: 'Enter a priority for the provider (0 is highest priority)'" />
+ </div>
+ </div>
<div class="clear">
<div id="addAccessControlProvider.typeFields"></div>
</div>
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js?rev=1752110&r1=1752109&r2=1752110&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AccessControlProvider.js Sun Jul 10 20:06:49 2016
@@ -117,6 +117,7 @@ define(["dojo/parser",
this.name = query(".name", node)[0];
this.type = query(".type", node)[0];
this.state = query(".state", node)[0];
+ this.priority = query(".priority", node)[0];
var that = this;
@@ -152,6 +153,8 @@ define(["dojo/parser",
this.name.innerHTML = entities.encode(String(this.accessControlProviderData["name"]));
this.type.innerHTML = entities.encode(String(this.accessControlProviderData["type"]));
this.state.innerHTML = entities.encode(String(this.accessControlProviderData["state"]));
+ this.priority.innerHTML = entities.encode(String(this.accessControlProviderData["priority"]));
+
};
return AccessControlProvider;
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1752110&r1=1752109&r2=1752110&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js Sun Jul 10 20:06:49 2016
@@ -734,15 +734,19 @@ define(["dojo/parser",
new UpdatableStore([], query(".broker-access-control-providers")[0], [{
name: "Name",
field: "name",
- width: "40%"
+ width: "20%"
}, {
name: "State",
field: "state",
- width: "30%"
+ width: "20%"
}, {
name: "Type",
field: "type",
- width: "30%"
+ width: "40%"
+ }, {
+ name: "Priority",
+ field: "priority",
+ width: "20%"
}], function (obj)
{
connect.connect(obj.grid, "onRowDblClick", obj.grid, function (evt)
@@ -834,43 +838,7 @@ define(["dojo/parser",
}
};
- BrokerUpdater.prototype.displayACLWarnMessage = function (aclProviderData)
- {
- var message = "";
- if (aclProviderData.length > 1)
- {
- var aclProviders = {};
- var theSameTypeFound = false;
- for (var d = 0; d < aclProviderData.length; d++)
- {
- var acl = aclProviderData[d];
- var aclType = acl.type;
- if (aclProviders[aclType])
- {
- aclProviders[aclType].push(acl.name);
- theSameTypeFound = true;
- }
- else
- {
- aclProviders[aclType] = [acl.name];
- }
- }
-
- if (theSameTypeFound)
- {
- message = "Only one instance of a given type will be used. Please remove an instance of type(s):";
- for (var aclType in aclProviders)
- {
- if (aclProviders[aclType].length > 1)
- {
- message += " " + aclType;
- }
- }
- }
- }
- this.accessControlProvidersWarn.innerHTML = message;
- }
-
+
BrokerUpdater.prototype.update = function (callback)
{
if (!this.contentPane.selected && !callback)
@@ -961,7 +929,6 @@ define(["dojo/parser",
{
var data = that.brokerData.accesscontrolproviders ? that.brokerData.accesscontrolproviders : [];
that.accessControlProvidersGrid.update(data);
- that.displayACLWarnMessage(data);
}
if (that.brokerLoggersGrid)
{
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js?rev=1752110&r1=1752109&r2=1752110&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js Sun Jul 10 20:06:49 2016
@@ -90,6 +90,8 @@ define(["dojo/_base/lang",
this.supportedAccessControlProviderTypes.sort();
var accessControlProviderTypeStore = util.makeTypeStore(this.supportedAccessControlProviderTypes);
this.accessControlProviderType.set("store", accessControlProviderTypeStore);
+ util.applyMetadataToWidgets(dom.byId("addAccessControlProvider.contentPane"), "AccessControlProvider", "AllowAll", management.metadata);
+
this.dialog.show();
},
_cancel: function (e)
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html?rev=1752110&r1=1752109&r2=1752110&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html Sun Jul 10 20:06:49 2016
@@ -32,6 +32,10 @@
<div class="formLabel-labelCell">State:</div>
<div class="state"></div>
</div>
+ <div class="clear">
+ <div class="formLabel-labelCell">Priority:</div>
+ <div class="priority"></div>
+ </div>
<div class="clear"></div>
<div class="providerDetails"></div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org