X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FContentUtils.java;fp=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FContentUtils.java;h=b3f81454734be5e1d2e86cc1805c8d272fdad86c;hp=f01a3b017569e78dc7796748b1deb70d12195790;hb=654cb2ca43dd4513a4d6a5bbe81762eaf6675496;hpb=a00a744d8ada0bbbeadc2b99fa56033856506e68 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 f01a3b017..b3f814547 100644 --- a/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java @@ -22,11 +22,11 @@ import org.argeo.api.cms.CmsAuth; import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsSession; import org.argeo.api.cms.directory.CmsDirectory; +import org.argeo.api.cms.directory.CmsRole; 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.util.CurrentSubject; -import org.osgi.service.useradmin.Role; /** Utilities and routines around {@link Content}. */ public class ContentUtils { @@ -147,7 +147,7 @@ public class ContentUtils { * DIRECTORY */ - public static Content roleToContent(CmsUserManager userManager, ContentSession contentSession, Role role) { + public static Content roleToContent(CmsUserManager userManager, ContentSession contentSession, CmsRole role) { UserDirectory userDirectory = userManager.getDirectory(role); String path = directoryPath(userDirectory) + userDirectory.getRolePath(role); Content content = contentSession.get(path);