X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.jcr%2Fsrc%2Forg%2Fargeo%2Fapp%2Fjcr%2FSuiteJcrUtils.java;h=82589f2efeb2a9ae85cec3007d94eb67ad6a3ee5;hb=616a062e9d061ce91589556624ed622298a21ac7;hp=49b7edef71b2678bdece78d9a1ee1fecbd9d1ab0;hpb=d6c9d33b61e475914d3f8d7534374ed30eca8150;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.jcr/src/org/argeo/app/jcr/SuiteJcrUtils.java b/org.argeo.app.jcr/src/org/argeo/app/jcr/SuiteJcrUtils.java
index 49b7ede..82589f2 100644
--- a/org.argeo.app.jcr/src/org/argeo/app/jcr/SuiteJcrUtils.java
+++ b/org.argeo.app.jcr/src/org/argeo/app/jcr/SuiteJcrUtils.java
@@ -13,12 +13,12 @@ import javax.jcr.security.Privilege;
 import javax.security.auth.x500.X500Principal;
 
 import org.argeo.api.acr.ldap.LdapAttr;
+import org.argeo.api.app.AppUserState;
+import org.argeo.api.app.EntityType;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsSession;
-import org.argeo.app.api.AppUserState;
-import org.argeo.app.api.EntityType;
+import org.argeo.api.cms.auth.RoleNameUtils;
 import org.argeo.app.core.SuiteUtils;
-import org.argeo.cms.RoleNameUtils;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
 
@@ -77,8 +77,8 @@ public class SuiteJcrUtils {
 	@Deprecated
 	public static Node getCmsSessionNode(Session session, CmsSession cmsSession) {
 		try {
-			return session.getNode(SuiteUtils.getUserNodePath(cmsSession.getUserDn()) + '/' + USER_SESSIONS_NODE_NAME + '/'
-					+ cmsSession.getUuid().toString());
+			return session.getNode(SuiteUtils.getUserNodePath(cmsSession.getUserDn()) + '/' + USER_SESSIONS_NODE_NAME
+					+ '/' + cmsSession.uuid().toString());
 		} catch (RepositoryException e) {
 			throw new JcrException("Cannot get session dir for " + cmsSession, e);
 		}
@@ -91,7 +91,7 @@ public class SuiteJcrUtils {
 			String userDn = cmsSession.getUserDn();
 			Node userNode = getOrCreateUserNode(adminSession, userDn);
 			Node sessionsNode = userNode.getNode(USER_SESSIONS_NODE_NAME);
-			String cmsSessionUuid = cmsSession.getUuid().toString();
+			String cmsSessionUuid = cmsSession.uuid().toString();
 			Node cmsSessionNode;
 			if (!sessionsNode.hasNode(cmsSessionUuid)) {
 				cmsSessionNode = sessionsNode.addNode(cmsSessionUuid, NodeType.NT_UNSTRUCTURED);