X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeHttp.java;h=353a6c9cebc94da979e3f7c8d223f0e4c3994455;hb=2606b4b145577c4767c37c464e3f517e49a98100;hp=3e2f25146577eb82c8ec79fd98a4db9a6e732380;hpb=18fb25d72021e334696dd068cf5ef0470fafbfef;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 3e2f25146..353a6c9ce 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;
@@ -34,11 +34,10 @@ import org.osgi.util.tracker.ServiceTracker;
  * Intercepts and enriches http access, mainly focusing on security and
  * transactionality.
  */
+@Deprecated
 public class NodeHttp implements KernelConstants {
 	private final static Log log = LogFactory.getLog(NodeHttp.class);
 
-	public final static String DEFAULT_SERVICE = "HTTP";
-
 	private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext();
 
 	private ServiceTracker<Repository, Repository> repositories;
@@ -46,10 +45,10 @@ public class NodeHttp implements KernelConstants {
 
 	private String httpRealm = "Argeo";
 	private String webDavConfig = HttpUtils.WEBDAV_CONFIG;
-	private final boolean cleanState;
+//	private final boolean cleanState;
 
-	public NodeHttp(boolean cleanState) {
-		this.cleanState = cleanState;
+	public NodeHttp() {
+//		this.cleanState = cleanState;
 		httpServiceTracker = new PrepareHttpStc();
 		// httpServiceTracker.open();
 		KernelUtils.asyncOpen(httpServiceTracker);
@@ -66,7 +65,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 +80,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 + "'");
@@ -222,8 +221,11 @@ public class NodeHttp implements KernelConstants {
 				throw new CmsException("An http service is already configured");
 			repositories = new RepositoriesStc(bc, httpService);
 			// repositories.open();
-			if (cleanState)
-				KernelUtils.asyncOpen(repositories);
+
+			///if (cleanState)
+			// FIXME properly publish servlets
+			//KernelUtils.asyncOpen(repositories);
+
 			log.info(httpPortsMsg(httpPort, httpsPort));
 			// httpAvailable = true;
 			// checkReadiness();