From d6689b6266b735baa0f9a2a0dcf14422a6a46377 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 29 Aug 2012 10:01:06 +0000 Subject: [PATCH] Fix small bugs git-svn-id: https://svn.argeo.org/commons/trunk@5544 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../java/org/argeo/jackrabbit/JackrabbitAuthorizations.java | 5 +++-- .../main/java/org/argeo/jackrabbit/JackrabbitContainer.java | 5 +++++ .../main/java/org/argeo/jcr/security/JcrAuthorizations.java | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java index d33f886a8..a3cf4e149 100644 --- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitAuthorizations.java @@ -16,7 +16,7 @@ package org.argeo.jackrabbit; import java.security.Principal; -import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import javax.jcr.RepositoryException; @@ -35,7 +35,8 @@ public class JackrabbitAuthorizations extends JcrAuthorizations { private final static Log log = LogFactory .getLog(JackrabbitAuthorizations.class); - private List groupPrefixes = new ArrayList(); + private List groupPrefixes = Arrays + .asList(new String[] { "ROLE_" });// new ArrayList(); @Override protected Principal getOrCreatePrincipal(Session session, diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java index b501f6241..60635bb86 100644 --- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java @@ -239,6 +239,11 @@ public class JackrabbitContainer extends JackrabbitWrapper { repository = null; } + public void dispose() { + throw new IllegalArgumentException( + "Call destroy() method instead of dispose()"); + } + /* * UTILITIES */ diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/JcrAuthorizations.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/JcrAuthorizations.java index ddccf5719..eb9da5fea 100644 --- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/JcrAuthorizations.java +++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/JcrAuthorizations.java @@ -53,6 +53,8 @@ public class JcrAuthorizations implements Runnable { initAuthorizations(session); } catch (Exception e) { JcrUtils.discardQuietly(session); + throw new ArgeoException("Cannot set authorizations " + + principalPrivileges + " on repository " + repository, e); } finally { JcrUtils.logoutQuietly(session); } -- 2.30.2