X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeHttp.java;h=ea764c3fb2e400fa08d62c13cc11453a55a65796;hb=0e7b79d7e3a39a079efff1c7590ba11590d51dea;hp=4b700d4bc42f9e5ee4802939183460d62831bdbc;hpb=5e273aace32e9b891e05b6590cc6af2751f2c9fd;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 4b700d4bc..ea764c3fb 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,15 +15,14 @@ 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;
-import org.argeo.cms.internal.http.HtmlServlet;
 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;
@@ -67,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.equals(alias))
 				registerFilesServlet(httpService, alias, repository);
 			if (log.isTraceEnabled())
 				log.trace("Registered servlets for repository '" + alias + "'");
@@ -82,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.equals(alias))
 				httpService.unregister(filesPath(alias));
 			if (log.isTraceEnabled())
 				log.trace("Unregistered servlets for repository '" + alias + "'");
@@ -234,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 : "");
 		}
 	}