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:40:41 UTC
[1/2] karaf git commit: [KARAF-3303] "keyStoreAvailabilityTimeout" is
treated as boolean in JMX configuration
Repository: karaf
Updated Branches:
refs/heads/master 5b2c1609b -> bf003627f
[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/33ad0326
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/33ad0326
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/33ad0326
Branch: refs/heads/master
Commit: 33ad03262aedc1ac41ce954954af44f50c55391e
Parents: 0de9818
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Dec 2 08:19:36 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Dec 2 08:19:36 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/33ad0326/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"/>
[2/2] karaf git commit: Merge branch 'KARAF-3303' of
https://github.com/oscerd/karaf
Posted by jb...@apache.org.
Merge branch 'KARAF-3303' of https://github.com/oscerd/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bf003627
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bf003627
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bf003627
Branch: refs/heads/master
Commit: bf003627f744e1605827c1f76cc5ed6b4bcff27c
Parents: 5b2c160 33ad032
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Dec 10 19:20:16 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Dec 10 19:20:16 2015 +0100
----------------------------------------------------------------------
.../server/src/main/resources/OSGI-INF/metatype/metatype.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------