From 40ae5266203735c5fc0b8b26981ea1ba9596917c Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 4 Oct 2012 11:14:46 +0200 Subject: [PATCH] added hack for missing user events --- .../java/sonia/scm/security/ScmRealm.java | 6 +- .../java/sonia/scm/user/UserEventHack.java | 76 +++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 scm-webapp/src/main/java/sonia/scm/user/UserEventHack.java diff --git a/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java b/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java index 0698ed87ba..d65fec592f 100644 --- a/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java +++ b/scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java @@ -73,6 +73,7 @@ import sonia.scm.repository.RepositoryListener; import sonia.scm.repository.RepositoryManager; import sonia.scm.user.User; import sonia.scm.user.UserDAO; +import sonia.scm.user.UserEventHack; import sonia.scm.user.UserException; import sonia.scm.user.UserListener; import sonia.scm.user.UserManager; @@ -330,10 +331,11 @@ public class ScmRealm extends AuthorizingRealm // create new user else { - - // TODO fire event ?? user.setCreationDate(System.currentTimeMillis()); + // TODO find a better way + UserEventHack.fireEvent(userManager, user, HandlerEvent.BEFORE_CREATE); userDAO.add(user); + UserEventHack.fireEvent(userManager, user, HandlerEvent.CREATE); } if (user.isActive()) diff --git a/scm-webapp/src/main/java/sonia/scm/user/UserEventHack.java b/scm-webapp/src/main/java/sonia/scm/user/UserEventHack.java new file mode 100644 index 0000000000..d7bffa1baa --- /dev/null +++ b/scm-webapp/src/main/java/sonia/scm/user/UserEventHack.java @@ -0,0 +1,76 @@ +/** + * 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.user; + +//~--- non-JDK imports -------------------------------------------------------- + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import sonia.scm.HandlerEvent; + +/** + * + * @author Sebastian Sdorra + */ +public class UserEventHack +{ + + /** + * the logger for UserEventHack + */ + private static final Logger logger = + LoggerFactory.getLogger(UserEventHack.class); + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + * + * @param userManager + * @param user + * @param event + */ + public static void fireEvent(UserManager userManager, User user, + HandlerEvent event) + { + if (userManager instanceof AbstractUserManager) + { + ((DefaultUserManager) userManager).fireEvent(user, event); + } + else if (logger.isWarnEnabled()) + { + logger.warn("user manager is not an instance of AbstractUserManager"); + } + } +}