servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksobkow...@apache.org
Subject servicemix git commit: SM-2404: Upgrade to Karaf 2.4.1
Date Sat, 10 Jan 2015 19:20:46 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.3.x 84975d9ab -> 52500a597


SM-2404: Upgrade to Karaf 2.4.1


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/52500a59
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/52500a59
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/52500a59

Branch: refs/heads/servicemix-5.3.x
Commit: 52500a597098de459c60615d77ecffc78c533bfa
Parents: 84975d9
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Sat Jan 10 20:19:49 2015 +0100
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Sat Jan 10 20:19:49 2015 +0100

----------------------------------------------------------------------
 assembly/src/main/resources/etc/system.properties | 14 --------------
 assembly/src/main/resources/etc/users.properties  |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/52500a59/assembly/src/main/resources/etc/system.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/system.properties b/assembly/src/main/resources/etc/system.properties
index e5ab5e2..c6eb216 100644
--- a/assembly/src/main/resources/etc/system.properties
+++ b/assembly/src/main/resources/etc/system.properties
@@ -56,20 +56,6 @@ karaf.shell.init.script=${karaf.home}/etc/shell.init.script
 # karaf.shell.history.maxSize=0
 
 #
-# 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 admin).
-#
-# Note that this value can be overriden using the various ConfigAdmin
-# configurations for JMX, SSH or the WebConsole.
-#
-karaf.admin.role=admin
-
-#
 # Roles to use when logging into a local Karaf console.
 # The syntax is the following:
 # [classname:]principal

http://git-wip-us.apache.org/repos/asf/servicemix/blob/52500a59/assembly/src/main/resources/etc/users.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/users.properties b/assembly/src/main/resources/etc/users.properties
index e066450..ca4b482 100644
--- a/assembly/src/main/resources/etc/users.properties
+++ b/assembly/src/main/resources/etc/users.properties
@@ -30,7 +30,7 @@
 # with the name "karaf".
 #
 smx = smx,_g_:admingroup
-_g_\:admingroup = group,admin,manager,viewer
+_g_\:admingroup = group,admin,manager,viewer,webconsole
 
 # Workaround for SM-2267: sometimes, the webconsole configuration first hands out a ConnectionFactory
 # that uses karaf/karaf as the credentials before picking up the settings in system.properties


Mime
View raw message