Author: orudyy
Date: Thu Nov 3 13:26:56 2016
New Revision: 1767882
URL: http://svn.apache.org/viewvc?rev=1767882&view=rev
Log:
QPID-7485: Make FileBasedGroupProvider path attribute immutable and disable UI
controls for immutable path attributes on editing
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java?rev=1767882&r1=1767881&r2=1767882&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java
Thu Nov 3 13:26:56 2016
@@ -30,6 +30,6 @@ public interface FileBasedGroupProvider<
{
String PATH="path";
- @ManagedAttribute( mandatory = true, description = "File location" )
+ @ManagedAttribute( mandatory = true, description = "File location",
immutable = true)
String getPath();
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java?rev=1767882&r1=1767881&r2=1767882&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
Thu Nov 3 13:26:56 2016
@@ -102,16 +102,6 @@ public class FileBasedGroupProviderImpl
}
@Override
- protected void validateChange(final ConfiguredObject<?>
proxyForValidation, final Set<String> changedAttributes)
- {
- super.validateChange(proxyForValidation, changedAttributes);
- if(changedAttributes.contains(PATH))
- {
- throw new IllegalArgumentException("Cannot change the path");
- }
- }
-
- @Override
protected void onOpen()
{
super.onOpen();
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js?rev=1767882&r1=1767881&r2=1767882&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js
Thu Nov 3 13:26:56 2016
@@ -18,25 +18,16 @@
* under the License.
*
*/
-define(["dojo/query", "dijit/registry", "qpid/common/util", "dojo/dom-class"],
function (query, registry, util, domClass)
+define(["dojo/query", "dijit/registry", "qpid/common/util"], function (query,
registry, util)
{
return {
show: function (data)
{
util.parseHtmlIntoDiv(data.containerNode,
"authenticationprovider/filebased/add.html", function ()
{
- var path = registry.byNode(query(".path",
data.containerNode)[0]);
- if (data.data && data.data.id)
- {
- path.set("value", data.data.path);
- path.set("readOnly", true);
- domClass.add(path.domNode, "readOnly")
- }
- else
- {
- path.set("readOnly", false);
- domClass.remove(path.domNode, "readOnly")
- }
+ var pathWidget = registry.byNode(query(".path",
data.containerNode)[0]);
+ pathWidget.set("disabled", data.data && data.data.id ? true :
false);
+ pathWidget.set("value", data.data ? data.data.path : "");
});
}
};
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js?rev=1767882&r1=1767881&r2=1767882&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js
Thu Nov 3 13:26:56 2016
@@ -18,25 +18,16 @@
* under the License.
*
*/
-define(["dojo/query", "dijit/registry", "qpid/common/util", "dojo/dom-class"],
function (query, registry, util, domClass)
+define(["dojo/query", "dijit/registry", "qpid/common/util"], function (query,
registry, util)
{
return {
show: function (data)
{
util.parseHtmlIntoDiv(data.containerNode,
"authenticationprovider/filebased/add.html", function ()
{
- var path = registry.byNode(query(".path",
data.containerNode)[0]);
- if (data.data && data.data.id)
- {
- path.set("value", data.data.path);
- path.set("readOnly", true);
- domClass.add(path.domNode, "readOnly")
- }
- else
- {
- path.set("readOnly", false);
- domClass.remove(path.domNode, "readOnly")
- }
+ var pathWidget = registry.byNode(query(".path",
data.containerNode)[0]);
+ pathWidget.set("disabled", data.data && data.data.id ? true :
false);
+ pathWidget.set("value", data.data ? data.data.path : "");
});
}
};
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js?rev=1767882&r1=1767881&r2=1767882&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js
Thu Nov 3 13:26:56 2016
@@ -32,11 +32,9 @@ define(["dojo/dom",
var that = this;
util.parse(data.containerNode, template, function ()
{
- if (data.data)
- {
- var pathWidget =
registry.byNode(query(".addGroupProviderPath", data.containerNode)[0]);
- pathWidget.set("value", data.data.path);
- }
+ var pathWidget =
registry.byNode(query(".addGroupProviderPath", data.containerNode)[0]);
+ pathWidget.set("disabled", data.data && data.data.id ? true :
false);
+ pathWidget.set("value", data.data ? data.data.path : "");
});
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
