Introduce CMS-specific user APIs, based at this stage on OSGi UserAdmin

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / acr / ContentUtils.java

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java b/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
index a6acb8a34bc9505e2c44badbbfe65b94941c2d5e..ed27ce8e8366a24c5fcd2ce0e285026c3ff1afa9 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
@@ -15,10 +15,10 @@ import org.argeo.api.acr.ContentRepository;
 import org.argeo.api.acr.ContentSession;
 import org.argeo.api.acr.DName;
 import org.argeo.api.cms.CmsAuth;
-import org.argeo.api.cms.directory.Directory;
+import org.argeo.api.cms.directory.CmsDirectory;
 import org.argeo.api.cms.directory.HierarchyUnit;
+import org.argeo.api.cms.directory.UserDirectory;
 import org.argeo.cms.CmsUserManager;
-import org.argeo.cms.osgi.useradmin.UserDirectory;
 import org.argeo.cms.util.CurrentSubject;
 import org.osgi.service.useradmin.Role;
 
@@ -135,7 +135,7 @@ public class ContentUtils {
        }
 
        public static Content hierarchyUnitToContent(ContentSession contentSession, HierarchyUnit hierarchyUnit) {
-               Directory directory = hierarchyUnit.getDirectory();
+               CmsDirectory directory = hierarchyUnit.getDirectory();
                StringJoiner relativePath = new StringJoiner(SLASH_STRING);
                buildHierarchyUnitPath(hierarchyUnit, relativePath);
                String path = directoryPath(directory) + relativePath.toString();
@@ -143,8 +143,8 @@ public class ContentUtils {
                return content;
        }
 
-       /** The path to this {@link Directory}. Ends with a /. */
-       private static String directoryPath(Directory directory) {
+       /** The path to this {@link CmsDirectory}. Ends with a /. */
+       private static String directoryPath(CmsDirectory directory) {
                return CmsContentRepository.DIRECTORY_BASE + SLASH + directory.getName() + SLASH;
        }