X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeHttp.java;h=4a6ad233799246036f73afd3748c538f81dde16c;hb=277bb126a4b8523b93c2cd9abd345833a8387eba;hp=eee6dcd51228073556365bdbfe30ae719a4ba412;hpb=cdcf890d84a46be33ce570994ae6d97395083b72;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 eee6dcd51..4a6ad2337 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
@@ -29,12 +29,11 @@ import javax.servlet.http.HttpSession;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
-import org.argeo.cms.util.CmsUtils;
 import org.argeo.jcr.ArgeoJcrConstants;
 import org.argeo.jcr.JcrUtils;
-import org.eclipse.equinox.http.servlet.ExtendedHttpService;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
+import org.osgi.service.http.HttpService;
 
 /**
  * Intercepts and enriches http access, mainly focusing on security and
@@ -51,7 +50,7 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 
 	private BundleContext bc;
 
-	NodeHttp(ExtendedHttpService httpService, BundleContext bc) {
+	NodeHttp(HttpService httpService, BundleContext bc) {
 		this.bc = bc;
 		// rootFilter = new RootFilter();
 		// dosFilter = new CustomDosFilter();
@@ -128,13 +127,13 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 				String desc = node.hasProperty(JCR_DESCRIPTION) ? node.getProperty(JCR_DESCRIPTION).getString() : null;
 				Calendar lastUpdate = node.hasProperty(JCR_LAST_MODIFIED)
 						? node.getProperty(JCR_LAST_MODIFIED).getDate() : null;
-				String url = CmsUtils.getCanonicalUrl(node, request);
+				String url = KernelUtils.getCanonicalUrl(node, request);
 				String imgUrl = null;
 				loop: for (NodeIterator it = node.getNodes(); it.hasNext();) {
 					// Takes the first found cms:image
 					Node child = it.nextNode();
 					if (child.isNodeType(CMS_IMAGE)) {
-						imgUrl = CmsUtils.getDataUrl(child, request);
+						imgUrl = KernelUtils.getDataUrl(child, request);
 						break loop;
 					}
 				}