merge with branch issue-423

This commit is contained in:
Sebastian Sdorra
2013-08-05 15:04:34 +02:00
2 changed files with 23 additions and 7 deletions

View File

@@ -30,6 +30,7 @@
*/
package sonia.scm.security;
//~--- non-JDK imports --------------------------------------------------------
@@ -55,6 +56,7 @@ import org.slf4j.LoggerFactory;
import sonia.scm.cache.Cache;
import sonia.scm.cache.CacheManager;
import sonia.scm.group.GroupEvent;
import sonia.scm.group.GroupNames;
import sonia.scm.repository.PermissionType;
import sonia.scm.repository.Repository;
@@ -205,8 +207,27 @@ public class AuthorizationCollector
* Method description
*
*
* @param user
* @param groups
* @param event
*/
@Subscribe
public void onEvent(GroupEvent event)
{
if (event.getEventType().isPost())
{
if (logger.isDebugEnabled())
{
logger.debug("clear cache, because group {} has changed",
event.getItem().getId());
}
cache.clear();
}
}
/**
* Method description
*
*
*
* @param principals
*
@@ -252,7 +273,6 @@ public class AuthorizationCollector
* @param user
* @param groups
*
* @return
*/
private void collectGlobalPermissions(Builder<Permission> builder,
final User user, final GroupNames groups)
@@ -299,7 +319,6 @@ public class AuthorizationCollector
* @param user
* @param groups
*
* @return
*/
private void collectRepositoryPermissions(Builder<Permission> builder,
User user, GroupNames groups)
@@ -320,7 +339,6 @@ public class AuthorizationCollector
* Method description
*
*
* @param permissions
*
* @param builder
* @param repository

View File

@@ -60,7 +60,6 @@ import org.slf4j.LoggerFactory;
import sonia.scm.HandlerEvent;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.event.Subscriber;
import sonia.scm.group.Group;
import sonia.scm.group.GroupManager;
import sonia.scm.group.GroupNames;
@@ -90,7 +89,6 @@ import javax.servlet.http.HttpServletResponse;
* @author Sebastian Sdorra
*/
@Singleton
@Subscriber
public class ScmRealm extends AuthorizingRealm
{