X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeHttp.java;h=c391155d7ceb1bddbc8d41fe01acd697e162f823;hb=e7dc62c485696931a3e048d9102a7c86f9323b92;hp=9a2177df1be0fad1ee14431ea8c59f8d420a1ae4;hpb=810aecacb19916bade7e4bcfcbbb54c301f672df;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 9a2177df1..c391155d7 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
@@ -15,6 +15,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.server.SessionProvider;
 import org.apache.jackrabbit.server.remoting.davex.JcrRemotingServlet;
 import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet;
+import org.argeo.api.NodeConstants;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.internal.http.CmsSessionProvider;
 import org.argeo.cms.internal.http.DataHttpContext;
@@ -22,7 +23,6 @@ import org.argeo.cms.internal.http.HttpUtils;
 import org.argeo.cms.internal.http.LinkServlet;
 import org.argeo.cms.internal.http.PrivateHttpContext;
 import org.argeo.cms.internal.http.RobotServlet;
-import org.argeo.node.NodeConstants;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
@@ -66,7 +66,7 @@ public class NodeHttp implements KernelConstants {
 		try {
 			registerWebdavServlet(httpService, alias, repository);
 			registerRemotingServlet(httpService, alias, repository);
-			if (NodeConstants.HOME.equals(alias))
+			if (NodeConstants.EGO_REPOSITORY.equals(alias))
 				registerFilesServlet(httpService, alias, repository);
 			if (log.isTraceEnabled())
 				log.trace("Registered servlets for repository '" + alias + "'");
@@ -81,7 +81,7 @@ public class NodeHttp implements KernelConstants {
 		try {
 			httpService.unregister(webdavPath(alias));
 			httpService.unregister(remotingPath(alias));
-			if (NodeConstants.HOME.equals(alias))
+			if (NodeConstants.EGO_REPOSITORY.equals(alias))
 				httpService.unregister(filesPath(alias));
 			if (log.isTraceEnabled())
 				log.trace("Unregistered servlets for repository '" + alias + "'");
@@ -213,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);
 			}
@@ -232,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 : "");
 		}
 	}