X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeHttp.java;h=3174285dbfdf93658a53014f744d66407449e302;hb=2afabd9e7b225f80b341063e25188314394c9aef;hp=92f804d252d1ae970f2d8f35a9b4fbf7ceffcc72;hpb=088c1b517a543e935d8ab65c3b2fd2d0269b551d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
index 92f804d25..3174285db 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
@@ -44,7 +44,8 @@ public class NodeHttp implements KernelConstants {
 	private ServiceTracker<Repository, Repository> repositories;
 	private final ServiceTracker<HttpService, HttpService> httpServiceTracker;
 
-	private static String httpRealm = "Argeo";
+	private String httpRealm = "Argeo";
+	private String webDavConfig = HttpUtils.WEBDAV_CONFIG;
 	private final boolean cleanState;
 
 	public NodeHttp(boolean cleanState) {
@@ -59,16 +60,16 @@ public class NodeHttp implements KernelConstants {
 			repositories.close();
 	}
 
-	public static void registerRepositoryServlets(HttpService httpService, String alias, Repository repository) {
+	public void registerRepositoryServlets(HttpService httpService, String alias, Repository repository) {
 		if (httpService == null)
 			throw new CmsException("No HTTP service available");
 		try {
 			registerWebdavServlet(httpService, alias, repository);
 			registerRemotingServlet(httpService, alias, repository);
-			if (NodeConstants.HOME.equals(alias))
+			if (NodeConstants.EGO.equals(alias))
 				registerFilesServlet(httpService, alias, repository);
-			if (log.isDebugEnabled())
-				log.debug("Registered servlets for repository '" + alias + "'");
+			if (log.isTraceEnabled())
+				log.trace("Registered servlets for repository '" + alias + "'");
 		} catch (Exception e) {
 			throw new CmsException("Could not register servlets for repository '" + alias + "'", e);
 		}
@@ -80,38 +81,38 @@ public class NodeHttp implements KernelConstants {
 		try {
 			httpService.unregister(webdavPath(alias));
 			httpService.unregister(remotingPath(alias));
-			if (NodeConstants.HOME.equals(alias))
+			if (NodeConstants.EGO.equals(alias))
 				httpService.unregister(filesPath(alias));
-			if (log.isDebugEnabled())
-				log.debug("Unregistered servlets for repository '" + alias + "'");
+			if (log.isTraceEnabled())
+				log.trace("Unregistered servlets for repository '" + alias + "'");
 		} catch (Exception e) {
 			log.error("Could not unregister servlets for repository '" + alias + "'", e);
 		}
 	}
 
-	static void registerWebdavServlet(HttpService httpService, String alias, Repository repository)
+	void registerWebdavServlet(HttpService httpService, String alias, Repository repository)
 			throws NamespaceException, ServletException {
 		// WebdavServlet webdavServlet = new WebdavServlet(repository, new
 		// OpenInViewSessionProvider(alias));
 		WebdavServlet webdavServlet = new WebdavServlet(repository, new CmsSessionProvider(alias));
 		String path = webdavPath(alias);
 		Properties ip = new Properties();
-		ip.setProperty(WebdavServlet.INIT_PARAM_RESOURCE_CONFIG, HttpUtils.WEBDAV_CONFIG);
+		ip.setProperty(WebdavServlet.INIT_PARAM_RESOURCE_CONFIG, webDavConfig);
 		ip.setProperty(WebdavServlet.INIT_PARAM_RESOURCE_PATH_PREFIX, path);
 		httpService.registerServlet(path, webdavServlet, ip, new DataHttpContext(httpRealm));
 	}
 
-	static void registerFilesServlet(HttpService httpService, String alias, Repository repository)
+	void registerFilesServlet(HttpService httpService, String alias, Repository repository)
 			throws NamespaceException, ServletException {
 		WebdavServlet filesServlet = new WebdavServlet(repository, new CmsSessionProvider(alias));
 		String path = filesPath(alias);
 		Properties ip = new Properties();
-		ip.setProperty(WebdavServlet.INIT_PARAM_RESOURCE_CONFIG, HttpUtils.WEBDAV_CONFIG);
+		ip.setProperty(WebdavServlet.INIT_PARAM_RESOURCE_CONFIG, webDavConfig);
 		ip.setProperty(WebdavServlet.INIT_PARAM_RESOURCE_PATH_PREFIX, path);
 		httpService.registerServlet(path, filesServlet, ip, new PrivateHttpContext(httpRealm, true));
 	}
 
-	static void registerRemotingServlet(HttpService httpService, String alias, Repository repository)
+	void registerRemotingServlet(HttpService httpService, String alias, Repository repository)
 			throws NamespaceException, ServletException {
 		RemotingServlet remotingServlet = new RemotingServlet(repository, new CmsSessionProvider(alias));
 		String path = remotingPath(alias);
@@ -145,23 +146,7 @@ public class NodeHttp implements KernelConstants {
 		return NodeConstants.PATH_FILES;
 	}
 
-	// private Subject subjectFromRequest(HttpServletRequest request,
-	// HttpServletResponse response) {
-	// Authorization authorization = (Authorization)
-	// request.getAttribute(HttpContext.AUTHORIZATION);
-	// if (authorization == null)
-	// throw new CmsException("Not authenticated");
-	// try {
-	// LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER,
-	// new HttpRequestCallbackHandler(request, response));
-	// lc.login();
-	// return lc.getSubject();
-	// } catch (LoginException e) {
-	// throw new CmsException("Cannot login", e);
-	// }
-	// }
-
-	static class RepositoriesStc extends ServiceTracker<Repository, Repository> {
+	class RepositoriesStc extends ServiceTracker<Repository, Repository> {
 		private final HttpService httpService;
 
 		private final BundleContext bc;
@@ -198,9 +183,6 @@ public class NodeHttp implements KernelConstants {
 	}
 
 	private class PrepareHttpStc extends ServiceTracker<HttpService, HttpService> {
-		// private DataHttp dataHttp;
-		// private NodeHttp nodeHttp;
-
 		public PrepareHttpStc() {
 			super(bc, HttpService.class, null);
 		}
@@ -218,13 +200,6 @@ public class NodeHttp implements KernelConstants {
 
 		@Override
 		public void removedService(ServiceReference<HttpService> reference, HttpService service) {
-			// if (dataHttp != null)
-			// dataHttp.destroy();
-			// dataHttp = null;
-			// if (nodeHttp != null)
-			// nodeHttp.destroy();
-			// nodeHttp = null;
-			// destroy();
 			repositories.close();
 			repositories = null;
 		}
@@ -238,6 +213,7 @@ public class NodeHttp implements KernelConstants {
 			try {
 				httpService.registerServlet("/!", new LinkServlet(), null, null);
 				httpService.registerServlet("/robots.txt", new RobotServlet(), null, null);
+				// httpService.registerServlet("/html", new HtmlServlet(), null, null);
 			} catch (Exception e) {
 				throw new CmsException("Cannot register filters", e);
 			}
@@ -257,7 +233,8 @@ public class NodeHttp implements KernelConstants {
 		}
 
 		private String httpPortsMsg(Object httpPort, Object httpsPort) {
-			return "HTTP " + httpPort + (httpsPort != null ? " - HTTPS " + httpsPort : "");
+			return (httpPort != null ? "HTTP " + httpPort + " " : " ")
+					+ (httpsPort != null ? "HTTPS " + httpsPort : "");
 		}
 	}