X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FDeployedContentRepository.java;h=7d3eb283bf2e2b54b698ecf6df33b63a64cf25cd;hb=eb4cc3db3bf141c229f0f7ff929daff108bee6d2;hp=6392fdaf3534fd5eab61df9f8a2270fa860cb73b;hpb=c615307d7b87bcb260d8a9f402c6e0a880862f38;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 6392fdaf3..7d3eb283b 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 @@ -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); - initRootContentProvider(rootXml); + Path rootXml = KernelUtils.getOsgiInstancePath(ROOT_XML); + initRootContentProvider(null); - 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 @@ -33,8 +30,8 @@ public class DeployedContentRepository extends CmsContentRepository { } public void addContentProvider(ContentProvider provider, Map 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 properties) {