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=cc1dd97ebcc32e1bd754073ad23def182f460452;hp=1afd95cd403bed5dbf4b9b34135c82caf29e15a9;hpb=2ff5b17e0065bf0b8d9eca41d7029f4969f44aac;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 1afd95cd4..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 @@ -4,14 +4,13 @@ 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 CmsState cmsState; @Override @@ -20,9 +19,9 @@ public class DeployedContentRepository extends CmsContentRepository { 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 @@ -31,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) {