Author: kwall
Date: Fri Jul 4 16:31:46 2014
New Revision: 1607889
URL: http://svn.apache.org/r1607889
Log:
QPID-5873: Exclude new ACL system tests from Json profile; fix
BDBHARemoteReplicationNodeTest unit test wrt monitor attribute
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java
qpid/trunk/qpid/java/test-profiles/JavaJsonExcludes
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java?rev=1607889&r1=1607888&r2=1607889&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java
Fri Jul 4 16:31:46 2014
@@ -32,7 +32,6 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
-import org.apache.qpid.server.model.RemoteReplicationNode;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.access.Operation;
@@ -149,7 +148,8 @@ public class BDBHARemoteReplicationNodeT
private BDBHARemoteReplicationNode createRemoteReplicationNode(final
String replicationNodeName)
{
Map<String, Object> attributes = new HashMap<>();
- attributes.put(RemoteReplicationNode.NAME, replicationNodeName);
+ attributes.put(BDBHARemoteReplicationNode.NAME, replicationNodeName);
+ attributes.put(BDBHARemoteReplicationNode.MONITOR, Boolean.FALSE);
BDBHARemoteReplicationNodeImpl node = new
BDBHARemoteReplicationNodeImpl(_virtualHostNode, attributes, _facade);
node.create();
Modified: qpid/trunk/qpid/java/test-profiles/JavaJsonExcludes
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/JavaJsonExcludes?rev=1607889&r1=1607888&r2=1607889&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/JavaJsonExcludes (original)
+++ qpid/trunk/qpid/java/test-profiles/JavaJsonExcludes Fri Jul 4 16:31:46 2014
@@ -20,6 +20,7 @@
org.apache.qpid.server.store.berkeleydb.*
org.apache.qpid.server.store.berkeleydb.replication.*
org.apache.qpid.server.store.SplitStoreTest#*
+org.apache.qpid.systest.rest.acl.VirtualHostACLTest#*
org.apache.qpid.systest.rest.VirtualHostNodeRestTest#testCreateAndDeleteVirtualHostNode
org.apache.qpid.systest.rest.VirtualHostRestTest#testPutCreateVirtualHostUsingProfileNodeType
org.apache.qpid.server.BrokerStartupTest#testStartupWithNoConfig
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
