You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/12/10 19:55:46 UTC
karaf git commit: [KARAF-3303] "keyStoreAvailabilityTimeout" is
treated as boolean in JMX configuration
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 539682f66 -> 65e1a176c
[KARAF-3303] "keyStoreAvailabilityTimeout" is treated as boolean in JMX configuration
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/65e1a176
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/65e1a176
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/65e1a176
Branch: refs/heads/karaf-3.0.x
Commit: 65e1a176c54c45d42eef307681c8faf306959846
Parents: 539682f
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Dec 2 08:19:36 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Dec 10 19:40:57 2015 +0100
----------------------------------------------------------------------
.../server/src/main/resources/OSGI-INF/metatype/metatype.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/65e1a176/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml
----------------------------------------------------------------------
diff --git a/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml b/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml
index d4badb0..9c73b30 100644
--- a/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml
+++ b/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml
@@ -35,7 +35,7 @@
<AD id="threaded" type="Boolean" default="true" name="%threaded.name" description="%threaded.description"/>
<AD id="objectName" type="String" default="connector:name=rmi" name="%objectName.name" description="%objectName.description"/>
<AD id="secured" type="Boolean" default="false" name="%secured.name" description="%secured.description"/>
- <AD id="keyStoreAvailabilityTimeout" type="Boolean" default="false" name="%keyStoreAvailabilityTimeout.name" description="%keyStoreAvailabilityTimeout.description"/>
+ <AD id="keyStoreAvailabilityTimeout" type="Integer" default="5000" name="%keyStoreAvailabilityTimeout.name" description="%keyStoreAvailabilityTimeout.description"/>
<AD id="secureAlgorithm" type="String" default="default" name="%secureAlgorithm.name" description="%secureAlgorithm.description"/>
<AD id="secureProtocol" type="String" default="TLS" name="%secureProtocol.name" description="%secureProtocol.description"/>
<AD id="keyStore" type="String" default="karaf.ks" name="%keyStore.name" description="%keyStore.description"/>