Merge tag 'v2.3.28' into testing

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

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContentProvider.java b/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContentProvider.java
index ab84aef37131b4a780fb92644f9ed4a96754161f..fc48dace5ca6ffd850fbf2ae3f40c7b372c35185 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContentProvider.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContentProvider.java
@@ -10,12 +10,12 @@ import org.argeo.api.acr.ContentNotFoundException;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedSession;
+import org.argeo.api.cms.directory.CmsUser;
 import org.argeo.api.cms.directory.CmsUserManager;
 import org.argeo.api.cms.directory.HierarchyUnit;
 import org.argeo.api.cms.directory.UserDirectory;
 import org.argeo.cms.acr.AbstractSimpleContentProvider;
 import org.argeo.cms.acr.ContentUtils;
-import org.osgi.service.useradmin.User;
 
 /** A {@link ContentProvider} based on a {@link CmsUserManager} service. */
 public class DirectoryContentProvider extends AbstractSimpleContentProvider<CmsUserManager> {
@@ -62,7 +62,7 @@ public class DirectoryContentProvider extends AbstractSimpleContentProvider<CmsU
 //                     } catch (InvalidNameException e) {
 //                             throw new IllegalStateException("Cannot interpret " + segments + " as DN", e);
 //                     }
-                       User user = (User) userDirectory.getRoleByPath(pathWithinUserDirectory);
+                       CmsUser user = (CmsUser) userDirectory.getRoleByPath(pathWithinUserDirectory);
                        if (user != null) {
                                HierarchyUnit parent = userDirectory.getHierarchyUnit(user);
                                return new RoleContent(session, this, new HierarchyUnitContent(session, this, parent), user);