Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 13c9e7e66 -> f267226ab


QPID-7867: [Java Broker] Address review comments


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/f267226a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/f267226a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/f267226a

Branch: refs/heads/master
Commit: f267226ab091ce1ff08bec9f42e8be9ac66019b0
Parents: 13c9e7e
Author: Oleksandr Rudyy <oleksandr.ru...@jpmchase.net>
Authored: Wed Aug 9 17:27:58 2017 +0100
Committer: Oleksandr Rudyy <oleksandr.ru...@jpmchase.net>
Committed: Wed Aug 9 17:27:58 2017 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/qpid/server/model/TrustStore.java     | 1 -
 .../main/java/org/apache/qpid/server/security/FileTrustStore.java  | 1 +
 .../java/org/apache/qpid/server/security/FileTrustStoreImpl.java   | 2 +-
 .../qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java | 2 +-
 .../org/apache/qpid/server/security/NonJavaTrustStoreImpl.java     | 2 +-
 .../apache/qpid/server/security/SiteSpecificTrustStoreImpl.java    | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f267226a/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java 
b/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
index c2ddeac..5ef3c74 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
@@ -32,7 +32,6 @@ import org.apache.qpid.server.security.CertificateDetails;
 public interface TrustStore<X extends TrustStore<X>> extends 
ConfiguredObject<X>
 {
     String TRUST_ANCHOR_VALIDITY_ENFORCED = "trustAnchorValidityEnforced";
-    String PEERS_ONLY = "peersOnly";
 
     String CERTIFICATE_EXPIRY_WARN_PERIOD = 
"qpid.truststore.certificateExpiryWarnPeriod";
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f267226a/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java 
b/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java
index efbe805..40d8eef 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java
@@ -40,6 +40,7 @@ public interface FileTrustStore<X extends FileTrustStore<X>> 
extends TrustStore<
 
     @ManagedContextDefault(name = 
"trustStoreFile.trustManagerFactoryAlgorithm")
     String DEFAULT_TRUST_MANAGER_FACTORY_ALGORITHM = 
KeyManagerFactory.getDefaultAlgorithm();
+    String PEERS_ONLY = "peersOnly";
 
     @Override
     @ManagedAttribute(defaultValue = "${this:storeUrl}")

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f267226a/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
 
b/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
index ee23d45..efb88b1 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
@@ -200,7 +200,7 @@ public class FileTrustStoreImpl extends 
AbstractTrustStore<FileTrustStoreImpl> i
     }
 
     @Override
-    public TrustManager[] getTrustManagersInternal() throws 
GeneralSecurityException
+    protected TrustManager[] getTrustManagersInternal() throws 
GeneralSecurityException
     {
         String trustStorePassword = getPassword();
         String trustStoreType = _trustStoreType;

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f267226a/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java
 
b/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java
index 39f638d..18c36da 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java
@@ -74,7 +74,7 @@ public class ManagedPeerCertificateTrustStoreImpl
     }
 
     @Override
-    public TrustManager[] getTrustManagersInternal()
+    protected TrustManager[] getTrustManagersInternal()
     {
         if (_trustManagers == null || _trustManagers.length == 0)
         {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f267226a/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
 
b/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
index 0b26944..6a8f834 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
@@ -99,7 +99,7 @@ public class NonJavaTrustStoreImpl
     }
 
     @Override
-    public TrustManager[] getTrustManagersInternal() throws 
GeneralSecurityException
+    protected TrustManager[] getTrustManagersInternal() throws 
GeneralSecurityException
     {
         if (_trustManagers == null || _trustManagers.length == 0)
         {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f267226a/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
 
b/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
index 2e9a924..bb081ed 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
@@ -149,7 +149,7 @@ public class SiteSpecificTrustStoreImpl
     }
 
     @Override
-    public TrustManager[] getTrustManagersInternal() throws 
GeneralSecurityException
+    protected TrustManager[] getTrustManagersInternal() throws 
GeneralSecurityException
     {
         if (_trustManagers == null || _trustManagers.length == 0)
         {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

Reply via email to