Clarify naming.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / NodeHttp.java

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 08d770b8b5ccc7c0b1a46f2968166c8075375fbb..c391155d7ceb1bddbc8d41fe01acd697e162f823 100644 (file)
--- 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_REPOSITORY.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_REPOSITORY.equals(alias))
                                httpService.unregister(filesPath(alias));
                        if (log.isTraceEnabled())
                                log.trace("Unregistered servlets for repository '" + alias + "'");
@@ -214,7 +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);
+                               // httpService.registerServlet("/html", new HtmlServlet(), null, null);
                        } catch (Exception e) {
                                throw new CmsException("Cannot register filters", e);
                        }
@@ -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 : "");
                }
        }