svn commit: r1349453 - in /karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc: org.apache.karaf.management.cfg org.apache.karaf.shell.cfg system.properties

[jb...@apache.org]

Author: jbonofre
Date: Tue Jun 12 17:44:43 2012
New Revision: 1349453

URL: http://svn.apache.org/viewvc?rev=1349453&view=rev
Log:
[KARAF-1430] Align the cfg file from child instances with the assembly one

Modified:
    karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg
    karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
    karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties

Modified: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg?rev=1349453&r1=1349452&r2=1349453&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg (original)
+++ karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg Tue Jun 12 17:44:43 2012
@@ -18,10 +18,46 @@
 ################################################################################
 
 #
+# The properties in this file define the configuration of Apache Karaf's JMX Management
+#
+
+#
+# Port of the registry for the exported RMI service
+#
 rmiRegistryPort = ${SUBST-RMI-REGISTRY-PORT}
+
+#
+# Port of the registry for the exported RMI service
+#
 rmiServerPort = ${SUBST-RMI-SERVER-PORT}
+
+#
+# Name of the JAAS realm used for authentication
+#
 jmxRealm = karaf
+
+#
+# The service URL for the JMXConnectorServer
+#
 serviceUrl = service:jmx:rmi://0.0.0.0:${rmiServerPort}/jndi/rmi://0.0.0.0:${rmiRegistryPort}/karaf-${karaf.name}
+
+#
+# Whether any threads started for the JMXConnectorServer should be started as daemon threads
+#
 daemon = true
+
+#
+# Whether the JMXConnectorServer should be started in a separate thread
+#
 threaded = true
+
+#
+# The ObjectName used to register the JMXConnectorServer
+#
 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

Modified: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg?rev=1349453&r1=1349452&r2=1349453&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg (original)
+++ karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg Tue Jun 12 17:44:43 2012
@@ -18,7 +18,28 @@
 ################################################################################
 
 #
+# These properties are used to configure Karaf's ssh shell.
+#
+
+#
+# Via sshPort and sshHost you define the address you can login into Karaf.
+#
 sshPort=${SUBST-SSH-PORT}
 sshHost=0.0.0.0
+
+#
+# sshRealm defines which JAAS domain to use for password authentication.
+#
 sshRealm=karaf
+
+#
+# The location of the hostKey file defines where the private/public key of the server
+# is located. If no file is at the defined location it will be ignored.
+#
 hostKey=${karaf.base}/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

Modified: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties?rev=1349453&r1=1349452&r2=1349453&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties (original)
+++ karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties Tue Jun 12 17:44:43 2012
@@ -31,13 +31,13 @@
 org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
 
 #
-# Name of this karaf instance.
+# Name of this Karaf instance.
 #
 karaf.name=${SUBST-KARAF-NAME}
 
 #
 # Default repository where bundles will be loaded from before using
-# other maven repositories.  For the full maven configuration, see
+# other Maven repositories.  For the full Maven configuration, see
 # the org.ops4j.pax.url.mvn.cfg file.
 #
 karaf.default.repository=system
@@ -50,12 +50,29 @@ karaf.default.repository=system
 karaf.shell.init.script=${karaf.home}/etc/shell.init.script
 
 #
+# Default role name used for console authorization (JMX, SSH and WEB)
+# The syntax is the following:
+#   [classname:]principal
+# where classname is the class name of the principal object
+# (defaults to org.apache.karaf.jaas.modules.RolePrincipal)
+# and principal is the name of the principal of that class
+# (defaults to instance).
+#
+# Note that this value can be overriden using the various ConfigAdmin
+# configurations for JMX, SSH or the WebConsole.
+#
+karaf.admin.role=admin
+
+#
 # Set this empty property to avoid errors when validating xml documents.
 #
 xml.catalog.files=
 
 #
-# Suppress the bell in the console when hitting backspace to many times
+# Suppress the bell in the console when hitting backspace too many times
 # for example
 #
 jline.nobell=true
+
+# Workaround for KARAF-1117: Jetty will use a JUL logger.
+org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog