X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeHttp.java;h=0510b3c837116053f1ac5c8265e5c2213b96885d;hb=61780b581925666edd4bd7743a00dca7170f1d35;hp=201f765ca6ec78e6d38be35ce13af3901fab0304;hpb=3308ca9554a53ccfdb112ce3a15957005a42021c;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 201f765ca..0510b3c83 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,18 +29,17 @@ 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.argeo.node.NodeConstants;
 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
  * transactionality.
  */
-class NodeHttp implements KernelConstants, ArgeoJcrConstants {
+class NodeHttp implements KernelConstants {
 	private final static Log log = LogFactory.getLog(NodeHttp.class);
 
 	// Filters
@@ -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();
@@ -76,7 +75,7 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 				throws ServletException, IOException {
 			String path = request.getPathInfo();
 			String userAgent = request.getHeader("User-Agent").toLowerCase();
-			boolean isBot = true;
+			boolean isBot = false;
 			boolean isCompatibleBrowser = false;
 			if (userAgent.contains("bot") || userAgent.contains("facebook") || userAgent.contains("twitter")) {
 				isBot = true;
@@ -117,7 +116,7 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 					@Override
 					public Session run() throws Exception {
 						Collection<ServiceReference<Repository>> srs = bc.getServiceReferences(Repository.class, "("
-								+ ArgeoJcrConstants.JCR_REPOSITORY_ALIAS + "=" + ArgeoJcrConstants.ALIAS_NODE + ")");
+								+ NodeConstants.JCR_REPOSITORY_ALIAS + "=" + NodeConstants.ALIAS_NODE + ")");
 						Repository repository = bc.getService(srs.iterator().next());
 						return repository.login();
 					}
@@ -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;
 					}
 				}