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=8358105e2982db480f79369db507b14f471b0d90;hpb=f3ea14abccc33b1c3326417a87c91145be776c72;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 8358105e2..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
@@ -5,13 +5,14 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 
 import org.argeo.api.cms.CmsLog;
-import org.argeo.cms.CmsUserManager;
+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 final static String ROOT_XML = OS.LOCAL.isMSWindows() ? "cr%3Aroot.xml" : "cr:root.xml";
 
 	private final static CmsLog log = CmsLog.getLog(DeployedContentRepository.class);
 
@@ -22,7 +23,8 @@ public class DeployedContentRepository extends CmsContentRepository {
 		long begin = System.currentTimeMillis();
 		try {
 			super.start();
-			Path rootXml = KernelUtils.getOsgiInstancePath(ROOT_XML);
+			// FIXME does not work on Windows
+			// Path rootXml = KernelUtils.getOsgiInstancePath(ROOT_XML);
 			initRootContentProvider(null);
 
 //		Path srvPath = KernelUtils.getOsgiInstancePath(CmsConstants.SRV_WORKSPACE);
@@ -38,8 +40,8 @@ public class DeployedContentRepository extends CmsContentRepository {
 			}
 
 			// users
-			DirectoryContentProvider directoryContentProvider = new DirectoryContentProvider(
-					CmsContentRepository.DIRECTORY_BASE, userManager);
+			DirectoryContentProvider directoryContentProvider = new DirectoryContentProvider(userManager,
+					CmsContentRepository.DIRECTORY_BASE);
 			addProvider(directoryContentProvider);
 
 			// remote