X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FDeployedContentRepository.java;h=c467bcef41d21d64d55220910bb95adaa4f0b5ab;hb=ddfa9d4306fbd4fb680cf5d969fdfc32868d60f5;hp=7d3eb283bf2e2b54b698ecf6df33b63a64cf25cd;hpb=4d2d8d8003f6b2afb2f207a1aa7bb205929559aa;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 7d3eb283b..c467bcef4 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
@@ -1,27 +1,58 @@
 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.CmsConstants;
-import org.argeo.api.cms.CmsState;
+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.cms.util.OS;
 
 public class DeployedContentRepository extends CmsContentRepository {
-	private final static String ROOT_XML = "cr:root.xml";
-	private CmsState cmsState;
+	private final static String ROOT_XML = OS.LOCAL.isMSWindows() ? "cr%3Aroot.xml" : "cr:root.xml";
+
+	private final static CmsLog log = CmsLog.getLog(DeployedContentRepository.class);
+
+	private CmsUserManager userManager;
 
 	@Override
 	public void start() {
-		super.start();
-		Path rootXml = KernelUtils.getOsgiInstancePath(ROOT_XML);
-		initRootContentProvider(null);
+		long begin = System.currentTimeMillis();
+		try {
+			super.start();
+			// FIXME does not work on Windows
+			// Path rootXml = KernelUtils.getOsgiInstancePath(ROOT_XML);
+			initRootContentProvider(null);
 
 //		Path srvPath = KernelUtils.getOsgiInstancePath(CmsConstants.SRV_WORKSPACE);
 //		FsContentProvider srvContentProvider = new FsContentProvider("/" + CmsConstants.SRV_WORKSPACE, srvPath, false);
 //		addProvider(srvContentProvider);
+
+			// 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(userManager,
+					CmsContentRepository.DIRECTORY_BASE);
+			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
@@ -29,16 +60,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 setCmsState(CmsState cmsState) {
-		this.cmsState = cmsState;
+	public void setUserManager(CmsUserManager userManager) {
+		this.userManager = userManager;
 	}
 
 }