X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.support.odk%2Fsrc%2Forg%2Fargeo%2Fsupport%2Fodk%2Fservlet%2FOdkFormListServlet.java;h=16e525aa62c40248accd11cf9c426604a8088879;hb=41e9998f7f1c87c747c57f60c6bec65fa20757a6;hp=36bdaaea0c13465136229495ca04556a5f4fc058;hpb=3440f51df3e4c015972c7b6a0efb3ce16188b89b;p=gpl%2Fargeo-suite.git diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java index 36bdaae..16e525a 100644 --- a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java +++ b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java @@ -19,10 +19,10 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.NodeConstants; -import org.argeo.cms.servlet.ServletAuthUtils; +import org.argeo.api.cms.CmsConstants; +import org.argeo.api.cms.CmsLog; +import org.argeo.cms.auth.RemoteAuthUtils; +import org.argeo.cms.servlet.ServletHttpRequest; import org.argeo.entity.EntityType; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrxApi; @@ -33,7 +33,7 @@ import org.argeo.support.odk.OrxManifestName; /** Lists available forms. */ public class OdkFormListServlet extends HttpServlet { private static final long serialVersionUID = 2706191315048423321L; - private final static Log log = LogFactory.getLog(OdkFormListServlet.class); + private final static CmsLog log = CmsLog.getLog(OdkFormListServlet.class); private Set odkForms = Collections.synchronizedSet(new HashSet<>()); @@ -54,7 +54,8 @@ public class OdkFormListServlet extends HttpServlet { String pathInfo = req.getPathInfo(); - Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, NodeConstants.SYS_WORKSPACE), req); + Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, CmsConstants.SYS_WORKSPACE), + new ServletHttpRequest(req)); // session = NodeUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE); Writer writer = resp.getWriter(); writer.append("");