Repository: servicemix Updated Branches: refs/heads/servicemix-5.4.x 84a2b1a66 -> a33422beb
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/a33422be Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/a33422be Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/a33422be Branch: refs/heads/servicemix-5.4.x Commit: a33422beb975b11c3ab87c8f1384d5cc92d8b777 Parents: 84a2b1a Author: Krzysztof Sobkowiak <[email protected]> Authored: Sat Jan 10 20:19:49 2015 +0100 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Sat Jan 10 20:21:13 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/a33422be/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/a33422be/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
