From e270c1663064798564cd1f02bafba624f7ed8151 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 7 Dec 2021 10:36:43 +0100 Subject: [PATCH] Adapt to changes in Argeo Commons --- .../src/org/argeo/entity/core/JcrEntityDefinition.java | 4 ++-- .../src/org/argeo/library/ui/DocumentsTreeUiProvider.java | 4 ++-- .../src/org/argeo/suite/core/SuiteTermsManager.java | 4 ++-- org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java | 8 ++++---- .../argeo/support/odk/servlet/OdkSubmissionServlet.java | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/org.argeo.entity.core/src/org/argeo/entity/core/JcrEntityDefinition.java b/org.argeo.entity.core/src/org/argeo/entity/core/JcrEntityDefinition.java index 6eb086d..d6d1246 100644 --- a/org.argeo.entity.core/src/org/argeo/entity/core/JcrEntityDefinition.java +++ b/org.argeo.entity.core/src/org/argeo/entity/core/JcrEntityDefinition.java @@ -7,7 +7,7 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.argeo.api.NodeUtils; +import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.entity.EntityConstants; import org.argeo.entity.EntityDefinition; import org.argeo.jcr.Jcr; @@ -21,7 +21,7 @@ public class JcrEntityDefinition implements EntityDefinition { private String defaultEditorId; public void init(BundleContext bundleContext, Map properties) throws RepositoryException { - Session adminSession = NodeUtils.openDataAdminSession(repository, null); + Session adminSession = CmsJcrUtils.openDataAdminSession(repository, null); try { type = properties.get(EntityConstants.TYPE); if (type == null) diff --git a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java b/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java index 4660515..f540732 100644 --- a/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java +++ b/org.argeo.library.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java @@ -9,8 +9,8 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import org.argeo.api.NodeConstants; -import org.argeo.api.NodeUtils; import org.argeo.cms.fs.CmsFsUtils; +import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.cms.ui.CmsUiProvider; import org.argeo.cms.ui.CmsView; import org.argeo.cms.ui.util.CmsUiUtils; @@ -34,7 +34,7 @@ public class DocumentsTreeUiProvider implements CmsUiProvider { FsTreeViewer fsTreeViewer = new FsTreeViewer(parent, SWT.NONE); fsTreeViewer.configureDefaultSingleColumnTable(500); CmsView cmsView = CmsView.getCmsView(parent); - Node homeNode = NodeUtils.getUserHome(cmsView.doAs(() -> Jcr.login(repository, NodeConstants.HOME_WORKSPACE))); + Node homeNode = CmsJcrUtils.getUserHome(cmsView.doAs(() -> Jcr.login(repository, NodeConstants.HOME_WORKSPACE))); parent.addDisposeListener((e1) -> Jcr.logout(homeNode)); Path homePath = CmsFsUtils.getPath(nodeFileSystemProvider, homeNode); fsTreeViewer.addSelectionChangedListener((e) -> { diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/SuiteTermsManager.java b/org.argeo.suite.core/src/org/argeo/suite/core/SuiteTermsManager.java index f8822f7..ad4de57 100644 --- a/org.argeo.suite.core/src/org/argeo/suite/core/SuiteTermsManager.java +++ b/org.argeo.suite.core/src/org/argeo/suite/core/SuiteTermsManager.java @@ -11,7 +11,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import org.argeo.api.NodeConstants; -import org.argeo.api.NodeUtils; +import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.entity.EntityNames; import org.argeo.entity.EntityType; import org.argeo.entity.Term; @@ -29,7 +29,7 @@ public class SuiteTermsManager implements TermsManager { private Session adminSession; public void init() { - adminSession = NodeUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE); + adminSession = CmsJcrUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE); } @Override 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); diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java index 70a80c0..4e56367 100644 --- a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java +++ b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java @@ -23,8 +23,8 @@ import javax.servlet.http.Part; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.api.NodeUtils; import org.argeo.cms.auth.CmsSession; +import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.cms.servlet.ServletAuthUtils; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrUtils; @@ -65,7 +65,7 @@ public class OdkSubmissionServlet extends HttpServlet { Session adminSession = null; try { // TODO centralise at a deeper level - adminSession = NodeUtils.openDataAdminSession(repository, null); + adminSession = CmsJcrUtils.openDataAdminSession(repository, null); SuiteUtils.getOrCreateCmsSessionNode(adminSession, cmsSession); } finally { Jcr.logout(adminSession); -- 2.30.2