Refactor JCR exceptions.

[lgpl/argeo-commons.git] / org.argeo.jcr / src / org / argeo / jcr / JcrAuthorizations.java

diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrAuthorizations.java b/org.argeo.jcr/src/org/argeo/jcr/JcrAuthorizations.java
index 46748b950689b89a5c17b15a12c3557c6aa37d2a..351929f8da176b2e607b9d829af67a9d138ccbf9 100644 (file)
--- a/org.argeo.jcr/src/org/argeo/jcr/JcrAuthorizations.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/JcrAuthorizations.java
@@ -1,18 +1,3 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.argeo.jcr;
 
 import java.security.Principal;
@@ -65,9 +50,9 @@ public class JcrAuthorizations implements Runnable {
                                session = repository.login(workspace);
                                initAuthorizations(session);
                        }
-               } catch (Exception e) {
+               } catch (RepositoryException e) {
                        JcrUtils.discardQuietly(session);
-                       throw new ArgeoJcrException(
+                       throw new JcrException(
                                        "Cannot set authorizations " + principalPrivileges + " on workspace " + currentWorkspace, e);
                } finally {
                        JcrUtils.logoutQuietly(session);
@@ -79,9 +64,9 @@ public class JcrAuthorizations implements Runnable {
                try {
                        session = repository.login(workspace);
                        initAuthorizations(session);
-               } catch (Exception e) {
+               } catch (RepositoryException e) {
                        JcrUtils.discardQuietly(session);
-                       throw new ArgeoJcrException(
+                       throw new JcrException(
                                        "Cannot set authorizations " + principalPrivileges + " on repository " + repository, e);
                } finally {
                        JcrUtils.logoutQuietly(session);
@@ -101,7 +86,7 @@ public class JcrAuthorizations implements Runnable {
                        String path = null;
                        int slashIndex = privileges.indexOf('/');
                        if (slashIndex == 0) {
-                               throw new ArgeoJcrException("Privilege " + privileges + " badly formatted it starts with /");
+                               throw new IllegalArgumentException("Privilege " + privileges + " badly formatted it starts with /");
                        } else if (slashIndex > 0) {
                                path = privileges.substring(slashIndex);
                                privileges = privileges.substring(0, slashIndex);