You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/03/03 15:56:42 UTC
svn commit: r1663717 [5/6] - in
/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java: ./
amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/
amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/
amqp-1-0-common/src/main/java/org/a...
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/add.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/add.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/external/add.js Tue Mar 3 14:56:40 2015
@@ -24,12 +24,15 @@ define(["dojo/query","dijit/registry","q
return {
show: function(data)
{
- util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/external/add.html");
- if (data.data)
+ util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/external/add.html",
+ function()
{
- var useFullDN = registry.byNode(query(".useFullDN", data.containerNode)[0]);
- useFullDN.set("value", data.data.useFullDN);
- }
+ if (data.data)
+ {
+ var useFullDN = registry.byNode(query(".useFullDN", data.containerNode)[0]);
+ useFullDN.set("value", data.data.useFullDN);
+ }
+ });
}
};
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js Tue Mar 3 14:56:40 2015
@@ -24,12 +24,15 @@ define(["dojo/query","dijit/registry","q
return {
show: function(data)
{
- util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/filebased/add.html");
- if (data.data)
+ util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/filebased/add.html",
+ function()
{
- var path = registry.byNode(query(".path", data.containerNode)[0]);
- path.set("value", data.data.path);
- }
+ if (data.data)
+ {
+ var path = registry.byNode(query(".path", data.containerNode)[0]);
+ path.set("value", data.data.path);
+ }
+ });
}
};
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js Tue Mar 3 14:56:40 2015
@@ -24,8 +24,11 @@ define(["dojo/_base/xhr","dojo/query","d
return {
show: function(data)
{
- util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/simpleldap/add.html");
-
+ var that = this;
+ util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/simpleldap/add.html", function(){that._postParse(data);});
+ },
+ _postParse: function(data)
+ {
var that = this;
xhr.get({url: "api/latest/truststore", sync: true, handleAs: "json"}).then(
function(trustStores)
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js Tue Mar 3 14:56:40 2015
@@ -55,8 +55,11 @@ define(["dojo/_base/xhr",
{
var that=this;
this.containerNode = domConstruct.create("div", {innerHTML: template});
- parser.parse(this.containerNode);
-
+ parser.parse(this.containerNode).then(function(instances){ that._postParse();});
+ },
+ _postParse: function()
+ {
+ var that=this;
this.dialog = registry.byId("editBrokerDialog");
this.saveButton = registry.byId("editBroker.saveButton");
this.cancelButton = registry.byId("editBroker.cancelButton");
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js Tue Mar 3 14:56:40 2015
@@ -79,7 +79,11 @@ define(["dojo/_base/xhr",
{
var that=this;
this.containerNode = domConstruct.create("div", {innerHTML: template});
- parser.parse(this.containerNode);
+ parser.parse(this.containerNode).then(function(instances){ that._postParse();});
+ },
+ _postParse: function()
+ {
+ var that=this;
this.allFieldsContainer = dom.byId("formEditQueue.allFields");
this.dialog = registry.byId("editQueue");
this.saveButton = registry.byId("formEditQueue.saveButton");
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js Tue Mar 3 14:56:40 2015
@@ -56,7 +56,11 @@ define(["dojo/_base/xhr",
{
var that=this;
this.containerNode = domConstruct.create("div", {innerHTML: template});
- parser.parse(this.containerNode);
+ parser.parse(this.containerNode).then(function(instances){ that._postParse();});
+ },
+ _postParse: function()
+ {
+ var that=this;
this.allFieldsContainer = dom.byId("editVirtualHost.allFields");
this.typeFieldsContainer = dom.byId("editVirtualHost.typeFields");
this.dialog = registry.byId("editVirtualHostDialog");
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js Tue Mar 3 14:56:40 2015
@@ -52,7 +52,12 @@ define(["dojo/_base/xhr",
{
var that=this;
this.containerNode = domConstruct.create("div", {innerHTML: template});
- parser.parse(this.containerNode);
+ parser.parse(this.containerNode).then(function(instances){ that._postParse();});
+ },
+ _postParse: function()
+ {
+ var that=this;
+ this.allFieldsContainer = dom.byId("editVirtualHostNode.allFields");
this.typeFieldsContainer = dom.byId("editVirtualHostNode.typeFields");
this.dialog = registry.byId("editVirtualHostNodeDialog");
this.saveButton = registry.byId("editVirtualHostNode.saveButton");
@@ -160,7 +165,7 @@ define(["dojo/_base/xhr",
TypeUI.show({containerNode:that.typeFieldsContainer, parent: that, data: actualData, effectiveData: effectiveData});
that.form.connectChildren();
- util.applyMetadataToWidgets(that.allFieldsContainer, "VirtualHostNode", actualData.type);
+ util.applyToWidgets(that.allFieldsContainer, "VirtualHostNode", actualData.type, actualData);
}
catch(e)
{
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js Tue Mar 3 14:56:40 2015
@@ -76,8 +76,8 @@ define(["dojo/_base/xhr",
sync: true,
load: function(data) {
contentPane.containerNode.innerHTML = data;
- parser.parse(contentPane.containerNode);
-
+ parser.parse(contentPane.containerNode).then(function(instances)
+ {
that.groupUpdater = new GroupUpdater(contentPane.containerNode, that, that.controller);
that.groupUpdater.update();
updater.add( that.groupUpdater );
@@ -100,6 +100,7 @@ define(["dojo/_base/xhr",
"Are you sure you want to remove group member");
}
);
+ });
}});
};
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js Tue Mar 3 14:56:40 2015
@@ -54,9 +54,9 @@ define(["dojo/_base/xhr",
var that = this;
this.name = groupProviderObj.name;
node.innerHTML = template;
- parser.parse(node);
this.controller = controller;
-
+ parser.parse(node).then(function(instances)
+ {
var groupDiv = query(".groups", node)[0];
var gridProperties = {
@@ -75,7 +75,7 @@ define(["dojo/_base/xhr",
indirectSelection: true
}};
- this.groupsGrid = new UpdatableStore([], groupDiv,
+ that.groupsGrid = new UpdatableStore([], groupDiv,
[ { name: "Group Name", field: "name", width: "100%" }
], function(obj) {
connect.connect(obj.grid, "onRowDblClick", obj.grid,
@@ -86,10 +86,11 @@ define(["dojo/_base/xhr",
that.controller.show("group", name, groupProviderObj, theItem.id);
});
}, gridProperties, EnhancedGrid);
- var addGroupButton = query(".addGroupButton", node)[0];
- registry.byNode(addGroupButton).on("click", function(evt){ addGroup.show(groupProviderObj.name) });
- var deleteWidget = registry.byNode(query(".deleteGroupButton", node)[0]);
- deleteWidget.on("click", function(evt){ event.stop(evt); that.deleteGroups(); });
+ var addGroupButton = query(".addGroupButton", node)[0];
+ registry.byNode(addGroupButton).on("click", function(evt){ addGroup.show(groupProviderObj.name) });
+ var deleteWidget = registry.byNode(query(".deleteGroupButton", node)[0]);
+ deleteWidget.on("click", function(evt){ event.stop(evt); that.deleteGroups(); });
+ });
}
GroupManagingGroupProvider.prototype.deleteGroups = function()
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js Tue Mar 3 14:56:40 2015
@@ -25,12 +25,15 @@ define(["dojo/dom","dojo/query", "dojo/_
return { show: function(data)
{
var that=this;
- util.parseHtmlIntoDiv(data.containerNode, "groupprovider/groupfile/add.html");
- if (data.data)
+ util.parseHtmlIntoDiv(data.containerNode, "groupprovider/groupfile/add.html",
+ function()
{
- var pathWidget = registry.byNode(query(".addGroupProviderPath", data.containerNode)[0]);
- pathWidget.set("value", data.data.path);
- }
+ if (data.data)
+ {
+ var pathWidget = registry.byNode(query(".addGroupProviderPath", data.containerNode)[0]);
+ pathWidget.set("value", data.data.path);
+ }
+ });
}
};
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogFileDownloadDialog.js Tue Mar 3 14:56:40 2015
@@ -51,9 +51,13 @@ return declare("qpid.management.logs.Log
closeButton: null,
constructor: function(args){
+ var that = this;
this.containerNode = domConstruct.create("div", {innerHTML: template});
- parser.parse(this.containerNode);
-
+ parser.parse(this.containerNode).then(function(instances){that._postParse();});
+ },
+ _postParse: function()
+ {
+ var that = this;
this.logFileTreeDiv = query(".logFilesGrid", this.containerNode)[0];
this.downloadLogsButton = registry.byNode(query(".downloadLogsButton", this.containerNode)[0]);
this.closeButton = registry.byNode(query(".downloadLogsDialogCloseButton", this.containerNode)[0]);
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logs/LogViewer.js Tue Mar 3 14:56:40 2015
@@ -62,9 +62,13 @@ define(["dojo/_base/xhr",
this.contentPane = contentPane;
this.contentPane.containerNode.innerHTML = markup;
- parser.parse(this.contentPane.containerNode);
+ parser.parse(this.contentPane.containerNode).then(function(instances){self._postParse();});
+ };
+ LogViewer.prototype._postParse = function()
+ {
+ var self = this;
- this.downloadLogsButton = registry.byNode(query(".downloadLogs", contentPane.containerNode)[0]);
+ this.downloadLogsButton = registry.byNode(query(".downloadLogs", this.contentPane.containerNode)[0]);
this.downloadLogDialog = new LogFileDownloadDialog();
this.downloadLogsButton.on("click", function(evt){
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementhttp.js Tue Mar 3 14:56:40 2015
@@ -47,14 +47,15 @@ define(["dojo/_base/xhr",
sync: true,
load: function(data) {
node.innerHTML = data;
- parser.parse(node);
-
+ parser.parse(node).then(function(instances)
+ {
that.managementHttpUpdater= new ManagementHttpUpdater(node, pluginObject, controller);
that.managementHttpUpdater.update(true);
updater.add( that.managementHttpUpdater);
var editButton = query(".editPluginButton", node)[0];
connect.connect(registry.byNode(editButton), "onClick", function(evt){ that.edit(); });
+ });
}});
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js Tue Mar 3 14:56:40 2015
@@ -43,14 +43,15 @@ define(["dojo/_base/xhr",
sync: true,
load: function(data) {
node.innerHTML = data;
- parser.parse(node);
-
+ parser.parse(node).then(function(instances)
+ {
that.managementJmxUpdater= new ManagementJmxUpdater(node, pluginObject, controller);
that.managementJmxUpdater.update(true);
updater.add( that.managementJmxUpdater);
var editButton = query(".editPluginButton", node)[0];
connect.connect(registry.byNode(editButton), "onClick", function(evt){ that.edit(); });
+ });
}});
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/add.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/add.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/add.js Tue Mar 3 14:56:40 2015
@@ -23,12 +23,15 @@ define(["dojo/query", "dijit/registry",
return {
show: function (data)
{
- util.parseHtmlIntoDiv(data.containerNode, "preferencesprovider/filesystempreferences/add.html");
- if (data.data)
+ util.parseHtmlIntoDiv(data.containerNode, "preferencesprovider/filesystempreferences/add.html",
+ function()
{
- var pathWidget = registry.byNode(query(".addPreferencesProviderPath", data.containerNode)[0]);
- pathWidget.set("value", data.data.path);
- }
+ if (data.data)
+ {
+ var pathWidget = registry.byNode(query(".addPreferencesProviderPath", data.containerNode)[0]);
+ pathWidget.set("value", data.data.path);
+ }
+ });
}
};
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js Tue Mar 3 14:56:40 2015
@@ -32,8 +32,10 @@ define(["dojo/_base/xhr",
sync: true,
load: function(template) {
containerNode.innerHTML = template;
- parser.parse(containerNode);
- that.preferencesProviderPath=query(".fileSystemPreferencesProviderPath", containerNode)[0];
+ parser.parse(containerNode).then(function(instances)
+ {
+ that.preferencesProviderPath=query(".fileSystemPreferencesProviderPath", containerNode)[0];
+ });
}});
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js Tue Mar 3 14:56:40 2015
@@ -18,30 +18,41 @@
* under the License.
*
*/
-define(["dojo/dom","dojo/query", "dojo/_base/array", "dijit/registry","qpid/common/util", "qpid/common/metadata"],
- function (dom, query, array, registry, util, metadata)
+define(["dojo/dom",
+ "dojo/query",
+ "dojo/_base/array",
+ "dijit/registry",
+ "qpid/common/util",
+ "qpid/common/metadata",
+ "dojo/parser",
+ "dojo/text!store/filekeystore/add.html",
+ "dojo/domReady!"],
+ function (dom, query, array, registry, util, metadata, parser, template)
{
var addKeyStore =
{
- init: function()
- {
- },
show: function(data)
{
var that=this;
- util.parseHtmlIntoDiv(data.containerNode, "store/filekeystore/add.html");
-
this.containerNode = data.containerNode;
+ data.containerNode.innerHTML = template;
+ parser.parse(this.containerNode).then(function(instances)
+ {
+ that.keyStoreOldBrowserWarning = dom.byId("addStore.oldBrowserWarning");
- this.keyStoreOldBrowserWarning = dom.byId("addStore.oldBrowserWarning");
+ if (!window.FileReader)
+ {
+ that.keyStoreOldBrowserWarning.innerHTML = "File upload requires a more recent browser with HTML5 support";
+ that.keyStoreOldBrowserWarning.className = that.keyStoreOldBrowserWarning.className.replace("hidden", "");
+ }
- this.addButton = data.parent.addButton;
+ if (data.effectiveData)
+ {
+ that.update(data.effectiveData);
+ }
- if (!window.FileReader)
- {
- this.keyStoreOldBrowserWarning.innerHTML = "File upload requires a more recent browser with HTML5 support";
- this.keyStoreOldBrowserWarning.className = this.keyStoreOldBrowserWarning.className.replace("hidden", "");
- }
+ util.applyMetadataToWidgets(data.containerNode, "KeyStore", "FileKeyStore");
+ });
},
update: function(effectiveData)
{
@@ -53,28 +64,38 @@ define(["dojo/dom","dojo/query", "dojo/_
if (name in attributes )
{
var attribute = attributes[name];
- if (attribute.secure || attribute.oversize)
- {
- item.set("required", false);
- item.set("placeHolder", effectiveData[name]);
- }
- else
+ var value = effectiveData[name];
+ if (value)
{
- item.set("value", effectiveData[name]);
+ if (attribute.secure)
+ {
+ if (!/^\*+/.test(value) )
+ {
+ item.set("value", value);
+ }
+ else
+ {
+ item.set("required", false);
+ if (name == "storeUrl")
+ {
+ item.set("uploaded", true)
+ }
+ else
+ {
+ item.set("placeHolder", value);
+ }
+ }
+ }
+ else
+ {
+ item.set("value", value);
+ }
}
}
});
}
};
- try
- {
- addKeyStore.init();
- }
- catch(e)
- {
- console.warn(e);
- }
return addKeyStore;
}
);
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/add.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/add.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/add.js Tue Mar 3 14:56:40 2015
@@ -18,31 +18,42 @@
* under the License.
*
*/
-define(["dojo/dom","dojo/query", "dojo/_base/array", "dijit/registry","qpid/common/util", "qpid/common/metadata"],
- function (dom, query, array, registry, util, metadata)
+define(["dojo/dom",
+ "dojo/query",
+ "dojo/_base/array",
+ "dijit/registry",
+ "qpid/common/util",
+ "qpid/common/metadata",
+ "dojo/parser",
+ "dojo/text!store/filetruststore/add.html",
+ "dojo/domReady!"],
+ function (dom, query, array, registry, util, metadata, parser, template)
{
var addTrustStore =
{
- init: function()
- {
- },
show: function(data)
{
var that=this;
- util.parseHtmlIntoDiv(data.containerNode, "store/filetruststore/add.html");
-
this.containerNode = data.containerNode;
+ data.containerNode.innerHTML = template;
+ parser.parse(this.containerNode).then(function(instances)
+ {
+ that.keyStoreOldBrowserWarning = dom.byId("addStore.oldBrowserWarning");
- this.keyStoreOldBrowserWarning = dom.byId("addStore.oldBrowserWarning");
+ if (!window.FileReader)
+ {
+ // Fall back for IE8/9 which do not support FileReader
+ that.keyStoreOldBrowserWarning.innerHTML = "File upload requires a more recent browser with HTML5 support";
+ that.keyStoreOldBrowserWarning.className = that.keyStoreOldBrowserWarning.className.replace("hidden", "");
+ }
- this.addButton = data.parent.addButton;
+ if (data.effectiveData)
+ {
+ that.update(data.effectiveData);
+ }
- if (!window.FileReader)
- {
- // Fall back for IE8/9 which do not support FileReader
- this.keyStoreOldBrowserWarning.innerHTML = "File upload requires a more recent browser with HTML5 support";
- this.keyStoreOldBrowserWarning.className = this.keyStoreOldBrowserWarning.className.replace("hidden", "");
- }
+ util.applyMetadataToWidgets(data.containerNode, "TrustStore", "FileTrustStore");
+ });
},
update: function(effectiveData)
{
@@ -54,14 +65,25 @@ define(["dojo/dom","dojo/query", "dojo/_
if (name in attributes )
{
var attribute = attributes[name];
- if (attribute.secure || attribute.oversize)
- {
- item.set("required", false);
- item.set("placeHolder", effectiveData[name]);
- }
- else
+ var value = effectiveData[name];
+ if (value)
{
- item.set("value", effectiveData[name]);
+ if (attribute.secure)
+ {
+ if (!/^\*+/.test(value) )
+ {
+ item.set("value", value);
+ }
+ else
+ {
+ item.set("placeHolder", value);
+ item.set("required", false);
+ }
+ }
+ else
+ {
+ item.set("value", value);
+ }
}
}
});
@@ -69,14 +91,6 @@ define(["dojo/dom","dojo/query", "dojo/_
}
};
- try
- {
- addTrustStore.init();
- }
- catch(e)
- {
- console.warn(e);
- }
return addTrustStore;
}
);
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/add.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/add.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/add.js Tue Mar 3 14:56:40 2015
@@ -18,64 +18,85 @@
* under the License.
*
*/
-define(["dojo/dom","dojo/query", "dojo/_base/array", "dijit/registry","qpid/common/util", "qpid/common/metadata", "qpid/common/ResourceWidget"],
- function (dom, query, array, registry, util, metadata)
+define(["dojo/dom",
+ "dojo/query",
+ "dojo/_base/array",
+ "dijit/registry",
+ "qpid/common/util",
+ "qpid/common/metadata",
+ "dojo/parser",
+ "dojo/text!store/nonjavakeystore/add.html",
+ "qpid/common/ResourceWidget",
+ "dojo/domReady!"],
+ function (dom, query, array, registry, util, metadata, parser, template)
{
var addKeyStore =
{
- init: function()
- {
- },
show: function(data)
{
var that=this;
- util.parseHtmlIntoDiv(data.containerNode, "store/nonjavakeystore/add.html");
-
- this.keyStoreOldBrowserWarning = dom.byId("addStore.oldBrowserWarning");
- this.addButton = data.parent.addButton;
this.containerNode = data.containerNode;
-
- if (!window.FileReader)
+ data.containerNode.innerHTML = template;
+ parser.parse(this.containerNode).then(function(instances)
{
- this.keyStoreOldBrowserWarning.innerHTML = "File upload requires a more recent browser with HTML5 support";
- this.keyStoreOldBrowserWarning.className = this.keyStoreOldBrowserWarning.className.replace("hidden", "");
- }
+ that.keyStoreOldBrowserWarning = dom.byId("addStore.oldBrowserWarning");
+
+ if (!window.FileReader)
+ {
+ that.keyStoreOldBrowserWarning.innerHTML = "File upload requires a more recent browser with HTML5 support";
+ that.keyStoreOldBrowserWarning.className = that.keyStoreOldBrowserWarning.className.replace("hidden", "");
+ }
+
+ if (data.effectiveData)
+ {
+ that.update(data.effectiveData);
+ }
+
+ util.applyMetadataToWidgets(data.containerNode, "KeyStore", "NonJavaKeyStore");
+ });
},
update: function(effectiveData)
{
- if (effectiveData)
- {
- var attributes = metadata.getMetaData("KeyStore", "NonJavaKeyStore").attributes;
- var widgets = registry.findWidgets(this.containerNode);
- array.forEach(widgets, function(item)
+ var attributes = metadata.getMetaData("KeyStore", "NonJavaKeyStore").attributes;
+ var widgets = registry.findWidgets(this.containerNode);
+ array.forEach(widgets, function(item)
+ {
+ var name = item.id.replace("addStore.","");
+ if (name in attributes )
{
- var name = item.id.replace("addStore.","");
- if (name in attributes )
+ var attribute = attributes[name];
+ var value = effectiveData[name];
+ if (value)
{
- var attribute = attributes[name];
- if (attribute.oversize || attribute.secure)
+ if (attribute.secure)
{
- item.set("required", false);
- item.set("placeHolder", effectiveData[name]);
+ if (!/^\*+/.test(value) )
+ {
+ item.set("value", value);
+ }
+ else
+ {
+ item.set("required", false);
+ if (name == "privateKeyUrl")
+ {
+ item.set("uploaded", true)
+ }
+ else
+ {
+ item.set("placeHolder", value);
+ }
+ }
}
else
{
- item.set("value", effectiveData[name]);
+ item.set("value", value);
}
}
- });
- }
+ }
+ });
}
};
- try
- {
- addKeyStore.init();
- }
- catch(e)
- {
- console.warn(e);
- }
return addKeyStore;
}
);
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/add.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/add.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/add.js Tue Mar 3 14:56:40 2015
@@ -18,64 +18,77 @@
* under the License.
*
*/
-define(["dojo/dom","dojo/query", "dojo/_base/array", "dijit/registry","qpid/common/util", "qpid/common/metadata"],
- function (dom, query, array, registry, util, metadata)
+define(["dojo/dom",
+ "dojo/query",
+ "dojo/_base/array",
+ "dijit/registry",
+ "qpid/common/util",
+ "qpid/common/metadata",
+ "dojo/parser",
+ "dojo/text!store/nonjavatruststore/add.html",
+ "dojo/domReady!"],
+ function (dom, query, array, registry, util, metadata, parser, template)
{
var addKeyStore =
{
- init: function()
- {
- },
show: function(data)
{
var that=this;
- util.parseHtmlIntoDiv(data.containerNode, "store/nonjavatruststore/add.html");
-
- this.keyStoreOldBrowserWarning = dom.byId("addStore.oldBrowserWarning");
- this.addButton = data.parent.addButton;
this.containerNode = data.containerNode;
-
- if (!window.FileReader)
+ data.containerNode.innerHTML = template;
+ parser.parse(this.containerNode).then(function(instances)
{
- this.keyStoreOldBrowserWarning.innerHTML = "File upload requires a more recent browser with HTML5 support";
- this.keyStoreOldBrowserWarning.className = this.keyStoreOldBrowserWarning.className.replace("hidden", "");
- }
+ that.keyStoreOldBrowserWarning = dom.byId("addStore.oldBrowserWarning");
+
+ if (!window.FileReader)
+ {
+ that.keyStoreOldBrowserWarning.innerHTML = "File upload requires a more recent browser with HTML5 support";
+ that.keyStoreOldBrowserWarning.className = that.keyStoreOldBrowserWarning.className.replace("hidden", "");
+ }
+
+ if (data.effectiveData)
+ {
+ that.update(data.effectiveData);
+ }
+
+ util.applyMetadataToWidgets(data.containerNode, "TrustStore", "NonJavaTrustStore");
+ });
},
update: function(effectiveData)
{
- if (effectiveData)
- {
- var attributes = metadata.getMetaData("TrustStore", "NonJavaTrustStore").attributes;
- var widgets = registry.findWidgets(this.containerNode);
- array.forEach(widgets, function(item)
+ var attributes = metadata.getMetaData("TrustStore", "NonJavaTrustStore").attributes;
+ var widgets = registry.findWidgets(this.containerNode);
+ array.forEach(widgets, function(item)
+ {
+ var name = item.id.replace("addStore.","");
+ if (name in attributes )
{
- var name = item.id.replace("addStore.","");
- if (name in attributes )
+ var attribute = attributes[name];
+ var value = effectiveData[name];
+ if (value)
{
- var attribute = attributes[name];
- if (attribute.oversize || attribute.secure)
+ if (attribute.secure)
{
- item.set("required", false);
- item.set("placeHolder", effectiveData[name]);
+ if (!/^\*+/.test(value) )
+ {
+ item.set("value", value);
+ }
+ else
+ {
+ item.set("placeHolder", value);
+ item.set("required", false);
+ }
}
else
{
- item.set("value", effectiveData[name]);
+ item.set("value", value);
}
}
- });
- }
+ }
+ });
}
};
- try
- {
- addKeyStore.init();
- }
- catch(e)
- {
- console.warn(e);
- }
return addKeyStore;
}
);
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js Tue Mar 3 14:56:40 2015
@@ -36,10 +36,12 @@ define(["dojo/query",
{
this.fields.push(name);
}
- util.buildUI(data.containerNode, data.parent, "store/nonjavatruststore/show.html", this.fields, this);
- var gridNode = query(".details", data.containerNode)[0];
- var dateTimeFormatter = function(value){ return value ? UserPreferences.formatDateTime(value, {addOffset: true, appendTimeZone: true}) : "";};
- this.detailsGrid = new UpdatableStore([],
+ var that = this;
+ util.buildUI(data.containerNode, data.parent, "store/nonjavatruststore/show.html", this.fields, this, function()
+ {
+ var gridNode = query(".details", data.containerNode)[0];
+ var dateTimeFormatter = function(value){ return value ? UserPreferences.formatDateTime(value, {addOffset: true, appendTimeZone: true}) : "";};
+ that.detailsGrid = new UpdatableStore([],
gridNode,
[
{ name: 'Subject', field: 'SUBJECT_NAME', width: '25%' },
@@ -47,6 +49,7 @@ define(["dojo/query",
{ name: 'Valid from', field: 'VALID_START', width: '25%', formatter: dateTimeFormatter },
{ name: 'Valid to', field: 'VALID_END', width: '25%', formatter: dateTimeFormatter}
]);
+ });
}
NonJavaTrustStore.prototype.update = function(data)
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js Tue Mar 3 14:56:40 2015
@@ -32,9 +32,12 @@ define(["dojo/_base/xhr",
return {
show: function (data)
{
+ var that= this;
this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
- parser.parse(this.containerNode);
-
+ parser.parse(this.containerNode).then(function(instances) {that._postParse(data);});
+ },
+ _postParse: function(data)
+ {
registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp);
@@ -42,6 +45,7 @@ define(["dojo/_base/xhr",
{
dom.byId("addVirtualHost.diskFlowControls").style.display = "none";
}
+
}
};
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js Tue Mar 3 14:56:40 2015
@@ -20,14 +20,15 @@
define(["dijit/registry", "qpid/common/util", "dojo/domReady!"],
function (registry, util)
{
- var fieldNames = ["storeUnderfullSize", "storeOverfullSize"];
return {
show: function(data)
{
- util.buildEditUI(data.containerNode, "virtualhost/providedstore/edit.html", "editVirtualHost.", fieldNames, data.data);
-
- registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
- registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+ util.parseHtmlIntoDiv(data.containerNode, "virtualhost/providedstore/edit.html",
+ function()
+ {
+ registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+ registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+ });
}
};
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js Tue Mar 3 14:56:40 2015
@@ -22,8 +22,11 @@ define(["qpid/common/util", "dijit/regis
return {
show: function(data)
{
- util.buildEditUI(data.containerNode, "virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"], data.data);
- registry.byId("editVirtualHostNode.storePath").set("disabled", !(data.data.state == "STOPPED" || data.data.state == "ERRORED"));
+ util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/filebased/edit.html",
+ function()
+ {
+ registry.byId("editVirtualHostNode.storePath").set("disabled", !(data.data.state == "STOPPED" || data.data.state == "ERRORED"));
+ });
}
};
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html Tue Mar 3 14:56:40 2015
@@ -25,61 +25,72 @@
<div class="formLabel-labelCell">Name:</div>
<div class="nameValue"></div>
</div>
+ <div class="clear"></div>
+ <div class="alignLeft">
+ <div class="clear type">
+ <div class="formLabel-labelCell">Port Type:</div>
+ <div class="formValue-valueCell typeValue"></div>
+ </div>
+ </div>
+ <div class="alignRight">
+ <div class="clear maxOpenConnections">
+ <div class="formLabel-labelCell">Open connections (current/maximum):</div>
+ <div class="formValue-valueCell">
+ <span class="connectionCountValue"></span><span>/</span><span class="maxOpenConnectionsValue"></span>
+ </div>
+ </div>
+ </div>
- <div class="clear type">
- <div class="formLabel-labelCell">Port Type:</div>
- <div class="typeValue"></div>
- </div>
-
- <div class="clear state">
+ <div class="clear state">
<div class="formLabel-labelCell">State:</div>
- <div class="stateValue"></div>
- </div>
+ <div class="formValue-valueCell stateValue"></div>
+ </div>
- <div class="clear port">
+ <div class="clear port">
<div class="formLabel-labelCell">Port Number:</div>
- <div class="portValue"></div>
- </div>
+ <div class="formValue-valueCell portValue"></div>
+ </div>
- <div class="clear protocols">
+ <div class="clear protocols">
<div class="formLabel-labelCell">Protocols:</div>
- <div class="protocolsValue multiLineValue"></div>
- </div>
+ <div class="formValue-valueCell protocolsValue multiLineValue"></div>
+ </div>
<div class="clear authenticationProvider">
- <div class="formLabel-labelCell">Authentication Provider:</div>
- <div class="authenticationProviderValue"></div>
+ <div class="formLabel-labelCell">Authentication Provider:</div>
+ <div class="formValue-valueCell authenticationProviderValue"></div>
</div>
<div class="clear bindingAddress">
- <div class="formLabel-labelCell">Binding address:</div>
- <div class="bindingAddressValue"></div>
+ <div class="formLabel-labelCell">Binding address:</div>
+ <div class="formValue-valueCell bindingAddressValue"></div>
</div>
<div class="clear transports">
<div class="formLabel-labelCell">Transports:</div>
- <div class="transportsValue multiLineValue"></div>
- </div>
+ <div class="formValue-valueCell transportsValue multiLineValue"></div>
+ </div>
- <div class="clear keyStore">
- <div class="formLabel-labelCell">Key Store:</div>
- <div class="keyStoreValue"></div>
- </div>
+ <div class="clear keyStore">
+ <div class="formLabel-labelCell">Key Store:</div>
+ <div class="formValue-valueCell keyStoreValue"></div>
+ </div>
- <div class="clear needClientAuth">
- <div class="formLabel-labelCell">Need SSL Client Certificate:</div>
- <div class="needClientAuthValue"></div>
- </div>
+ <div class="clear needClientAuth">
+ <div class="formLabel-labelCell">Need SSL Client Certificate:</div>
+ <div class="formValue-valueCell needClientAuthValue"></div>
+ </div>
- <div class="clear wantClientAuth">
- <div class="formLabel-labelCell">Want SSL Client Certificate:</div>
- <div class="wantClientAuthValue"></div>
- </div>
+ <div class="clear wantClientAuth">
+ <div class="formLabel-labelCell">Want SSL Client Certificate:</div>
+ <div class="formValue-valueCell wantClientAuthValue"></div>
+ </div>
+
+ <div class="clear trustStores">
+ <div class="formLabel-labelCell">Trust Stores:</div>
+ <div class="formValue-valueCell trustStoresValue multiLineValue"></div>
+ </div>
- <div class="clear trustStores">
- <div class="formLabel-labelCell">Trust Stores:</div>
- <div class="trustStoresValue multiLineValue"></div>
- </div>
<div class="clear"></div>
</div>
<br/>
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html Tue Mar 3 14:56:40 2015
@@ -25,7 +25,7 @@
<div class="formLabel-labelCell">Name:</div>
<div class="name formValue-valueCell"></div>
</div>
- <div class="clear">
+ <div class="clear"></div>
<div class="alignLeft">
<div class="clear">
<div class="formLabel-labelCell">Type:</div>
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java Tue Mar 3 14:56:40 2015
@@ -313,6 +313,7 @@ public class ConfiguredObjectToMapConver
Map<String, ConfiguredObjectAttribute<?, ?>> attributeTypes = typeRegistry.getAttributeTypes(TestChild.class);
ConfiguredObjectAttribute secureAttribute = mock(ConfiguredObjectAttribute.class);
when(secureAttribute.isSecure()).thenReturn(true);
+ when(secureAttribute.isSecureValue(any())).thenReturn(true);
when(attributeTypes.get(eq("secureAttribute"))).thenReturn(secureAttribute);
TestChild mockChild = mock(TestChild.class);
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java Tue Mar 3 14:56:40 2015
@@ -100,7 +100,7 @@ public class ConnectionMBean extends Abs
public String getObjectInstanceName()
{
- return ObjectName.quote(getRemoteAddress());
+ return ObjectName.quote(getConfiguredObject().getName());
}
@Override
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java Tue Mar 3 14:56:40 2015
@@ -159,9 +159,9 @@ public class ConnectionMBeanTest extends
public void testGetObjectInstanceName()
{
- String remoteAddress = "testRemoteAddress";
- String quotedRemoteAddress = "\"testRemoteAddress\"";
- when(_mockConnection.getAttribute(Connection.REMOTE_ADDRESS)).thenReturn(remoteAddress);
+ String name = "[1] 127.0.0.1:5555";
+ String quotedRemoteAddress = "\"" + name +"\"";
+ when(_mockConnection.getName()).thenReturn(name);
String objectInstanceName = _connectionMBean.getObjectInstanceName();
assertEquals(quotedRemoteAddress, objectInstanceName);
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java Tue Mar 3 14:56:40 2015
@@ -25,9 +25,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.HashSet;
-import java.util.Properties;
-import java.util.Set;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
@@ -179,11 +176,14 @@ public class Main
protected void execute() throws Exception
{
- String initialProperties = _commandLine.getOptionValue(OPTION_INITIAL_SYSTEM_PROPERTIES.getOpt());
- populateSystemPropertiesFromDefaults(initialProperties);
-
BrokerOptions options = new BrokerOptions();
+ String initialProperties = _commandLine.getOptionValue(OPTION_INITIAL_SYSTEM_PROPERTIES.getOpt());
+ if (initialProperties != null)
+ {
+ options.setInitialSystemProperties(initialProperties);
+ }
+
String initialConfigLocation = _commandLine.getOptionValue(OPTION_INITIAL_CONFIGURATION_PATH.getOpt());
if (initialConfigLocation != null)
{
@@ -320,33 +320,6 @@ public class Main
}
}
- private void populateSystemPropertiesFromDefaults(final String initialProperties) throws IOException
- {
- URL initialPropertiesLocation;
- if(initialProperties == null)
- {
- initialPropertiesLocation = getClass().getClassLoader().getResource("system.properties");
- }
- else
- {
- initialPropertiesLocation = (new File(initialProperties)).toURI().toURL();
- }
-
- Properties props = new Properties(QpidProperties.asProperties());
- if(initialPropertiesLocation != null)
- {
- props.load(initialPropertiesLocation.openStream());
- }
-
- Set<String> propertyNames = new HashSet<>(props.stringPropertyNames());
- propertyNames.removeAll(System.getProperties().stringPropertyNames());
- for (String propName : propertyNames)
- {
- System.setProperty(propName, props.getProperty(propName));
- }
-
- }
-
private void copyInitialConfigFile(final BrokerOptions options, final File destinationFile)
{
String initialConfigLocation = options.getInitialConfigurationLocation();
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java Tue Mar 3 14:56:40 2015
@@ -20,18 +20,18 @@
*/
package org.apache.qpid.client;
-import org.apache.qpid.configuration.ClientProperties;
-import org.apache.qpid.jms.BrokerDetails;
-import org.apache.qpid.transport.ConnectionSettings;
-import org.apache.qpid.url.URLHelper;
-import org.apache.qpid.url.URLSyntaxException;
-
import java.io.Serializable;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Map;
+import org.apache.qpid.configuration.ClientProperties;
+import org.apache.qpid.jms.BrokerDetails;
+import org.apache.qpid.transport.ConnectionSettings;
+import org.apache.qpid.url.URLHelper;
+import org.apache.qpid.url.URLSyntaxException;
+
public class AMQBrokerDetails implements BrokerDetails, Serializable
{
private static final long serialVersionUID = 8450786374975932890L;
@@ -42,6 +42,14 @@ public class AMQBrokerDetails implements
private Map<String, String> _options = new HashMap<String, String>();
+ public AMQBrokerDetails(BrokerDetails details)
+ {
+ _host = details.getHost();
+ _port = details.getPort();
+ _transport = details.getTransport();
+ _options = new HashMap<>(details.getProperties());
+ }
+
public AMQBrokerDetails(){}
public AMQBrokerDetails(String url) throws URLSyntaxException
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java Tue Mar 3 14:56:40 2015
@@ -62,6 +62,7 @@ import org.apache.qpid.AMQDisconnectedEx
import org.apache.qpid.AMQException;
import org.apache.qpid.AMQProtocolException;
import org.apache.qpid.AMQUnresolvedAddressException;
+import org.apache.qpid.client.failover.ConnectionRedirectException;
import org.apache.qpid.client.failover.FailoverException;
import org.apache.qpid.client.failover.FailoverProtectedOperation;
import org.apache.qpid.client.protocol.AMQProtocolHandler;
@@ -462,9 +463,22 @@ public class AMQConnection extends Close
}
else if (!isConnected())
{
- retryAllowed = _failoverPolicy.failoverAllowed();
- brokerDetails = _failoverPolicy.getNextBrokerDetails();
- _protocolHandler.setStateManager(new AMQStateManager(_protocolHandler.getProtocolSession()));
+ if(connectionException instanceof ConnectionRedirectException)
+ {
+ ConnectionRedirectException redirect = (ConnectionRedirectException) connectionException;
+ retryAllowed = true;
+ brokerDetails = new AMQBrokerDetails(brokerDetails);
+ brokerDetails.setHost(redirect.getHost());
+ brokerDetails.setPort(redirect.getPort());
+ _protocolHandler.setStateManager(new AMQStateManager(_protocolHandler.getProtocolSession()));
+
+ }
+ else
+ {
+ retryAllowed = _failoverPolicy.failoverAllowed();
+ brokerDetails = _failoverPolicy.getNextBrokerDetails();
+ _protocolHandler.setStateManager(new AMQStateManager(_protocolHandler.getProtocolSession()));
+ }
}
}
@@ -599,9 +613,11 @@ public class AMQConnection extends Close
_virtualHost = virtualHost;
}
- public boolean attemptReconnection(String host, int port)
+ public boolean attemptReconnection(String host, int port, final boolean useFailoverConfigOnFailure)
{
- BrokerDetails bd = new AMQBrokerDetails(host, port);
+ BrokerDetails bd = new AMQBrokerDetails(_failoverPolicy.getCurrentBrokerDetails());
+ bd.setHost(host);
+ bd.setPort(port);
_failoverPolicy.setBroker(bd);
@@ -618,10 +634,9 @@ public class AMQConnection extends Close
_logger.info("Unable to connect to broker at " + bd);
}
- attemptReconnection();
+ return useFailoverConfigOnFailure && attemptReconnection();
}
- return false;
}
public boolean attemptReconnection()
@@ -629,32 +644,41 @@ public class AMQConnection extends Close
BrokerDetails broker = null;
while (_failoverPolicy.failoverAllowed() && (broker = _failoverPolicy.getNextBrokerDetails()) != null)
{
- try
+ if (attemptConnection(broker))
{
- makeBrokerConnection(broker);
return true;
}
- catch (Exception e)
+ }
+
+ // connection unsuccessful
+ return false;
+ }
+
+ private boolean attemptConnection(final BrokerDetails broker)
+ {
+ try
+ {
+ makeBrokerConnection(broker);
+ return true;
+ }
+ catch (Exception e)
+ {
+ if (!(e instanceof AMQException))
{
- if (!(e instanceof AMQException))
+ if (_logger.isInfoEnabled())
{
- if (_logger.isInfoEnabled())
- {
- _logger.info("Unable to connect to broker at " + _failoverPolicy.getCurrentBrokerDetails(), e);
- }
+ _logger.info("Unable to connect to broker at " + _failoverPolicy.getCurrentBrokerDetails(), e);
}
- else
+ }
+ else
+ {
+ if (_logger.isInfoEnabled())
{
- if (_logger.isInfoEnabled())
- {
- _logger.info(e.getMessage() + ":Unable to connect to broker at "
- + _failoverPolicy.getCurrentBrokerDetails());
- }
+ _logger.info(e.getMessage() + ":Unable to connect to broker at "
+ + _failoverPolicy.getCurrentBrokerDetails());
}
}
}
-
- // connection unsuccessful
return false;
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java Tue Mar 3 14:56:40 2015
@@ -61,6 +61,8 @@ import org.apache.qpid.transport.Transpo
public class AMQConnectionDelegate_0_10 implements AMQConnectionDelegate, ConnectionListener
{
+ private static final int DEFAULT_PORT = 5672;
+
/**
* This class logger.
*/
@@ -238,7 +240,7 @@ public class AMQConnectionDelegate_0_10
{
code = AMQConstant.getConstant(ce.getClose().getReplyCode().getValue());
}
- String msg = "Cannot connect to broker: " + ce.getMessage();
+ String msg = "Cannot connect to broker ("+brokerDetail+"): " + ce.getMessage();
throw new AMQException(code, msg, ce);
}
@@ -314,25 +316,39 @@ public class AMQConnectionDelegate_0_10
@Override
public void run()
{
- try
- {
- if (_conn.firePreFailover(false) && _conn.attemptReconnection())
+ try
{
- failoverPrep();
- _conn.resubscribeSessions();
- _conn.fireFailoverComplete();
- failoverDone.set(true);
+ boolean preFailover = _conn.firePreFailover(false);
+ if (preFailover)
+ {
+ boolean reconnected;
+ if(exc instanceof RedirectConnectionException)
+ {
+ RedirectConnectionException redirect = (RedirectConnectionException)exc;
+ reconnected = attemptRedirection(redirect.getHost(), redirect.getKnownHosts());
+ }
+ else
+ {
+ reconnected = _conn.attemptReconnection();
+ }
+ if(reconnected)
+ {
+ failoverPrep();
+ _conn.resubscribeSessions();
+ _conn.fireFailoverComplete();
+ failoverDone.set(true);
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ _logger.error("error during failover", e);
+ }
+ finally
+ {
+ _conn.getProtocolHandler().getFailoverLatch().countDown();
+ _conn.getProtocolHandler().setFailoverLatch(null);
}
- }
- catch (Exception e)
- {
- _logger.error("error during failover", e);
- }
- finally
- {
- _conn.getProtocolHandler().getFailoverLatch().countDown();
- _conn.getProtocolHandler().setFailoverLatch(null);
- }
}
});
@@ -376,6 +392,58 @@ public class AMQConnectionDelegate_0_10
}
}
+ @Override
+ public boolean redirect(final String host, final List<Object> knownHosts)
+ {
+ exception = new RedirectConnectionException(host,knownHosts);
+
+ return false;
+ }
+
+ private boolean attemptRedirection(String host, List<Object> knownHosts)
+ {
+
+ boolean redirected = host != null && attemptRedirection(host);
+ if(knownHosts != null)
+ {
+ for(Object knownHost : knownHosts)
+ {
+ redirected = attemptRedirection(String.valueOf(knownHost));
+ if(redirected)
+ {
+ break;
+ }
+ }
+ }
+ return redirected;
+ }
+
+ private boolean attemptRedirection(String host)
+ {
+ int portIndex = host.indexOf(':');
+
+ int port;
+ if (portIndex == -1)
+ {
+ port = DEFAULT_PORT;
+ }
+ else
+ {
+ try
+ {
+ port = Integer.parseInt(host.substring(portIndex + 1));
+ }
+ catch(NumberFormatException e)
+ {
+ _logger.info("Unable to redirect to " + host + " - does not look like a valid address");
+ return false;
+ }
+ host = host.substring(0, portIndex);
+
+ }
+ return _conn.attemptReconnection(host,port,false);
+ }
+
public <T, E extends Exception> T executeRetrySupport(FailoverProtectedOperation<T,E> operation) throws E
{
if (_conn.isFailingOver())
@@ -538,4 +606,28 @@ public class AMQConnectionDelegate_0_10
{
return _qpidConnection.isMessageCompressionSupported();
}
+
+ private class RedirectConnectionException extends ConnectionException
+ {
+ private final String _host;
+ private final List<Object> _knownHosts;
+
+ public RedirectConnectionException(final String host,
+ final List<Object> knownHosts)
+ {
+ super("Connection redirected to " + host + " alternates " + knownHosts);
+ _host = host;
+ _knownHosts = knownHosts;
+ }
+
+ public String getHost()
+ {
+ return _host;
+ }
+
+ public List<Object> getKnownHosts()
+ {
+ return _knownHosts;
+ }
+ }
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java Tue Mar 3 14:56:40 2015
@@ -89,6 +89,8 @@ public abstract class AMQDestination imp
private RejectBehaviour _rejectBehaviour;
+ private Map<String,Object> _consumerArguments;
+
public static final int QUEUE_TYPE = 1;
public static final int TOPIC_TYPE = 2;
public static final int UNKNOWN_TYPE = 3;
@@ -299,6 +301,7 @@ public abstract class AMQDestination imp
_bindingKeys = binding.getBindingKeys() == null || binding.getBindingKeys().length == 0 ? new AMQShortString[0] : binding.getBindingKeys();
final String rejectBehaviourValue = binding.getOption(BindingURL.OPTION_REJECT_BEHAVIOUR);
_rejectBehaviour = rejectBehaviourValue == null ? null : RejectBehaviour.valueOf(rejectBehaviourValue.toUpperCase());
+ _consumerArguments = binding.getConsumerOptions();
}
protected AMQDestination(AMQShortString exchangeName, AMQShortString exchangeClass, AMQShortString routingKey, AMQShortString queueName)
@@ -718,6 +721,11 @@ public abstract class AMQDestination imp
return result;
}
+ public Map<String, Object> getConsumerArguments()
+ {
+ return _consumerArguments;
+ }
+
public Reference getReference() throws NamingException
{
return new Reference(
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java Tue Mar 3 14:56:40 2015
@@ -187,6 +187,10 @@ public abstract class BasicMessageConsum
}
final FieldTable ft = FieldTableFactory.newFieldTable();
+ if(destination.getConsumerArguments() != null)
+ {
+ ft.addAll(FieldTable.convertToFieldTable(destination.getConsumerArguments()));
+ }
// rawSelector is used by HeadersExchange and is not a JMS Selector
if (rawSelector != null)
{
@@ -203,6 +207,7 @@ public abstract class BasicMessageConsum
ft.put(AMQPFilterTypes.NO_LOCAL.getValue(), noLocal);
}
+
_arguments = ft;
_addressType = _destination.getAddressType();
}
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java Tue Mar 3 14:56:40 2015
@@ -69,6 +69,7 @@ public class BasicMessageConsumer_0_8 ex
consumerArguments.put(AMQPFilterTypes.NO_CONSUME.getValue(), Boolean.TRUE);
}
+
_topicDestinationCache = session.getTopicDestinationCache();
_queueDestinationCache = session.getQueueDestinationCache();
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java?rev=1663717&r1=1663716&r2=1663717&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java Tue Mar 3 14:56:40 2015
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.client.failover;
+import java.util.concurrent.CountDownLatch;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,8 +30,6 @@ import org.apache.qpid.client.protocol.A
import org.apache.qpid.client.state.AMQState;
import org.apache.qpid.client.state.AMQStateManager;
-import java.util.concurrent.CountDownLatch;
-
/**
* FailoverHandler is a continuation that performs the failover procedure on a protocol session. As described in the
* class level comment for {@link AMQProtocolHandler}, a protocol connection can span many physical transport
@@ -168,7 +168,7 @@ public class FailoverHandler implements
// if _host has value then we are performing a redirect.
if (_host != null)
{
- failoverSucceeded = _amqProtocolHandler.getConnection().attemptReconnection(_host, _port);
+ failoverSucceeded = _amqProtocolHandler.getConnection().attemptReconnection(_host, _port, true);
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org