X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FCmsContentSession.java;h=17a03fdc501bf9d138998f597c4e1663f0c330f5;hb=a4e2def61f587de89a03037aec2b95c54732ec55;hp=757dad143a7ec3fe59a39d26b7e83b5b9076bf09;hpb=b897c27d370ad4772b5ae4b2c22cc505ef5d1a3f;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java index 757dad143..17a03fdc5 100644 --- a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java +++ b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java @@ -12,7 +12,7 @@ import javax.security.auth.Subject; import org.argeo.api.acr.Content; import org.argeo.api.acr.ContentSession; -import org.argeo.api.acr.CrName; +import org.argeo.api.acr.DName; import org.argeo.api.acr.spi.ContentProvider; import org.argeo.api.acr.spi.ProvidedContent; import org.argeo.api.acr.spi.ProvidedRepository; @@ -72,6 +72,8 @@ class CmsContentSession implements ProvidedSession { @Override public boolean exists(String path) { + if (!path.startsWith(ContentUtils.ROOT_SLASH)) + throw new IllegalArgumentException(path + " is not an absolute path"); ContentProvider contentProvider = contentRepository.getMountManager().findContentProvider(path); String mountPath = contentProvider.getMountPath(); String relativePath = extractRelativePath(mountPath, path); @@ -116,23 +118,8 @@ class CmsContentSession implements ProvidedSession { } /* - * NAMESPACE CONTEXT + * EDITION */ - -// @Override -// public String getNamespaceURI(String prefix) { -// return RuntimeNamespaceContext.getNamespaceContext().getNamespaceURI(prefix); -//// return NamespaceUtils.getNamespaceURI((p) -> contentRepository.getTypesManager().getPrefixes().get(p), prefix); -// } -// -// @Override -// public Iterator getPrefixes(String namespaceURI) { -// return RuntimeNamespaceContext.getNamespaceContext().getPrefixes(namespaceURI); -//// return NamespaceUtils.getPrefixes((ns) -> contentRepository.getTypesManager().getPrefixes().entrySet().stream() -//// .filter(e -> e.getValue().equals(ns)).map(Map.Entry::getKey).collect(Collectors.toUnmodifiableSet()), -//// namespaceURI); -// } - @Override public CompletionStage edit(Consumer work) { edition = CompletableFuture.supplyAsync(() -> { @@ -169,7 +156,7 @@ class CmsContentSession implements ProvidedSession { return uuid; } - @Override +// @Override public Content getSessionRunDir() { if (sessionRunDir == null) { String runDirPath = CmsContentRepository.RUN_BASE + '/' + uuid.toString(); @@ -178,30 +165,9 @@ class CmsContentSession implements ProvidedSession { else { Content runDir = get(CmsContentRepository.RUN_BASE); // TODO deal with no run dir available? - sessionRunDir = runDir.add(uuid.toString(), CrName.collection.qName()); + sessionRunDir = runDir.add(uuid.toString(), DName.collection.qName()); } } return sessionRunDir; } - -// @Override -// public String findNamespace(String prefix) { -// return prefixes.get(prefix); -// } -// -// @Override -// public Set findPrefixes(String namespaceURI) { -// Set res = prefixes.entrySet().stream().filter(e -> e.getValue().equals(namespaceURI)) -// .map(Map.Entry::getKey).collect(Collectors.toUnmodifiableSet()); -// -// return res; -// } -// -// @Override -// public String findPrefix(String namespaceURI) { -// if (CrName.CR_NAMESPACE_URI.equals(namespaceURI) && prefixes.containsKey(CrName.CR_DEFAULT_PREFIX)) -// return CrName.CR_DEFAULT_PREFIX; -// return ProvidedSession.super.findPrefix(namespaceURI); -// } - } \ No newline at end of file