Author: robbie
Date: Thu Mar 14 17:20:02 2013
New Revision: 1456556
URL: http://svn.apache.org/r1456556
Log:
QPID-4636: add 'peersOnly=false' on the 'regular trustStore' for clarity, add
assertion exclusion on a couple of system tests to get them passing
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1456556&r1=1456555&r2=1456556&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
Thu Mar 14 17:20:02 2013
@@ -227,6 +227,7 @@ public class BrokerAdapter extends Abstr
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());
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java?rev=1456556&r1=1456555&r2=1456556&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
Thu Mar 14 17:20:02 2013
@@ -64,6 +64,6 @@ public class BrokerRestHttpsTest extends
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);
}
}
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java?rev=1456556&r1=1456555&r2=1456556&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
Thu Mar 14 17:20:02 2013
@@ -92,7 +92,8 @@ public class BrokerRestTest extends Qpid
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));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
