X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FDeployedContentRepository.java;h=4fee406886e23d4186a8cfaafcfeb97a7ef607e6;hb=8acca40eb96fef7df712f0cbf5e5ffc13d48fcbd;hp=af42418421ac3e6d080b350f1d50b31b8712316e;hpb=9174f78c93c94b9c148dff66c38204baf55bc8f2;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 af4241842..4fee40688 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,27 @@
 package org.argeo.cms.internal.runtime;
 
+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.cms.acr.CmsContentRepository;
-import org.argeo.util.LangUtils;
+import org.argeo.cms.acr.fs.FsContentProvider;
 
 public class DeployedContentRepository extends CmsContentRepository {
-//	private final static String ROOT_XML = "cr:root.xml";
-	private final static String ACR_MOUNT_PATH = "acr.mount.path";
-
+	private final static String ROOT_XML = "cr:root.xml";
 	private CmsState cmsState;
 
 	@Override
 	public void start() {
 		super.start();
-//		Path rootXml = KernelUtils.getOsgiInstancePath(ROOT_XML);
-		initRootContentProvider(null);
+		Path rootXml = KernelUtils.getOsgiInstancePath(ROOT_XML);
+		initRootContentProvider(rootXml);
 
-//		Path srvPath = KernelUtils.getOsgiInstancePath(CmsConstants.SRV_WORKSPACE);
-//		FsContentProvider srvContentProvider = new FsContentProvider(srvPath, false);
-//		addProvider("/" + CmsConstants.SRV_WORKSPACE, srvContentProvider);
+		Path srvPath = KernelUtils.getOsgiInstancePath(CmsConstants.SRV_WORKSPACE);
+		FsContentProvider srvContentProvider = new FsContentProvider("/" + CmsConstants.SRV_WORKSPACE, srvPath, false);
+		addProvider(srvContentProvider);
 	}
 
 	@Override
@@ -30,8 +30,8 @@ public class DeployedContentRepository extends CmsContentRepository {
 	}
 
 	public void addContentProvider(ContentProvider provider, Map<String, Object> properties) {
-		String base = LangUtils.get(properties, ACR_MOUNT_PATH);
-		addProvider(base, provider);
+//		String base = LangUtils.get(properties, CmsContentRepository.ACR_MOUNT_PATH_PROPERTY);
+		addProvider(provider);
 	}
 
 	public void removeContentProvider(ContentProvider provider, Map<String, Object> properties) {