Adapt to MS Windows

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / runtime / DeployedContentRepository.java

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 aa7d8f884dbc0584098bd346319c6ee45f3b5436..bb1f6112a927616caec811bb98d61321fc7319ea 100644 (file)
--- 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);
@@ -31,19 +33,26 @@ public class DeployedContentRepository extends CmsContentRepository {
 
                        // run dir
                        Path runDirPath = KernelUtils.getOsgiInstancePath(CmsContentRepository.RUN_BASE);
-                       Files.createDirectories(runDirPath);
-                       FsContentProvider runContentProvider = new FsContentProvider(CmsContentRepository.RUN_BASE, runDirPath);
-                       addProvider(runContentProvider);
+                       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)");
+               long duration = System.currentTimeMillis() - begin;
+               log.debug(() -> "CMS content repository available (initialisation took " + duration + " ms)");
        }
 
        @Override
@@ -51,14 +60,6 @@ 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;
        }