From 7698d591d346f7c841e71bc83e497afafd9b3b6b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 22 Mar 2013 15:17:04 +0000 Subject: [PATCH] Merge https://www.argeo.org/bugzilla/show_bug.cgi?id=141 git-svn-id: https://svn.argeo.org/commons/branches/1.x@6205 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../security/core/SimpleRoleRegistration.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/SimpleRoleRegistration.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/SimpleRoleRegistration.java index b20a84284..aa8a5f06e 100644 --- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/SimpleRoleRegistration.java +++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/SimpleRoleRegistration.java @@ -1,9 +1,12 @@ package org.argeo.security.core; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.argeo.security.UserAdminService; /** @@ -11,21 +14,29 @@ import org.argeo.security.UserAdminService; * is already registered. */ public class SimpleRoleRegistration implements Runnable { + private final static Log log = LogFactory + .getLog(SimpleRoleRegistration.class); + private String role; - private List roles; + private List roles = new ArrayList(); private UserAdminService userAdminService; @Override public void run() { Set existingRoles = userAdminService.listEditableRoles(); if (role != null && !existingRoles.contains(role)) - userAdminService.newRole(role); + newRole(role); for (String r : roles) { if (!existingRoles.contains(r)) - userAdminService.newRole(r); + newRole(r); } } + protected void newRole(String r) { + userAdminService.newRole(r); + log.info("Added role " + r + " required by application."); + } + public void register(UserAdminService userAdminService, Map properties) { this.userAdminService = userAdminService; run(); -- 2.30.2