Clarify naming.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / http / LinkServlet.java
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/http/LinkServlet.java b/org.argeo.cms/src/org/argeo/cms/internal/http/LinkServlet.java

index 34bdcaa176587558bed883d067877db7a467c7cf..574b09a8f867d24873a6a96457d41b5d28537876 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/http/LinkServlet.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/http/LinkServlet.java
@@ -3,7 +3,6 @@ package org.argeo.cms.internal.http;
  import static javax.jcr.Property.JCR_DESCRIPTION;
  import static javax.jcr.Property.JCR_LAST_MODIFIED;
  import static javax.jcr.Property.JCR_TITLE;
-import static org.argeo.cms.CmsTypes.CMS_IMAGE;
  
  import java.io.IOException;
  import java.io.PrintWriter;
@@ -26,10 +25,10 @@ import javax.servlet.http.HttpServlet;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
  
+import org.argeo.api.NodeConstants;
+import org.argeo.api.NodeUtils;
  import org.argeo.cms.CmsException;
  import org.argeo.jcr.JcrUtils;
-import org.argeo.node.NodeConstants;
-import org.argeo.node.NodeUtils;
  import org.osgi.framework.BundleContext;
  import org.osgi.framework.FrameworkUtil;
  import org.osgi.framework.ServiceReference;
@@ -89,7 +88,7 @@ public class LinkServlet extends HttpServlet {
                                 @Override
                                 public Session run() throws Exception {
                                         Collection<ServiceReference<Repository>> srs = bc.getServiceReferences(Repository.class,
-                                                       "(" + NodeConstants.CN + "=" + NodeConstants.NODE + ")");
+                                                       "(" + NodeConstants.CN + "=" + NodeConstants.EGO_REPOSITORY + ")");
                                         Repository repository = bc.getService(srs.iterator().next());
                                         return repository.login();
                                 }
@@ -102,14 +101,15 @@ public class LinkServlet extends HttpServlet {
                                         : null;
                         String url = 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 = getDataUrl(child, request);
-                                       break loop;
-                               }
-                       }
+                       // TODO support images
+//                     loop: for (NodeIterator it = node.getNodes(); it.hasNext();) {
+//                             // Takes the first found cms:image
+//                             Node child = it.nextNode();
+//                             if (child.isNodeType(CMS_IMAGE)) {
+//                                     imgUrl = getDataUrl(child, request);
+//                                     break loop;
+//                             }
+//                     }
                         StringBuilder buf = new StringBuilder();
                         buf.append("<html>");
                         buf.append("<head>");
@@ -196,7 +196,7 @@ public class LinkServlet extends HttpServlet {
         private String getDataUrl(Node node, HttpServletRequest request) throws RepositoryException {
                 try {
                         StringBuilder buf = getServerBaseUrl(request);
-                       buf.append(NodeUtils.getDataPath(NodeConstants.NODE, node));
+                       buf.append(NodeUtils.getDataPath(NodeConstants.EGO_REPOSITORY, node));
                         return new URL(buf.toString()).toString();
                 } catch (MalformedURLException e) {
                         throw new CmsException("Cannot build data URL for " + node, e);