diff --git a/scm-core/src/main/java/sonia/scm/store/StoredAssignedPermissionEvent.java b/scm-core/src/main/java/sonia/scm/store/StoredAssignedPermissionEvent.java new file mode 100644 index 0000000000..821262caef --- /dev/null +++ b/scm-core/src/main/java/sonia/scm/store/StoredAssignedPermissionEvent.java @@ -0,0 +1,91 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.store; + +//~--- non-JDK imports -------------------------------------------------------- + +import sonia.scm.HandlerEvent; +import sonia.scm.security.StoredAssignedPermission; + +/** + * + * @author Sebastian Sdorra + */ +public class StoredAssignedPermissionEvent +{ + + /** + * Constructs ... + * + * + * @param type + * @param permission + */ + public StoredAssignedPermissionEvent(HandlerEvent type, + StoredAssignedPermission permission) + { + this.type = type; + this.permission = permission; + } + + //~--- get methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @return + */ + public HandlerEvent getEventType() + { + return type; + } + + /** + * Method description + * + * + * @return + */ + public StoredAssignedPermission getPermission() + { + return permission; + } + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + private StoredAssignedPermission permission; + + /** Field description */ + private HandlerEvent type; +} diff --git a/scm-webapp/src/main/java/sonia/scm/security/DefaultSecuritySystem.java b/scm-webapp/src/main/java/sonia/scm/security/DefaultSecuritySystem.java index b3d4be0c1a..1cb2fda6b2 100644 --- a/scm-webapp/src/main/java/sonia/scm/security/DefaultSecuritySystem.java +++ b/scm-webapp/src/main/java/sonia/scm/security/DefaultSecuritySystem.java @@ -47,10 +47,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import sonia.scm.HandlerEvent; +import sonia.scm.event.ScmEventBus; import sonia.scm.event.Subscriber; import sonia.scm.group.GroupEvent; import sonia.scm.store.ConfigurationEntryStore; import sonia.scm.store.ConfigurationEntryStoreFactory; +import sonia.scm.store.StoredAssignedPermissionEvent; import sonia.scm.user.UserEvent; //~--- JDK imports ------------------------------------------------------------ @@ -127,7 +129,15 @@ public class DefaultSecuritySystem implements SecuritySystem String id = store.put(permission); - return new StoredAssignedPermission(id, permission); + StoredAssignedPermission sap = new StoredAssignedPermission(id, permission); + + //J- + ScmEventBus.getInstance().post( + new StoredAssignedPermissionEvent(HandlerEvent.CREATE, sap) + ); + //J+ + + return sap; } /** @@ -140,7 +150,12 @@ public class DefaultSecuritySystem implements SecuritySystem public void deletePermission(StoredAssignedPermission permission) { assertIsAdmin(); - deletePermission(permission.getId()); + store.remove(permission.getId()); + //J- + ScmEventBus.getInstance().post( + new StoredAssignedPermissionEvent(HandlerEvent.CREATE, permission) + ); + //J+ } /** @@ -153,7 +168,13 @@ public class DefaultSecuritySystem implements SecuritySystem public void deletePermission(String id) { assertIsAdmin(); - store.remove(id); + + AssignedPermission ap = store.get(id); + + if (ap != null) + { + deletePermission(new StoredAssignedPermission(id, ap)); + } } /** @@ -220,6 +241,12 @@ public class DefaultSecuritySystem implements SecuritySystem store.remove(permission.getId()); store.put(permission.getId(), new AssignedPermission(permission)); } + + //J- + ScmEventBus.getInstance().post( + new StoredAssignedPermissionEvent(HandlerEvent.CREATE, permission) + ); + //J+ } //~--- get methods ----------------------------------------------------------