diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-03-14 17:20:02 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-03-14 17:20:02 +0000 |
| commit | 7bddceb25095cd8002e03cbc2ffd312922ed1c53 (patch) | |
| tree | 109b804881db11eb33680d9abbfbfa895f711883 | |
| parent | a83ac2221fb695217f6f2f8cc09e6153dc2578a6 (diff) | |
| download | qpid-python-7bddceb25095cd8002e03cbc2ffd312922ed1c53.tar.gz | |
QPID-4636: add 'peersOnly=false' on the 'regular trustStore' for clarity, add assertion exclusion on a couple of system tests to get them passing
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1456556 13f79535-47bb-0310-9956-ffa450edef68
3 files changed, 4 insertions, 2 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java index 8c0ac06fdd..793c259769 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java @@ -227,6 +227,7 @@ public class BrokerAdapter extends AbstractAdapter implements Broker, Configurat Map<String, Object> trsustStoreAttributes = new HashMap<String, Object>(); trsustStoreAttributes.put(TrustStore.NAME, DEFAULT_TRUST_STORE_NAME); trsustStoreAttributes.put(TrustStore.PATH, trustStorePath); + trsustStoreAttributes.put(TrustStore.PEERS_ONLY, Boolean.FALSE); trsustStoreAttributes.put(TrustStore.PASSWORD, (String) actualAttributes.get(TRUST_STORE_PASSWORD)); trsustStoreAttributes.put(TrustStore.TYPE, java.security.KeyStore.getDefaultType()); trsustStoreAttributes.put(TrustStore.KEY_MANAGER_FACTORY_ALGORITHM, KeyManagerFactory.getDefaultAlgorithm()); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java index 13e0c1e819..06927946ba 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java @@ -64,6 +64,6 @@ public class BrokerRestHttpsTest extends QpidRestTestCase Asserts.assertAttributesPresent(brokerDetails, Broker.AVAILABLE_ATTRIBUTES, Broker.BYTES_RETAINED, Broker.PROCESS_PID, Broker.SUPPORTED_STORE_TYPES, Broker.CREATED, Broker.TIME_TO_LIVE, Broker.UPDATED, Broker.ACL_FILE, Broker.KEY_STORE_CERT_ALIAS, Broker.TRUST_STORE_PATH, Broker.TRUST_STORE_PASSWORD, - Broker.GROUP_FILE); + Broker.GROUP_FILE, Broker.PEER_STORE_PATH, Broker.PEER_STORE_PASSWORD); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java index d479d39287..4db83387e5 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java @@ -92,7 +92,8 @@ public class BrokerRestTest extends QpidRestTestCase Broker.BYTES_RETAINED, Broker.PROCESS_PID, Broker.SUPPORTED_STORE_TYPES, Broker.CREATED, Broker.TIME_TO_LIVE, Broker.UPDATED, Broker.ACL_FILE, Broker.KEY_STORE_PATH, Broker.KEY_STORE_PASSWORD, Broker.KEY_STORE_CERT_ALIAS, - Broker.TRUST_STORE_PATH, Broker.TRUST_STORE_PASSWORD, Broker.GROUP_FILE); + Broker.TRUST_STORE_PATH, Broker.TRUST_STORE_PASSWORD, Broker.GROUP_FILE, + Broker.PEER_STORE_PATH, Broker.PEER_STORE_PASSWORD); assertEquals("Unexpected value of attribute " + Broker.BUILD_VERSION, QpidProperties.getBuildVersion(), brokerDetails.get(Broker.BUILD_VERSION)); |