QPID-5680 : [Java Broker] move configuration defualts to annotations

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1586683 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 61 insertions, 56 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
index c3c8e58cc7..e58fa0c45d 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
@@ -44,6 +44,7 @@ import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Transport;
 import org.apache.qpid.server.model.TrustStore;
+import org.apache.qpid.server.security.FileTrustStore;
 import org.apache.qpid.test.utils.JMXTestUtils;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -199,9 +200,9 @@ public class ExternalAuthenticationTest extends QpidBrokerTestCase
         //add the peersOnly store to the config
         Map<String, Object> sslTrustStoreAttributes = new HashMap<String, Object>();
         sslTrustStoreAttributes.put(TrustStore.NAME, peerStoreName);
-        sslTrustStoreAttributes.put(TrustStore.PATH, BROKER_PEERSTORE);
-        sslTrustStoreAttributes.put(TrustStore.PASSWORD, BROKER_PEERSTORE_PASSWORD);
-        sslTrustStoreAttributes.put(TrustStore.PEERS_ONLY, true);
+        sslTrustStoreAttributes.put(FileTrustStore.PATH, BROKER_PEERSTORE);
+        sslTrustStoreAttributes.put(FileTrustStore.PASSWORD, BROKER_PEERSTORE_PASSWORD);
+        sslTrustStoreAttributes.put(FileTrustStore.PEERS_ONLY, true);
         getBrokerConfiguration().addObjectConfiguration(TrustStore.class, sslTrustStoreAttributes);
 
         super.setUp();
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java
index ab38d77b6c..fcf969e979 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java
@@ -38,11 +38,11 @@ public class HttpManagementRestTest extends QpidRestTestCase
                 details.get(HttpManagement.TIME_OUT));
         assertEquals("Unexpected http basic auth enabled", true,
                 details.get(HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED));
-        assertEquals("Unexpected https basic auth enabled", HttpManagement.DEFAULT_HTTPS_BASIC_AUTHENTICATION_ENABLED,
+        assertEquals("Unexpected https basic auth enabled", true,
                 details.get(HttpManagement.HTTPS_BASIC_AUTHENTICATION_ENABLED));
-        assertEquals("Unexpected http sasl auth enabled", HttpManagement.DEFAULT_HTTP_SASL_AUTHENTICATION_ENABLED,
+        assertEquals("Unexpected http sasl auth enabled", true,
                 details.get(HttpManagement.HTTP_SASL_AUTHENTICATION_ENABLED));
-        assertEquals("Unexpected https sasl auth enabled", HttpManagement.DEFAULT_HTTPS_SASL_AUTHENTICATION_ENABLED,
+        assertEquals("Unexpected https sasl auth enabled", true,
                 details.get(HttpManagement.HTTPS_SASL_AUTHENTICATION_ENABLED));
     }
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
index 680f807a9b..834beb542c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
@@ -30,10 +30,11 @@ import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.map.JsonMappingException;
 
+import org.apache.qpid.server.model.AbstractConfiguredObject;
 import org.apache.qpid.server.model.KeyStore;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.security.AbstractKeyStoreAdapter;
+import org.apache.qpid.server.security.FileKeyStore;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
 import org.apache.qpid.test.utils.TestSSLConstants;
 
@@ -107,8 +108,8 @@ public class KeyStoreRestTest extends QpidRestTestCase
         //add a new key store config to use
         Map<String, Object> sslKeyStoreAttributes = new HashMap<String, Object>();
         sslKeyStoreAttributes.put(KeyStore.NAME, name);
-        sslKeyStoreAttributes.put(KeyStore.PATH, TestSSLConstants.BROKER_KEYSTORE);
-        sslKeyStoreAttributes.put(KeyStore.PASSWORD, TestSSLConstants.BROKER_KEYSTORE_PASSWORD);
+        sslKeyStoreAttributes.put(FileKeyStore.PATH, TestSSLConstants.BROKER_KEYSTORE);
+        sslKeyStoreAttributes.put(FileKeyStore.PASSWORD, TestSSLConstants.BROKER_KEYSTORE_PASSWORD);
         getBrokerConfiguration().addObjectConfiguration(KeyStore.class,sslKeyStoreAttributes);
 
         //add the SSL port using it
@@ -152,7 +153,7 @@ public class KeyStoreRestTest extends QpidRestTestCase
 
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(KeyStore.NAME, name);
-        attributes.put(KeyStore.PATH, TestSSLConstants.UNTRUSTED_KEYSTORE);
+        attributes.put(FileKeyStore.PATH, TestSSLConstants.UNTRUSTED_KEYSTORE);
 
         int responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name , "PUT", attributes);
         assertEquals("Unexpected response code for keystore update", 200, responseCode);
@@ -175,7 +176,7 @@ public class KeyStoreRestTest extends QpidRestTestCase
 
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(KeyStore.NAME, name);
-        attributes.put(KeyStore.PATH, "does.not.exist");
+        attributes.put(FileKeyStore.PATH, "does.not.exist");
 
         int responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name , "PUT", attributes);
         assertEquals("Unexpected response code for keystore update", 409, responseCode);
@@ -204,7 +205,7 @@ public class KeyStoreRestTest extends QpidRestTestCase
         //Update the certAlias from app1 to app2
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(KeyStore.NAME, name);
-        attributes.put(KeyStore.CERTIFICATE_ALIAS, "app2");
+        attributes.put(FileKeyStore.CERTIFICATE_ALIAS, "app2");
 
         int responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name , "PUT", attributes);
         assertEquals("Unexpected response code for keystore update", 200, responseCode);
@@ -217,7 +218,7 @@ public class KeyStoreRestTest extends QpidRestTestCase
         //Update the certAlias to clear it (i.e go from from app1 to null)
         attributes = new HashMap<String, Object>();
         attributes.put(KeyStore.NAME, name);
-        attributes.put(KeyStore.CERTIFICATE_ALIAS, null);
+        attributes.put(FileKeyStore.CERTIFICATE_ALIAS, null);
 
         responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name , "PUT", attributes);
         assertEquals("Unexpected response code for keystore update", 200, responseCode);
@@ -242,9 +243,9 @@ public class KeyStoreRestTest extends QpidRestTestCase
     {
         Map<String, Object> keyStoreAttributes = new HashMap<String, Object>();
         keyStoreAttributes.put(KeyStore.NAME, name);
-        keyStoreAttributes.put(KeyStore.PATH, TestSSLConstants.KEYSTORE);
-        keyStoreAttributes.put(KeyStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD);
-        keyStoreAttributes.put(KeyStore.CERTIFICATE_ALIAS, certAlias);
+        keyStoreAttributes.put(FileKeyStore.PATH, TestSSLConstants.KEYSTORE);
+        keyStoreAttributes.put(FileKeyStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD);
+        keyStoreAttributes.put(FileKeyStore.CERTIFICATE_ALIAS, certAlias);
 
         int responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name, "PUT", keyStoreAttributes);
         assertEquals("Unexpected response code", 201, responseCode);
@@ -255,17 +256,17 @@ public class KeyStoreRestTest extends QpidRestTestCase
         assertEquals("default systests key store is missing",
                 name, keystore.get(KeyStore.NAME));
         assertEquals("unexpected path to key store",
-                path, keystore.get(KeyStore.PATH));
+                path, keystore.get(FileKeyStore.PATH));
         assertEquals("unexpected (dummy) password of default systests key store",
-                AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK, keystore.get(KeyStore.PASSWORD));
+                     AbstractConfiguredObject.SECURED_STRING_VALUE, keystore.get(FileKeyStore.PASSWORD));
         assertEquals("unexpected type of default systests key store",
-                java.security.KeyStore.getDefaultType(), keystore.get(KeyStore.KEY_STORE_TYPE));
+                java.security.KeyStore.getDefaultType(), keystore.get(FileKeyStore.KEY_STORE_TYPE));
         assertEquals("unexpected certificateAlias value",
-                certAlias, keystore.get(KeyStore.CERTIFICATE_ALIAS));
+                certAlias, keystore.get(FileKeyStore.CERTIFICATE_ALIAS));
         if(certAlias == null)
         {
             assertFalse("should not be a certificateAlias attribute",
-                            keystore.containsKey(KeyStore.CERTIFICATE_ALIAS));
+                            keystore.containsKey(FileKeyStore.CERTIFICATE_ALIAS));
         }
     }
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
index 3d1a0af9eb..d50da1c1f9 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
@@ -30,10 +30,11 @@ import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.map.JsonMappingException;
 
+import org.apache.qpid.server.model.AbstractConfiguredObject;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Transport;
 import org.apache.qpid.server.model.TrustStore;
-import org.apache.qpid.server.security.AbstractKeyStoreAdapter;
+import org.apache.qpid.server.security.FileTrustStore;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
 import org.apache.qpid.test.utils.TestSSLConstants;
 
@@ -105,8 +106,8 @@ public class TrustStoreRestTest extends QpidRestTestCase
         //add a new trust store config to use
         Map<String, Object> sslTrustStoreAttributes = new HashMap<String, Object>();
         sslTrustStoreAttributes.put(TrustStore.NAME, name);
-        sslTrustStoreAttributes.put(TrustStore.PATH, TestSSLConstants.TRUSTSTORE);
-        sslTrustStoreAttributes.put(TrustStore.PASSWORD, TestSSLConstants.TRUSTSTORE_PASSWORD);
+        sslTrustStoreAttributes.put(FileTrustStore.PATH, TestSSLConstants.TRUSTSTORE);
+        sslTrustStoreAttributes.put(FileTrustStore.PASSWORD, TestSSLConstants.TRUSTSTORE_PASSWORD);
         getBrokerConfiguration().addObjectConfiguration(TrustStore.class,sslTrustStoreAttributes);
 
         //add the SSL port using it
@@ -151,7 +152,7 @@ public class TrustStoreRestTest extends QpidRestTestCase
 
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(TrustStore.NAME, name);
-        attributes.put(TrustStore.PATH, TestSSLConstants.TRUSTSTORE);
+        attributes.put(FileTrustStore.PATH, TestSSLConstants.TRUSTSTORE);
 
         int responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name , "PUT", attributes);
         assertEquals("Unexpected response code for truststore update", 200, responseCode);
@@ -174,7 +175,7 @@ public class TrustStoreRestTest extends QpidRestTestCase
 
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(TrustStore.NAME, name);
-        attributes.put(TrustStore.PATH, "does.not.exist");
+        attributes.put(FileTrustStore.PATH, "does.not.exist");
 
         int responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name , "PUT", attributes);
         assertEquals("Unexpected response code for trust store update", 409, responseCode);
@@ -199,7 +200,7 @@ public class TrustStoreRestTest extends QpidRestTestCase
         //update the peersOnly attribute from false to true
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(TrustStore.NAME, name);
-        attributes.put(TrustStore.PEERS_ONLY, true);
+        attributes.put(FileTrustStore.PEERS_ONLY, true);
 
         int responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name , "PUT", attributes);
         assertEquals("Unexpected response code for trust store update", 200, responseCode);
@@ -212,7 +213,7 @@ public class TrustStoreRestTest extends QpidRestTestCase
         //Update peersOnly to clear it (i.e go from from true to null, which will default to false)
         attributes = new HashMap<String, Object>();
         attributes.put(TrustStore.NAME, name);
-        attributes.put(TrustStore.PEERS_ONLY, null);
+        attributes.put(FileTrustStore.PEERS_ONLY, null);
 
         responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name , "PUT", attributes);
         assertEquals("Unexpected response code for trust store update", 200, responseCode);
@@ -238,9 +239,9 @@ public class TrustStoreRestTest extends QpidRestTestCase
         Map<String, Object> trustStoreAttributes = new HashMap<String, Object>();
         trustStoreAttributes.put(TrustStore.NAME, name);
         //deliberately using the client trust store to differentiate from the one we are already for broker
-        trustStoreAttributes.put(TrustStore.PATH, TestSSLConstants.TRUSTSTORE);
-        trustStoreAttributes.put(TrustStore.PASSWORD, TestSSLConstants.TRUSTSTORE_PASSWORD);
-        trustStoreAttributes.put(TrustStore.PEERS_ONLY, peersOnly);
+        trustStoreAttributes.put(FileTrustStore.PATH, TestSSLConstants.TRUSTSTORE);
+        trustStoreAttributes.put(FileTrustStore.PASSWORD, TestSSLConstants.TRUSTSTORE_PASSWORD);
+        trustStoreAttributes.put(FileTrustStore.PEERS_ONLY, peersOnly);
 
         int responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name, "PUT", trustStoreAttributes);
         assertEquals("Unexpected response code", 201, responseCode);
@@ -251,12 +252,12 @@ public class TrustStoreRestTest extends QpidRestTestCase
         assertEquals("default systests trust store is missing",
                 name, truststore.get(TrustStore.NAME));
         assertEquals("unexpected path to trust store",
-                path, truststore.get(TrustStore.PATH));
+                path, truststore.get(FileTrustStore.PATH));
         assertEquals("unexpected (dummy) password of default systests trust store",
-                AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK, truststore.get(TrustStore.PASSWORD));
+                     AbstractConfiguredObject.SECURED_STRING_VALUE, truststore.get(FileTrustStore.PASSWORD));
         assertEquals("unexpected type of default systests trust store",
-                java.security.KeyStore.getDefaultType(), truststore.get(TrustStore.TRUST_STORE_TYPE));
+                java.security.KeyStore.getDefaultType(), truststore.get(FileTrustStore.TRUST_STORE_TYPE));
         assertEquals("unexpected peersOnly value",
-                peersOnly, truststore.get(TrustStore.PEERS_ONLY));
+                peersOnly, truststore.get(FileTrustStore.PEERS_ONLY));
     }
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
index 37b705f2f3..1a39d9c3b0 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
@@ -41,6 +41,8 @@ import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.TrustStore;
 import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.security.FileKeyStore;
+import org.apache.qpid.server.security.FileTrustStore;
 import org.apache.qpid.server.security.access.FileAccessControlProviderConstants;
 import org.apache.qpid.server.security.acl.AbstractACLTestCase;
 import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManagerFactory;
@@ -433,16 +435,16 @@ public class BrokerACLTest extends QpidRestTestCase
 
         assertKeyStoreExistence(keyStoreName, true);
         Map<String, Object> keyStore = getRestTestHelper().getJsonAsSingletonList("/rest/keystore/" + keyStoreName);
-        assertEquals("Unexpected certificateAlias attribute value", initialCertAlias, keyStore.get(KeyStore.CERTIFICATE_ALIAS));
+        assertEquals("Unexpected certificateAlias attribute value", initialCertAlias, keyStore.get(FileKeyStore.CERTIFICATE_ALIAS));
 
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(KeyStore.NAME, keyStoreName);
-        attributes.put(KeyStore.CERTIFICATE_ALIAS, updatedCertAlias);
+        attributes.put(FileKeyStore.CERTIFICATE_ALIAS, updatedCertAlias);
         responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + keyStoreName, "PUT", attributes);
         assertEquals("Setting of keystore attributes should be allowed", 200, responseCode);
 
         keyStore = getRestTestHelper().getJsonAsSingletonList("/rest/keystore/" + keyStoreName);
-        assertEquals("Unexpected certificateAlias attribute value", updatedCertAlias, keyStore.get(KeyStore.CERTIFICATE_ALIAS));
+        assertEquals("Unexpected certificateAlias attribute value", updatedCertAlias, keyStore.get(FileKeyStore.CERTIFICATE_ALIAS));
     }
 
     public void testSetKeyStoreAttributesDenied() throws Exception
@@ -460,18 +462,18 @@ public class BrokerACLTest extends QpidRestTestCase
 
         assertKeyStoreExistence(keyStoreName, true);
         Map<String, Object> keyStore = getRestTestHelper().getJsonAsSingletonList("/rest/keystore/" + keyStoreName);
-        assertEquals("Unexpected certificateAlias attribute value", initialCertAlias, keyStore.get(KeyStore.CERTIFICATE_ALIAS));
+        assertEquals("Unexpected certificateAlias attribute value", initialCertAlias, keyStore.get(FileKeyStore.CERTIFICATE_ALIAS));
 
         getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
 
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(KeyStore.NAME, keyStoreName);
-        attributes.put(KeyStore.CERTIFICATE_ALIAS, updatedCertAlias);
+        attributes.put(FileKeyStore.CERTIFICATE_ALIAS, updatedCertAlias);
         responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + keyStoreName, "PUT", attributes);
         assertEquals("Setting of keystore attributes should be denied", 403, responseCode);
 
         keyStore = getRestTestHelper().getJsonAsSingletonList("/rest/keystore/" + keyStoreName);
-        assertEquals("Unexpected certificateAlias attribute value", initialCertAlias, keyStore.get(KeyStore.CERTIFICATE_ALIAS));
+        assertEquals("Unexpected certificateAlias attribute value", initialCertAlias, keyStore.get(FileKeyStore.CERTIFICATE_ALIAS));
     }
 
     /* === TrustStore === */
@@ -561,16 +563,16 @@ public class BrokerACLTest extends QpidRestTestCase
 
         assertTrustStoreExistence(trustStoreName, true);
         Map<String, Object> trustStore = getRestTestHelper().getJsonAsSingletonList("/rest/truststore/" + trustStoreName);
-        assertEquals("Unexpected peersOnly attribute value", initialPeersOnly, trustStore.get(TrustStore.PEERS_ONLY));
+        assertEquals("Unexpected peersOnly attribute value", initialPeersOnly, trustStore.get(FileTrustStore.PEERS_ONLY));
 
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(TrustStore.NAME, trustStoreName);
-        attributes.put(TrustStore.PEERS_ONLY, updatedPeersOnly);
+        attributes.put(FileTrustStore.PEERS_ONLY, updatedPeersOnly);
         responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + trustStoreName, "PUT", attributes);
         assertEquals("Setting of truststore attributes should be allowed", 200, responseCode);
 
         trustStore = getRestTestHelper().getJsonAsSingletonList("/rest/truststore/" + trustStoreName);
-        assertEquals("Unexpected peersOnly attribute value", updatedPeersOnly, trustStore.get(TrustStore.PEERS_ONLY));
+        assertEquals("Unexpected peersOnly attribute value", updatedPeersOnly, trustStore.get(FileTrustStore.PEERS_ONLY));
     }
 
     public void testSetTrustStoreAttributesDenied() throws Exception
@@ -588,18 +590,18 @@ public class BrokerACLTest extends QpidRestTestCase
 
         assertTrustStoreExistence(trustStoreName, true);
         Map<String, Object> trustStore = getRestTestHelper().getJsonAsSingletonList("/rest/truststore/" + trustStoreName);
-        assertEquals("Unexpected peersOnly attribute value", initialPeersOnly, trustStore.get(TrustStore.PEERS_ONLY));
+        assertEquals("Unexpected peersOnly attribute value", initialPeersOnly, trustStore.get(FileTrustStore.PEERS_ONLY));
 
         getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
 
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(TrustStore.NAME, trustStoreName);
-        attributes.put(TrustStore.PEERS_ONLY, updatedPeersOnly);
+        attributes.put(FileTrustStore.PEERS_ONLY, updatedPeersOnly);
         responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + trustStoreName, "PUT", attributes);
         assertEquals("Setting of truststore attributes should be denied", 403, responseCode);
 
         trustStore = getRestTestHelper().getJsonAsSingletonList("/rest/truststore/" + trustStoreName);
-        assertEquals("Unexpected peersOnly attribute value", initialPeersOnly, trustStore.get(TrustStore.PEERS_ONLY));
+        assertEquals("Unexpected peersOnly attribute value", initialPeersOnly, trustStore.get(FileTrustStore.PEERS_ONLY));
     }
 
     /* === Broker === */
@@ -928,11 +930,11 @@ public class BrokerACLTest extends QpidRestTestCase
                 details.get(HttpManagement.TIME_OUT));
         assertEquals("Unexpected http basic auth enabled", true,
                 details.get(HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED));
-        assertEquals("Unexpected https basic auth enabled", HttpManagement.DEFAULT_HTTPS_BASIC_AUTHENTICATION_ENABLED,
+        assertEquals("Unexpected https basic auth enabled", true,
                 details.get(HttpManagement.HTTPS_BASIC_AUTHENTICATION_ENABLED));
-        assertEquals("Unexpected http sasl auth enabled", HttpManagement.DEFAULT_HTTP_SASL_AUTHENTICATION_ENABLED,
+        assertEquals("Unexpected http sasl auth enabled", true,
                 details.get(HttpManagement.HTTP_SASL_AUTHENTICATION_ENABLED));
-        assertEquals("Unexpected https sasl auth enabled", HttpManagement.DEFAULT_HTTPS_SASL_AUTHENTICATION_ENABLED,
+        assertEquals("Unexpected https sasl auth enabled", true,
                 details.get(HttpManagement.HTTPS_SASL_AUTHENTICATION_ENABLED));
     }
 
@@ -1041,9 +1043,9 @@ public class BrokerACLTest extends QpidRestTestCase
     {
         Map<String, Object> keyStoreAttributes = new HashMap<String, Object>();
         keyStoreAttributes.put(KeyStore.NAME, name);
-        keyStoreAttributes.put(KeyStore.PATH, TestSSLConstants.KEYSTORE);
-        keyStoreAttributes.put(KeyStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD);
-        keyStoreAttributes.put(KeyStore.CERTIFICATE_ALIAS, certAlias);
+        keyStoreAttributes.put(FileKeyStore.PATH, TestSSLConstants.KEYSTORE);
+        keyStoreAttributes.put(FileKeyStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD);
+        keyStoreAttributes.put(FileKeyStore.CERTIFICATE_ALIAS, certAlias);
 
         return getRestTestHelper().submitRequest("/rest/keystore/" + name, "PUT", keyStoreAttributes);
     }
@@ -1052,9 +1054,9 @@ public class BrokerACLTest extends QpidRestTestCase
     {
         Map<String, Object> trustStoreAttributes = new HashMap<String, Object>();
         trustStoreAttributes.put(TrustStore.NAME, name);
-        trustStoreAttributes.put(TrustStore.PATH, TestSSLConstants.KEYSTORE);
-        trustStoreAttributes.put(TrustStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD);
-        trustStoreAttributes.put(TrustStore.PEERS_ONLY, peersOnly);
+        trustStoreAttributes.put(FileTrustStore.PATH, TestSSLConstants.KEYSTORE);
+        trustStoreAttributes.put(FileTrustStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD);
+        trustStoreAttributes.put(FileTrustStore.PEERS_ONLY, peersOnly);
 
         return getRestTestHelper().submitRequest("/rest/truststore/" + name, "PUT", trustStoreAttributes);
     }