X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernelUtils.java;h=909b1faff1722dc284e7a34d682ef2e4e6834f86;hb=0243aa5633af84d8608ba912483dbaaaefac42f1;hp=8d3044013fd1bcb85d2f3703106ee3509b2dbb1d;hpb=fd8f2c91e47d38445ba9702b40559939162f666d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java
index 8d3044013..909b1faff 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelUtils.java
@@ -245,9 +245,17 @@ class KernelUtils implements KernelConstants {
 			buf.append(WEBDAV_PUBLIC);
 		else
 			buf.append(WEBDAV_PRIVATE);
-		// TODO convey repo alias vie repository properties
-		return buf.append('/').append(NodeConstants.ALIAS_NODE).append('/').append(node.getSession().getWorkspace().getName())
-				.append(node.getPath()).toString();
+		Session session = node.getSession();
+		Repository repository = session.getRepository();
+		String cn;
+		if (repository.isSingleValueDescriptor(NodeConstants.CN)) {
+			cn = repository.getDescriptor(NodeConstants.CN);
+		} else {
+//			log.warn("No cn defined in repository, using " + NodeConstants.NODE);
+			cn = NodeConstants.NODE;
+		}
+		return buf.append('/').append(cn).append('/').append(session.getWorkspace().getName()).append(node.getPath())
+				.toString();
 	}
 
 	public static String getCanonicalUrl(Node node, HttpServletRequest request) throws RepositoryException {