X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fdirectory%2FDirectoryContent.java;h=50eea156d52442e6e406341d5aeaf105783c7d14;hb=feddb4be70a8304dd4a533efee6e14c22691b500;hp=b0c1b6bd18ba66bca3d8887a5dc390411897c51b;hpb=99bca5f6b71c24837c23cf2a9bb944e09dca3dea;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContent.java b/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContent.java
index b0c1b6bd1..50eea156d 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContent.java
@@ -1,6 +1,7 @@
 package org.argeo.cms.acr.directory;
 
 import java.util.ArrayList;
+import java.util.Dictionary;
 import java.util.Iterator;
 import java.util.List;
 
@@ -8,31 +9,27 @@ import javax.xml.namespace.QName;
 
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentName;
-import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedSession;
-import org.argeo.cms.acr.AbstractContent;
-import org.argeo.osgi.useradmin.HierarchyUnit;
-import org.argeo.osgi.useradmin.UserDirectory;
+import org.argeo.api.cms.directory.CmsDirectory;
+import org.argeo.api.cms.directory.HierarchyUnit;
 
-class DirectoryContent extends AbstractContent {
-	private UserDirectory directory;
-	private DirectoryContentProvider provider;
+class DirectoryContent extends AbstractDirectoryContent {
+	private CmsDirectory directory;
 
-	public DirectoryContent(ProvidedSession session, DirectoryContentProvider provider, UserDirectory directory) {
-		super(session);
-		this.provider = provider;
+	public DirectoryContent(ProvidedSession session, DirectoryContentProvider provider, CmsDirectory directory) {
+		super(session, provider);
 		this.directory = directory;
 	}
 
 	@Override
-	public ContentProvider getProvider() {
-		return provider;
+	Dictionary<String, Object> doGetProperties() {
+		return directory.getProperties();
 	}
 
 	@Override
 	public Iterator<Content> iterator() {
 		List<Content> res = new ArrayList<>();
-		for (Iterator<HierarchyUnit> it = directory.getRootHierarchyUnits().iterator(); it.hasNext();) {
+		for (Iterator<HierarchyUnit> it = directory.getDirectHierarchyUnits(false).iterator(); it.hasNext();) {
 			res.add(new HierarchyUnitContent(getSession(), provider, it.next()));
 		}
 		return res.iterator();