Clean up and refactor ACR and component register.

[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 6392fdaf3534fd5eab61df9f8a2270fa860cb73b..4fee406886e23d4186a8cfaafcfeb97a7ef607e6 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
@@ -8,23 +8,20 @@ import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsState;
 import org.argeo.cms.acr.CmsContentRepository;
 import org.argeo.cms.acr.fs.FsContentProvider;
-import org.argeo.util.LangUtils;
 
 public class DeployedContentRepository extends CmsContentRepository {
-       private final static String ROOT_XML = "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(KernelConstants.DIR_NODE).resolve(ROOT_XML);
+               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);
+               FsContentProvider srvContentProvider = new FsContentProvider("/" + CmsConstants.SRV_WORKSPACE, srvPath, false);
+               addProvider(srvContentProvider);
        }
 
        @Override
@@ -33,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) {