X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fsecurity%2FSecurityJcrUtils.java;fp=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fsecurity%2FSecurityJcrUtils.java;h=1ba42197e049ae4ea955f64f2847df913ca74e36;hb=2134dd19734711b05710c1250b665c32fbe7263c;hp=abf4347db4bc930ab24e2c53853415471d5b3c4c;hpb=2c4852dcd20d4cde88776c527ae935f242ae1e77;p=lgpl%2Fargeo-commons.git diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/SecurityJcrUtils.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/SecurityJcrUtils.java index abf4347db..1ba42197e 100644 --- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/SecurityJcrUtils.java +++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/security/SecurityJcrUtils.java @@ -7,10 +7,10 @@ import javax.jcr.version.VersionManager; import org.argeo.ArgeoException; import org.argeo.jcr.ArgeoJcrConstants; -import org.argeo.jcr.ArgeoJcrUtils; import org.argeo.jcr.ArgeoNames; import org.argeo.jcr.ArgeoTypes; import org.argeo.jcr.JcrUtils; +import org.argeo.jcr.UserJcrUtils; /** Utilities related to Argeo security model in JCR */ public class SecurityJcrUtils implements ArgeoJcrConstants { @@ -39,7 +39,7 @@ public class SecurityJcrUtils implements ArgeoJcrConstants { } private static String generateUserHomePath(String username) { - String homeBasePath = DEFAULT_HOME_BASE_PATH; + String homeBasePath = UserJcrUtils.DEFAULT_HOME_BASE_PATH; return homeBasePath + '/' + JcrUtils.firstCharsToPath(username, 2) + '/' + username; } @@ -105,7 +105,7 @@ public class SecurityJcrUtils implements ArgeoJcrConstants { */ public static Node getUserProfile(Session session, String username) { try { - Node userHome = ArgeoJcrUtils.getUserHome(session, username); + Node userHome = UserJcrUtils.getUserHome(session, username); if (userHome == null) return null; if (userHome.hasNode(ArgeoNames.ARGEO_PROFILE))