merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1663717 13f79535-47bb-0310-9956-ffa450edef68

13 files changed, 135 insertions, 48 deletions

diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
index 57b1d84a26..205ff57fab 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
@@ -21,6 +21,7 @@ package org.apache.qpid.server.virtualhost.berkeleydb;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
@@ -42,6 +43,8 @@ import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
 import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.model.VirtualHostAlias;
 import org.apache.qpid.server.model.VirtualHostNode;
+import org.apache.qpid.server.model.port.AmqpPort;
+import org.apache.qpid.server.protocol.AMQConnectionModel;
 import org.apache.qpid.server.protocol.LinkRegistry;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.stats.StatisticsCounter;
@@ -81,6 +84,15 @@ public class BDBHAReplicaVirtualHostImpl extends AbstractConfiguredObject<BDBHAR
     @ManagedAttributeField
     private int _housekeepingThreadCount;
 
+    @ManagedAttributeField
+    private List<String> _enabledConnectionValidators;
+
+    @ManagedAttributeField
+    private List<String> _disabledConnectionValidators;
+
+    @ManagedAttributeField
+    private List<String> _globalAddressDomains;
+
     @ManagedObjectFactoryConstructor
     public BDBHAReplicaVirtualHostImpl(final Map<String, Object> attributes, VirtualHostNode<?> virtualHostNode)
     {
@@ -162,6 +174,12 @@ public class BDBHAReplicaVirtualHostImpl extends AbstractConfiguredObject<BDBHAR
     }
 
     @Override
+    public String getRedirectHost(final AmqpPort<?> port)
+    {
+        return null;
+    }
+
+    @Override
     public boolean isQueue_deadLetterQueueEnabled()
     {
         return false;
@@ -448,6 +466,47 @@ public class BDBHAReplicaVirtualHostImpl extends AbstractConfiguredObject<BDBHAR
     {
     }
 
+    @Override
+    public boolean authoriseCreateConnection(final AMQConnectionModel<?, ?> connection)
+    {
+        return false;
+    }
+
+    @Override
+    public List<String> getEnabledConnectionValidators()
+    {
+        return _enabledConnectionValidators;
+    }
+
+    @Override
+    public List<String> getDisabledConnectionValidators()
+    {
+        return _disabledConnectionValidators;
+    }
+
+    @Override
+    public List<String> getGlobalAddressDomains()
+    {
+        return _globalAddressDomains;
+    }
+
+    @Override
+    public String getLocalAddress(final String routingAddress)
+    {
+        String localAddress = routingAddress;
+        if(getGlobalAddressDomains() != null)
+        {
+            for(String domain : getGlobalAddressDomains())
+            {
+                if(localAddress.length() > routingAddress.length() - domain.length() && routingAddress.startsWith(domain + "/"))
+                {
+                    localAddress = routingAddress.substring(domain.length());
+                }
+            }
+        }
+        return localAddress;
+    }
+
     private void throwUnsupportedForReplica()
     {
         throw new IllegalStateException("The virtual host state of " + getState()
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNode.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNode.java
index bb9f564d64..d8a2ba22a9 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNode.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNode.java
@@ -25,7 +25,7 @@ import org.apache.qpid.server.model.ManagedAttribute;
 import org.apache.qpid.server.model.ManagedObject;
 import org.apache.qpid.server.model.RemoteReplicationNode;
 
-@ManagedObject(category=false, managesChildren=false, creatable=false)
+@ManagedObject(category=false, creatable=false)
 public interface BDBHARemoteReplicationNode<X extends BDBHARemoteReplicationNode<X>> extends RemoteReplicationNode<X>
 {
     String GROUP_NAME = "groupName";
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js
index 7b12d10343..323b8e9750 100644
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js
@@ -34,10 +34,11 @@ define(["dojo/_base/xhr",
         show: function (data)
         {
             this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
-            parser.parse(this.containerNode);
-
-            registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
-            registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+            parser.parse(this.containerNode).then(function(instances)
+            {
+                registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+                registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+            });
         }
     };
   }
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
index e0dac745c2..076a27a3ae 100644
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
@@ -22,10 +22,12 @@ define(["dijit/registry", "qpid/common/util", "dojo/domReady!"],
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, "virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null);
-
-              registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
-              registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+              util.parseHtmlIntoDiv(data.containerNode, "virtualhost/sizemonitoring/edit.html",
+              function()
+              {
+                  registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+                  registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+              });
            }
        };
    }
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
index 3f36d56397..ebe6b6822a 100644
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
@@ -22,10 +22,12 @@ define(["qpid/common/util", "qpid/common/metadata", "dijit/registry", "dojo/domR
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, "virtualhost/bdb_ha/edit.html", "editVirtualHost.", null, null);
-
-              registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
-              registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+              util.parseHtmlIntoDiv(data.containerNode, "virtualhost/bdb_ha/edit.html",
+              function()
+              {
+                  registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+                  registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+              });
            }
        };
    }
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
index 3bc3305e1f..c0b079cf4c 100644
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
@@ -27,10 +27,13 @@ define(["qpid/common/util", "dojo/query", "dojo/domReady!"],
 
     function BDB(data)
     {
-        util.buildUI(data.containerNode, data.parent, "virtualhost/bdb_ha/show.html", fields, this);
-
-        this[localTransactionSynchronizationPolicy]= query("." + localTransactionSynchronizationPolicy, data.containerNode)[0];
-        this[remoteTransactionSynchronizationPolicy]= query("."+ remoteTransactionSynchronizationPolicy, data.containerNode)[0];
+        var that = this;
+        util.buildUI(data.containerNode, data.parent, "virtualhost/bdb_ha/show.html", fields, this,
+        function()
+        {
+            that[localTransactionSynchronizationPolicy]= query("." + localTransactionSynchronizationPolicy, data.containerNode)[0];
+            that[remoteTransactionSynchronizationPolicy]= query("."+ remoteTransactionSynchronizationPolicy, data.containerNode)[0];
+        });
     }
 
     BDB.prototype.update = function(data)
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
index 35ecbec315..4c70b4a22d 100644
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
@@ -22,8 +22,11 @@ define(["qpid/common/util", "dijit/registry", "dojo/domReady!"],
        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"));
+              });
            }
        };
    }
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
index 6431ddb6db..9b2b26d560 100644
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add.js
@@ -37,15 +37,21 @@ define(["dojo/_base/xhr",
               var that=this;
 
               this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
-              parser.parse(this.containerNode);
-
-              // lookup field
-              this.groupChoice = registry.byId("addVirtualHostNode.group");
-              this.virtualHostNodeBdbhaTypeFieldsContainer = dom.byId("addVirtualHostNode.bdbha.typeFields");
-
-              // add callback
-              this.groupChoice.on("change", function(type){that._groupChoiceChanged(type, that.virtualHostNodeBdbhaTypeFieldsContainer, "qpid/management/virtualhostnode/bdb_ha/add/");});
+              parser.parse(this.containerNode).then(function(instances)
+              {
+                  // lookup field
+                  that.groupChoice = registry.byId("addVirtualHostNode.group");
+                  that.virtualHostNodeBdbhaTypeFieldsContainer = dom.byId("addVirtualHostNode.bdbha.typeFields");
 
+                  // add callback
+                  that.groupChoice.on("change",
+                                      function(type)
+                                      {
+                                        that._groupChoiceChanged(type,
+                                                                 that.virtualHostNodeBdbhaTypeFieldsContainer,
+                                                                 "qpid/management/virtualhostnode/bdb_ha/add/");
+                                      });
+              });
           },
           _groupChoiceChanged: function(type, typeFieldsContainer, urlStem)
           {
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
index 532c37f65b..be43e5f28b 100644
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js
@@ -33,15 +33,15 @@ define(["dojo/_base/xhr",
         show: function(data)
         {
             this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
-            parser.parse(this.containerNode);
-
-            registry.byId("addVirtualHostNode.groupName").set("regExpGen", util.nameOrContextVarRegexp);
-            registry.byId("addVirtualHostNode.helperNodeName").set("regExpGen", util.nameOrContextVarRegexp);
-            registry.byId("addVirtualHostNode.helperAddress").set("regExpGen", util.nodeAddressOrContextVarRegexp);
-            registry.byId("addVirtualHostNode.address").set("regExpGen", util.nodeAddressOrContextVarRegexp);
-
-            dom.byId("addVirtualHostNode.uploadFields").style.display = "none";
+            parser.parse(this.containerNode).then(function(instances)
+            {
+                registry.byId("addVirtualHostNode.groupName").set("regExpGen", util.nameOrContextVarRegexp);
+                registry.byId("addVirtualHostNode.helperNodeName").set("regExpGen", util.nameOrContextVarRegexp);
+                registry.byId("addVirtualHostNode.helperAddress").set("regExpGen", util.nodeAddressOrContextVarRegexp);
+                registry.byId("addVirtualHostNode.address").set("regExpGen", util.nodeAddressOrContextVarRegexp);
 
+                dom.byId("addVirtualHostNode.uploadFields").style.display = "none";
+            });
         }
     };
   }
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
index c1aa9ffe4f..841f2051f5 100644
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
@@ -37,8 +37,15 @@ define(["dojo/_base/xhr",
           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)
+        {
+          var that=this;
           this.addVirtualHostNodeAddress = registry.byId("addVirtualHostNode.address");
           this.addVirtualHostNodeAddress.set("regExpGen", util.nodeAddressOrContextVarRegexp);
 
@@ -72,7 +79,6 @@ define(["dojo/_base/xhr",
           registry.byId("addVirtualHostNode.groupName").set("regExpGen", util.nameOrContextVarRegexp);
 
           dom.byId("addVirtualHostNode.uploadFields").style.display = "block";
-
         },
         _updatePermittedNodesJson: function ()
         {
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
index b1399a59cb..e3d69577dc 100644
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
@@ -26,14 +26,16 @@ define(["qpid/common/util",
         "dojo/domReady!"],
    function (util, registry, Memory, ObjectStore, win)
    {
-       var fields = [ "storePath", "name", "groupName", "address",
-                      "designatedPrimary", "priority",  "quorumOverride"];
-
        return {
            show: function(data)
            {
+              var that = this;
+              util.parseHtmlIntoDiv(data.containerNode, "virtualhostnode/bdb_ha/edit.html",
+                function(){that._postParse(data);});
+           },
+           _postParse: function(data)
+           {
               var node = data.data;
-              util.buildEditUI(data.containerNode, "virtualhostnode/bdb_ha/edit.html", "editVirtualHostNode.", fields, node);
               if ( !(data.data.state == "ERRORED" || data.data.state == "STOPPED"))
               {
                   registry.byId("editVirtualHostNode.storePath").set("disabled", true);
diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
index 9538b6b5b6..5338916812 100644
--- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
+++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
@@ -82,11 +82,14 @@ define(["dojo/_base/xhr",
 
     function BDBHA(data)
     {
-      var containerNode = data.containerNode;
       this.parent = data.parent;
       var that = this;
-      util.buildUI(data.containerNode, data.parent, "virtualhostnode/bdb_ha/show.html", nodeFields, this);
-
+      util.buildUI(data.containerNode, data.parent, "virtualhostnode/bdb_ha/show.html", nodeFields, this, function(){that._postParse(data);});
+    };
+    BDBHA.prototype._postParse = function(data)
+    {
+      var that = this;
+      var containerNode = data.containerNode;
       this.designatedPrimaryContainer = findNode("designatedPrimaryContainer", containerNode);
       this.priorityContainer = findNode("priorityContainer", containerNode);
       this.quorumOverrideContainer = findNode("quorumOverrideContainer", containerNode);
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
index 0faae4323e..cfff12dcf2 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
@@ -117,11 +117,11 @@
             <div data-dojo-type="dojo/store/Memory" data-dojo-id="nodePriorityStore"
                  data-dojo-props="data: [
                                                       {id: '0', name: 'Never'},
-                                                      {id: '1', name: 'Default', selected: '1'},
+                                                      {id: '1', name: 'Default'},
                                                       {id: '2', name: 'High'},
                                                       {id: '3', name: 'Highest'}
                                                    ]"></div>
-            <input id="editVirtualHostNode.priority" data-dojo-type="dijit/form/FilteringSelect" value="1"
+            <input id="editVirtualHostNode.priority" data-dojo-type="dijit/form/FilteringSelect"
                    data-dojo-props="
                                 name: 'priority',
                                 required: false,
@@ -135,9 +135,9 @@
         <div class="formLabel-labelCell tableContainer-labelCell">Required minimum number of nodes: </div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <div data-dojo-type="dojo/store/Memory" data-dojo-id="nodeQuorumOverrideStore"
-                 data-dojo-props="data: [{id: '0', name: 'Majority', selected: '1'}]"></div>
+                 data-dojo-props="data: [{id: '0', name: 'Majority'}]"></div>
             <input type="text" id="editVirtualHostNode.quorumOverride"
-                   data-dojo-type="dijit/form/FilteringSelect" value="0"
+                   data-dojo-type="dijit/form/FilteringSelect"
                    data-dojo-props="
                                 name: 'quorumOverride',
                                 required: false,