X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernelUtils.java;h=8f736d0a391b7d7d1a7695a1123d285d3c4571b7;hb=18af628c072e386420f03261ab207a72341a0a1b;hp=9c480647dd76830f0764941525bac68de3df7fad;hpb=77a5498dd5d10d2442127022efd6501a7dbddbae;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 9c480647d..8f736d0a3 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
@@ -2,10 +2,8 @@ package org.argeo.cms.internal.kernel;
 
 import java.io.File;
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.PrivilegedAction;
@@ -15,7 +13,6 @@ import java.util.Hashtable;
 import java.util.Properties;
 import java.util.TreeSet;
 
-import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
@@ -26,7 +23,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.argeo.cms.CmsException;
-import org.argeo.cms.auth.AuthConstants;
 import org.argeo.node.NodeConstants;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -117,7 +113,7 @@ class KernelUtils implements KernelConstants {
 		Subject subject = new Subject();
 		LoginContext lc;
 		try {
-			lc = new LoginContext(AuthConstants.LOGIN_CONTEXT_ANONYMOUS, subject);
+			lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, subject);
 			lc.login();
 			return subject;
 		} catch (LoginException e) {
@@ -162,7 +158,7 @@ class KernelUtils implements KernelConstants {
 		Thread.currentThread().setContextClassLoader(KernelUtils.class.getClassLoader());
 		LoginContext loginContext;
 		try {
-			loginContext = new LoginContext(AuthConstants.LOGIN_CONTEXT_DATA_ADMIN);
+			loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN);
 			loginContext.login();
 		} catch (LoginException e1) {
 			throw new CmsException("Could not login as data admin", e1);
@@ -211,59 +207,7 @@ class KernelUtils implements KernelConstants {
 		}
 	}
 
-	// DATA
-	public static StringBuilder getServerBaseUrl(HttpServletRequest request) {
-		try {
-			URL url = new URL(request.getRequestURL().toString());
-			StringBuilder buf = new StringBuilder();
-			buf.append(url.getProtocol()).append("://").append(url.getHost());
-			if (url.getPort() != -1)
-				buf.append(':').append(url.getPort());
-			return buf;
-		} catch (MalformedURLException e) {
-			throw new CmsException("Cannot extract server base URL from " + request.getRequestURL(), e);
-		}
-	}
-
-	public static String getDataUrl(Node node, HttpServletRequest request) throws RepositoryException {
-		try {
-			StringBuilder buf = getServerBaseUrl(request);
-			buf.append(getDataPath(node));
-			return new URL(buf.toString()).toString();
-		} catch (MalformedURLException e) {
-			throw new CmsException("Cannot build data URL for " + node, e);
-		}
-	}
-
-	public static String getDataPath(Node node) throws RepositoryException {
-		assert node != null;
-		String userId = node.getSession().getUserID();
-//		if (log.isTraceEnabled())
-//			log.trace(userId + " : " + node.getPath());
-		StringBuilder buf = new StringBuilder();
-		boolean isAnonymous = userId.equalsIgnoreCase(AuthConstants.ROLE_ANONYMOUS);
-		if (isAnonymous)
-			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();
-	}
-
-	public static String getCanonicalUrl(Node node, HttpServletRequest request) throws RepositoryException {
-		try {
-			StringBuilder buf = getServerBaseUrl(request);
-			buf.append('/').append('!').append(node.getPath());
-			return new URL(buf.toString()).toString();
-		} catch (MalformedURLException e) {
-			throw new CmsException("Cannot build data URL for " + node, e);
-		}
-		// return request.getRequestURL().append('!').append(node.getPath())
-		// .toString();
-	}
 
-	
 	private KernelUtils() {
 
 	}