X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FSuiteApp.java;h=d766a9a6a91a0a3a55de2601686619d9cabdbcc9;hp=e499463781ac7a59795839abb2a929e49c8f1286;hb=e270c1663064798564cd1f02bafba624f7ed8151;hpb=b6325f667ddd8cee26df68c2af8f899c09e92089 diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java index e499463..d766a9a 100644 --- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java +++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java @@ -22,11 +22,11 @@ import javax.naming.ldap.LdapName; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.api.NodeUtils; import org.argeo.cms.CmsUserManager; import org.argeo.cms.LocaleUtils; import org.argeo.cms.Localized; import org.argeo.cms.auth.CmsSession; +import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.cms.ui.AbstractCmsApp; import org.argeo.cms.ui.CmsTheme; import org.argeo.cms.ui.CmsUiProvider; @@ -203,7 +203,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { } else { Session adminSession = null; try { - adminSession = NodeUtils.openDataAdminSession(getRepository(), null); + adminSession = CmsJcrUtils.openDataAdminSession(getRepository(), null); Node userDir = SuiteUtils.getOrCreateCmsSessionNode(adminSession, cmsSession); ui.initSessions(getRepository(), userDir.getPath()); } finally { @@ -303,7 +303,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { // if (context.getPath().equals("/")) {// root node // types.add("nt:folder"); // } - if (NodeUtils.isUserHome(context) && byType.containsKey("nt:folder")) {// home node + if (CmsJcrUtils.isUserHome(context) && byType.containsKey("nt:folder")) {// home node types.add("nt:folder"); } @@ -520,7 +520,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { else { Session adminSession = null; try { - adminSession = NodeUtils.openDataAdminSession(getRepository(), workspaceName); + adminSession = CmsJcrUtils.openDataAdminSession(getRepository(), workspaceName); SuiteUtils.getOrCreateUserNode(adminSession, userDn); } finally { Jcr.logout(adminSession);