karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: [KARAF-4770] Update etc/org.apache.karaf.management.cfg
Date Sun, 11 Dec 2016 07:32:49 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 61015a8c6 -> 52689bfe2


[KARAF-4770] Update etc/org.apache.karaf.management.cfg


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/52689bfe
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/52689bfe
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/52689bfe

Branch: refs/heads/master
Commit: 52689bfe2e8248d5ecde4e461ad0c827a43c6930
Parents: 61015a8
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Sun Dec 11 08:32:26 2016 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Sun Dec 11 08:32:26 2016 +0100

----------------------------------------------------------------------
 .../standard/src/main/feature/feature.xml       | 55 ++++++++++++++++++--
 1 file changed, 52 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/52689bfe/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 8774f65..147371f 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -816,10 +816,59 @@
             objectName = connector:name=rmi
 
             #
-            # Role name used for JMX access authorization
-            # If not set, this defaults to the ${karaf.admin.role} configured in etc/system.properties
+            # Timeout to lookup for the keystore in case of SSL authentication usage
+            #
+            #keyStoreAvailabilityTimeout = 5000
+
+            #
+            # The type of authentication
+            #
+            #authenticatorType = password
+
+            #
+            # Enable or not SSL/TLS
+            #
+            #secured = false
+
+            #
+            # Secure algorithm to use
+            #
+            #secureAlgorithm = default
+
+            #
+            # Secure protocol to use
+            #
+            #secureProtocol = TLS
+
+            #
+            # Keystore to use for secure mode
+            #
+            #keyStore = karaf.ks
+
+            #
+            # Alias of the key to use in the keystore
+            #
+            #keyAlias = karaf
+
+            #
+            # Truststore to use for secure mode
+            #
+            #trustStore = karaf.ts
+
+            #
+            # Create the JMX RMI registry
+            #
+            #createRmiRegistry = true
+
+            #
+            # Locate the JMX RMI registry
+            #
+            #locateRmiRegistry = true
+
+            #
+            # Locate an existing MBean server if possible (usefull when Karaf is embedded)
             #
-            # jmxRole=admin
+            #locateExistingMBeanServerIfPossible = true
         </config>
         <feature>jaas</feature>
         <bundle dependency="true" start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>


Mime
View raw message