X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FDeployedContentRepository.java;h=0fd0a63edb4cb47acce19bbb38f4fc07b4edd672;hb=de8f04a41db19968896b15cd7f43c819a28e7158;hp=cff9bc5148a3464678dc98ae310f93d035332724;hpb=da9d144b6b241e1526a3bd255dff905a7969a5bc;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/DeployedContentRepository.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/DeployedContentRepository.java
index cff9bc514..0fd0a63ed 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/DeployedContentRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/DeployedContentRepository.java
@@ -3,18 +3,23 @@ package org.argeo.cms.internal.runtime;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Map;
 
-import org.argeo.api.acr.spi.ContentProvider;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.api.cms.directory.CmsUserManager;
 import org.argeo.cms.acr.CmsContentRepository;
+import org.argeo.cms.acr.directory.DirectoryContentProvider;
 import org.argeo.cms.acr.fs.FsContentProvider;
-import org.argeo.util.OS;
 
 public class DeployedContentRepository extends CmsContentRepository {
 	private final static String ROOT_XML = "cr:root.xml";
 
+	private final static CmsLog log = CmsLog.getLog(DeployedContentRepository.class);
+
+	private CmsUserManager userManager;
+
 	@Override
 	public void start() {
+		long begin = System.currentTimeMillis();
 		try {
 			super.start();
 			Path rootXml = KernelUtils.getOsgiInstancePath(ROOT_XML);
@@ -24,13 +29,28 @@ public class DeployedContentRepository extends CmsContentRepository {
 //		FsContentProvider srvContentProvider = new FsContentProvider("/" + CmsConstants.SRV_WORKSPACE, srvPath, false);
 //		addProvider(srvContentProvider);
 
-			Path runDirPath =  KernelUtils.getOsgiInstancePath(CmsContentRepository.RUN_BASE);
-			Files.createDirectories(runDirPath);
-			FsContentProvider runContentProvider = new FsContentProvider(CmsContentRepository.RUN_BASE, runDirPath);
-			addProvider(runContentProvider);
+			// run dir
+			Path runDirPath = KernelUtils.getOsgiInstancePath(CmsContentRepository.RUN_BASE);
+			if (runDirPath != null) {
+				Files.createDirectories(runDirPath);
+				FsContentProvider runContentProvider = new FsContentProvider(CmsContentRepository.RUN_BASE, runDirPath);
+				addProvider(runContentProvider);
+			}
+
+			// users
+			DirectoryContentProvider directoryContentProvider = new DirectoryContentProvider(
+					CmsContentRepository.DIRECTORY_BASE, userManager);
+			addProvider(directoryContentProvider);
+
+			// remote
+//			DavContentProvider davContentProvider = new DavContentProvider("/srv",
+//					URI.create("http://localhost/unstable/a2/"));
+//			addProvider(davContentProvider);
 		} catch (IOException e) {
 			throw new IllegalStateException("Cannot start content repository", e);
 		}
+		long duration = System.currentTimeMillis() - begin;
+		log.debug(() -> "CMS content repository available (initialisation took " + duration + " ms)");
 	}
 
 	@Override
@@ -38,12 +58,8 @@ public class DeployedContentRepository extends CmsContentRepository {
 		super.stop();
 	}
 
-	public void addContentProvider(ContentProvider provider, Map<String, Object> properties) {
-//		String base = LangUtils.get(properties, CmsContentRepository.ACR_MOUNT_PATH_PROPERTY);
-		addProvider(provider);
-	}
-
-	public void removeContentProvider(ContentProvider provider, Map<String, Object> properties) {
+	public void setUserManager(CmsUserManager userManager) {
+		this.userManager = userManager;
 	}
 
 }