From d785dd5bb8d57a42b4a277125237a26097a86eb5 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sat, 19 Feb 2011 18:32:02 +0100
Subject: [PATCH] throw ScmSecurityException instead of RepositoryException

---
 .../repository/xml/XmlRepositoryManager.java  | 38 +------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java b/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java
index bff8dfed4f..2eb4ff7cee 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java
@@ -55,12 +55,11 @@ import sonia.scm.repository.RepositoryException;
 import sonia.scm.repository.RepositoryHandler;
 import sonia.scm.repository.RepositoryHandlerNotFoundException;
 import sonia.scm.security.ScmSecurityException;
-import sonia.scm.security.SecurityContext;
 import sonia.scm.store.Store;
 import sonia.scm.store.StoreFactory;
-import sonia.scm.user.User;
 import sonia.scm.util.AssertUtil;
 import sonia.scm.util.IOUtil;
+import sonia.scm.util.SecurityUtil;
 import sonia.scm.web.security.WebSecurityContext;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -158,7 +157,7 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
                   repository.getType());
     }
 
-    assertIsAdmin();
+    SecurityUtil.assertIsAdmin(securityContextProvider);
     AssertUtil.assertIsValid(repository);
 
     if (repositoryDB.contains(repository))
@@ -490,20 +489,6 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
     types.add(type);
   }
 
-  /**
-   * Method description
-   *
-   *
-   * @throws RepositoryException
-   */
-  private void assertIsAdmin() throws RepositoryException
-  {
-    if (!getCurrentUser().isAdmin())
-    {
-      throw new RepositoryException("admin permsission required");
-    }
-  }
-
   /**
    * Method description
    *
@@ -540,25 +525,6 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
 
   //~--- get methods ----------------------------------------------------------
 
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  private User getCurrentUser()
-  {
-    SecurityContext context = securityContextProvider.get();
-
-    AssertUtil.assertIsNotNull(context);
-
-    User user = context.getUser();
-
-    AssertUtil.assertIsNotNull(user);
-
-    return user;
-  }
-
   /**
    * Method description
    *