X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjcr%2Finternal%2Fservlet%2FLinkServlet.java;h=62cdc5f6b08d92ce58fdc60e1d76193cbed9100d;hb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;hp=1ddfc34e42830aef03c3ed31783ad41a7b07d3f5;hpb=1a0d5ca243bc86a5f54448186178e5fb04c623e9;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/servlet/LinkServlet.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/servlet/LinkServlet.java index 1ddfc34e4..62cdc5f6b 100644 --- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/servlet/LinkServlet.java +++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/servlet/LinkServlet.java @@ -25,9 +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.api.cms.CmsAuth; +import org.argeo.api.cms.CmsConstants; import org.argeo.cms.CmsException; +import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.jcr.JcrUtils; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; @@ -88,7 +89,7 @@ public class LinkServlet extends HttpServlet { @Override public Session run() throws Exception { Collection> srs = bc.getServiceReferences(Repository.class, - "(" + NodeConstants.CN + "=" + NodeConstants.EGO_REPOSITORY + ")"); + "(" + CmsConstants.CN + "=" + CmsConstants.EGO_REPOSITORY + ")"); Repository repository = bc.getService(srs.iterator().next()); return repository.login(); } @@ -196,7 +197,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.EGO_REPOSITORY, node)); + buf.append(CmsJcrUtils.getDataPath(CmsConstants.EGO_REPOSITORY, node)); return new URL(buf.toString()).toString(); } catch (MalformedURLException e) { throw new CmsException("Cannot build data URL for " + node, e); @@ -247,7 +248,7 @@ public class LinkServlet extends HttpServlet { Subject subject = new Subject(); LoginContext lc; try { - lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_ANONYMOUS, subject); + lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_ANONYMOUS, subject); lc.login(); return subject; } catch (LoginException e) {