X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernelUtils.java;h=5d49797911125d0c755655f4bb4919a49745ed04;hb=9b91329a1c5d7e6b5fc4fae3c21d6019318acc8e;hp=909b1faff1722dc284e7a34d682ef2e4e6834f86;hpb=0243aa5633af84d8608ba912483dbaaaefac42f1;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 909b1faff..5d4979791 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,27 +2,24 @@ package org.argeo.cms.internal.kernel;
 
 import java.io.File;
 import java.io.IOException;
-import java.net.MalformedURLException;
+import java.io.PrintStream;
 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;
 import java.util.Dictionary;
-import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Properties;
+import java.util.TreeMap;
 import java.util.TreeSet;
 
-import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
-import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.argeo.cms.CmsException;
@@ -112,29 +109,17 @@ class KernelUtils implements KernelConstants {
 	}
 
 	// Security
-	static Subject anonymousLogin() {
-		Subject subject = new Subject();
-		LoginContext lc;
-		try {
-			lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_ANONYMOUS, subject);
-			lc.login();
-			return subject;
-		} catch (LoginException e) {
-			throw new CmsException("Cannot login as anonymous", e);
-		}
-	}
-
-	// HTTP
-	static void logRequestHeaders(Log log, HttpServletRequest request) {
-		if (!log.isDebugEnabled())
-			return;
-		for (Enumeration<String> headerNames = request.getHeaderNames(); headerNames.hasMoreElements();) {
-			String headerName = headerNames.nextElement();
-			Object headerValue = request.getHeader(headerName);
-			log.debug(headerName + ": " + headerValue);
-		}
-		log.debug(request.getRequestURI() + "\n");
-	}
+//	static Subject anonymousLogin() {
+//		Subject subject = new Subject();
+//		LoginContext lc;
+//		try {
+//			lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, subject);
+//			lc.login();
+//			return subject;
+//		} catch (LoginException e) {
+//			throw new CmsException("Cannot login as anonymous", e);
+//		}
+//	}
 
 	static void logFrameworkProperties(Log log) {
 		BundleContext bc = getBundleContext();
@@ -152,6 +137,14 @@ class KernelUtils implements KernelConstants {
 		// log.debug(key + "=" + bc.getProperty(key));
 	}
 
+	static void printSystemProperties(PrintStream out) {
+		TreeMap<String, String> display = new TreeMap<>();
+		for (Object key : System.getProperties().keySet())
+			display.put(key.toString(), System.getProperty(key.toString()));
+		for (String key : display.keySet())
+			out.println(key + "=" + display.get(key));
+	}
+
 	static Session openAdminSession(Repository repository) {
 		return openAdminSession(repository, null);
 	}
@@ -210,67 +203,6 @@ 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(NodeConstants.ROLE_ANONYMOUS);
-		if (isAnonymous)
-			buf.append(WEBDAV_PUBLIC);
-		else
-			buf.append(WEBDAV_PRIVATE);
-		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 {
-		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() {
 
 	}