You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2017/11/26 17:22:16 UTC
qpid-broker-j git commit: QPID-8054 : [Broker-J] KeyStore type and
algorithm defaults should be materialised on creation
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 09d7d8a19 -> 031e00611
QPID-8054 : [Broker-J] KeyStore type and algorithm defaults should be materialised on creation
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/031e0061
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/031e0061
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/031e0061
Branch: refs/heads/master
Commit: 031e00611a8e2a682281ce617266c090d670a1d8
Parents: 09d7d8a
Author: rgodfrey <rg...@apache.org>
Authored: Sun Nov 26 18:21:36 2017 +0100
Committer: rgodfrey <rg...@apache.org>
Committed: Sun Nov 26 18:21:36 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/qpid/server/security/FileKeyStore.java | 6 ++++--
.../java/org/apache/qpid/server/security/FileTrustStore.java | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/031e0061/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
index 4051ddb..216dbad 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.security;
+import static org.apache.qpid.server.model.Initialization.materialize;
+
import javax.net.ssl.KeyManagerFactory;
import org.apache.qpid.server.model.DerivedAttribute;
@@ -57,10 +59,10 @@ public interface FileKeyStore<X extends FileKeyStore<X>> extends KeyStore<X>
@ManagedAttribute
String getCertificateAlias();
- @ManagedAttribute( defaultValue = "${keyStoreFile.keyManagerFactoryAlgorithm}" )
+ @ManagedAttribute( defaultValue = "${keyStoreFile.keyManagerFactoryAlgorithm}" , initialization = materialize)
String getKeyManagerFactoryAlgorithm();
- @ManagedAttribute( defaultValue = "${keyStoreFile.keyStoreType}" )
+ @ManagedAttribute( defaultValue = "${keyStoreFile.keyStoreType}", initialization = materialize)
String getKeyStoreType();
@ManagedAttribute( secure = true, mandatory = true )
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/031e0061/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 40d8eef..a8e1975 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
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.security;
+import static org.apache.qpid.server.model.Initialization.materialize;
+
import javax.net.ssl.KeyManagerFactory;
import org.apache.qpid.server.model.DerivedAttribute;
@@ -52,10 +54,10 @@ public interface FileTrustStore<X extends FileTrustStore<X>> extends TrustStore<
@DerivedAttribute
String getPath();
- @ManagedAttribute( defaultValue = "${trustStoreFile.trustManagerFactoryAlgorithm}")
+ @ManagedAttribute( defaultValue = "${trustStoreFile.trustManagerFactoryAlgorithm}", initialization = materialize )
String getTrustManagerFactoryAlgorithm();
- @ManagedAttribute( defaultValue = "${trustStoreFile.trustStoreType}")
+ @ManagedAttribute( defaultValue = "${trustStoreFile.trustStoreType}", initialization = materialize)
String getTrustStoreType();
@ManagedAttribute( defaultValue = "false",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org