From 5e8136af6e36d5f2689dd07e70095546c0120dbc Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Fri, 17 Oct 2014 13:58:04 +0000
Subject: merged from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6125-ProtocolRefactoring@1632579 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js  | 2 +-
 .../bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html | 4 ++--
 .../store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java    | 1 +
 .../server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java | 2 ++
 .../qpid/server/store/berkeleydb/replication/JMXManagementTest.java   | 2 ++
 .../qpid/server/store/berkeleydb/replication/MultiNodeTest.java       | 1 +
 .../apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java  | 2 ++
 7 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'java/bdbstore')

diff --git a/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js b/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
index e27b640933..9538b6b5b6 100644
--- a/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
+++ b/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
@@ -31,7 +31,7 @@ define(["dojo/_base/xhr",
         "dojo/domReady!"],
   function (xhr, connect, entities, query, json, registry, EnhancedGrid, UpdatableStore, UserPreferences, util)
   {
-    var priorityNames = {'_0': 'Never', '_1': 'Default', '_2': 'Normal', '_3': 'High'};
+    var priorityNames = {'_0': 'Never', '_1': 'Default', '_2': 'High', '_3': 'Highest'};
     var nodeFields = ["storePath", "groupName", "role", "address", "designatedPrimary", "priority", "quorumOverride"];
 
     function findNode(nodeClass, containerNode)
diff --git a/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html b/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
index e040420bdb..013ae271ec 100644
--- a/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
+++ b/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
@@ -113,8 +113,8 @@
                  data-dojo-props="data: [
                                                       {id: '0', name: 'Never'},
                                                       {id: '1', name: 'Default', selected: '1'},
-                                                      {id: '2', name: 'Normal'},
-                                                      {id: '3', name: 'High'}
+                                                      {id: '2', name: 'High'},
+                                                      {id: '3', name: 'Highest'}
                                                    ]"></div>
             <input id="editVirtualHostNode.priority" data-dojo-type="dijit/form/FilteringSelect" value="1"
                    data-dojo-props="
diff --git a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java
index cfbd030474..45cf9a483c 100644
--- a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java
+++ b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java
@@ -65,6 +65,7 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase
     public void setUp() throws Exception
     {
         setTestSystemProperty(ReplicatedEnvironmentFacade.REMOTE_NODE_MONITOR_INTERVAL_PROPERTY_NAME, "1000");
+        setTestClientSystemProperty("log4j.configuration", getBrokerCommandLog4JFile().toURI().toString());
 
         super.setUp();
         _hostName = getTestName();
diff --git a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java
index f73a2878d3..d0166510ba 100644
--- a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java
+++ b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java
@@ -57,6 +57,8 @@ public class BDBHAVirtualHostRestTest extends QpidRestTestCase
     public void setUp() throws Exception
     {
         setTestSystemProperty(ReplicatedEnvironmentFacade.REMOTE_NODE_MONITOR_INTERVAL_PROPERTY_NAME, "1000");
+        setTestClientSystemProperty("log4j.configuration", getBrokerCommandLog4JFile().toURI().toString());
+
         _hostName = "ha";
         _nodeName = "node1";
         _storeBaseDir = new File(TMP_FOLDER, "store-" + _hostName + "-" + System.currentTimeMillis());
diff --git a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java
index 63de287be7..4fd3540964 100644
--- a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java
+++ b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java
@@ -74,6 +74,8 @@ public class JMXManagementTest extends QpidBrokerTestCase
     {
         _brokerType = BrokerType.SPAWNED;
 
+        setTestClientSystemProperty("log4j.configuration", getBrokerCommandLog4JFile().toURI().toString());
+
         _clusterCreator.configureClusterNodes();
         _brokerFailoverUrl = _clusterCreator.getConnectionUrlForAllClusterNodes();
         _clusterCreator.startCluster();
diff --git a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
index 38484b546f..77b1f3fed4 100644
--- a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
+++ b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
@@ -81,6 +81,7 @@ public class MultiNodeTest extends QpidBrokerTestCase
         assertTrue(isBrokerStorePersistent());
 
         setSystemProperty("java.util.logging.config.file", "etc" + File.separator + "log.properties");
+        setTestClientSystemProperty("log4j.configuration", getBrokerCommandLog4JFile().toURI().toString());
 
         _groupCreator.configureClusterNodes();
 
diff --git a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java
index 248dbb4def..49ce60d798 100644
--- a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java
+++ b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java
@@ -49,6 +49,8 @@ public class TwoNodeTest extends QpidBrokerTestCase
     {
         _brokerType = BrokerType.SPAWNED;
 
+        setTestClientSystemProperty("log4j.configuration", getBrokerCommandLog4JFile().toURI().toString());
+
         assertTrue(isJavaBroker());
         assertTrue(isBrokerStorePersistent());
 
-- 
cgit v1.2.1