Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 4dba5f1da -> a878566f0
[KARAF-3268]remove karaf.admin.role Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a878566f Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a878566f Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a878566f Branch: refs/heads/karaf-3.0.x Commit: a878566f0659fda3b47b51e9f75fb010794618a0 Parents: 4dba5f1 Author: Freeman Fang <[email protected]> Authored: Thu Oct 9 16:31:55 2014 +0800 Committer: Freeman Fang <[email protected]> Committed: Thu Oct 9 16:31:55 2014 +0800 ---------------------------------------------------------------------- manual/src/main/webapp/users-guide/monitoring.conf | 8 +------- manual/src/main/webapp/users-guide/remote.conf | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/a878566f/manual/src/main/webapp/users-guide/monitoring.conf ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/users-guide/monitoring.conf b/manual/src/main/webapp/users-guide/monitoring.conf index 01d2a8e..d60eebd 100644 --- a/manual/src/main/webapp/users-guide/monitoring.conf +++ b/manual/src/main/webapp/users-guide/monitoring.conf @@ -86,12 +86,6 @@ threaded = true # 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 -# -# jmxRole=admin -{code} * {{rmiRegistryPort}} property contains the port number of the JMX RMI registry. Default is {{1099}}. * {{rmiServerPort}} property contains the port number of the JMX RMI server. Default is {{44444}}. @@ -260,4 +254,4 @@ We can send this JSON request using {{curl}} and get the result: curl -d "{\"type\":\"read\",\"mbean\":\"java.lang:type=Memory\",\"attribute\":\"HeapMemoryUsage\",\"path\":\"used\"}" http://localhost:8080/jolokia/ && echo "" {code} -You can find details on the [Jolokia website|http://www.jolokia.org] and in the [documentation|http://www.jolokia.org/reference/html/]. \ No newline at end of file +You can find details on the [Jolokia website|http://www.jolokia.org] and in the [documentation|http://www.jolokia.org/reference/html/]. http://git-wip-us.apache.org/repos/asf/karaf/blob/a878566f/manual/src/main/webapp/users-guide/remote.conf ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/users-guide/remote.conf b/manual/src/main/webapp/users-guide/remote.conf index 260e739..0c88861 100644 --- a/manual/src/main/webapp/users-guide/remote.conf +++ b/manual/src/main/webapp/users-guide/remote.conf @@ -67,11 +67,6 @@ sshRealm = karaf # hostKey = ${karaf.etc}/host.key -# -# Role name used for SSH access authorization -# If not set, this defaults to the ${karaf.admin.role} configured in etc/system.properties -# -# sshRole = admin # # Self defined key size in 1024, 2048, 3072, or 4096 @@ -106,7 +101,6 @@ The {{etc/org.apache.karaf.shell.cfg}} configuration file contains different pro address of the network interface. * {{hostKey}} is the location of the {{host.key}} file. By defaut, it uses {{etc/host.key}}. This file stores the public and private key pair of the SSHd server. -* {{sshRole}} is the default role used for SSH access. The default value is the value of {{karaf.admin.role}} property defined in {{etc/system.properties}}. See the [Security section|security] of this user guide for details. * {{keySize}} is the key size used by the SSHd server. The possible values are 1024, 2048, 3072, or 4096. The default value is 1024. @@ -406,4 +400,4 @@ Apache Karaf provides a JMX MBeanServer. This MBeanServer is available remotely, using any JMX client like {{jconsole}}. -You can find details on the [Monitoring section|monitoring] of the user guide. \ No newline at end of file +You can find details on the [Monitoring section|monitoring] of the user guide.
