From: Mathieu Baudier Date: Mon, 16 Sep 2024 11:02:55 +0000 (+0200) Subject: Adapt to changes in Argeo Third Party X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=cf59253ecb9a68dd9d8d29b22521de04eb8ee604;p=gpl%2Fargeo-suite.git Adapt to changes in Argeo Third Party --- diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java index 965082c..fbe54ee 100644 --- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java +++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java @@ -22,8 +22,8 @@ import org.argeo.api.cms.CmsLog; import org.argeo.app.odk.OrxListName; import org.argeo.app.odk.OrxManifestName; import org.argeo.cms.auth.RemoteAuthUtils; -import org.argeo.cms.servlet.ServletHttpRequest; import org.argeo.cms.servlet.ServletUtils; +import org.argeo.cms.servlet.javax.JavaxServletHttpRequest; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrxApi; @@ -47,7 +47,7 @@ public class OdkFormListServlet extends HttpServlet { String pathInfo = req.getPathInfo(); Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, CmsConstants.SYS_WORKSPACE), - new ServletHttpRequest(req)); + new JavaxServletHttpRequest(req)); Writer writer = resp.getWriter(); writer.append(""); writer.append(""); diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormServlet.java index 0ccd119..f31c9fa 100644 --- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormServlet.java +++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormServlet.java @@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletResponse; import org.argeo.app.odk.OdkNames; import org.argeo.cms.auth.RemoteAuthUtils; -import org.argeo.cms.servlet.ServletHttpRequest; +import org.argeo.cms.servlet.javax.JavaxServletHttpRequest; import org.argeo.jcr.Jcr; /** Retrieves a single form. */ @@ -27,7 +27,7 @@ public class OdkFormServlet extends HttpServlet { protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { resp.setContentType("text/xml; charset=utf-8"); - Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, null), new ServletHttpRequest(req)); + Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, null), new JavaxServletHttpRequest(req)); String pathInfo = req.getPathInfo(); if (pathInfo.startsWith("//")) diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java index 1bb2c25..1e0401b 100644 --- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java +++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java @@ -36,8 +36,8 @@ import org.argeo.api.cms.CmsLog; import org.argeo.app.geo.GeoShapeUtils; import org.argeo.app.odk.OrxManifestName; import org.argeo.cms.auth.RemoteAuthUtils; -import org.argeo.cms.servlet.ServletHttpRequest; import org.argeo.cms.servlet.ServletUtils; +import org.argeo.cms.servlet.javax.JavaxServletHttpRequest; import org.argeo.cms.util.CsvWriter; import org.argeo.cms.util.DigestUtils; import org.argeo.jcr.Jcr; @@ -63,7 +63,7 @@ public class OdkManifestServlet extends HttpServlet { // cf. https://forum.getodk.org/t/authentication-for-non-https-schems/32967/4 StringBuilder baseServer = ServletUtils.getRequestUrlBase(req, true); - Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, null), new ServletHttpRequest(req)); + Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, null), new JavaxServletHttpRequest(req)); try { Node node = session.getNode(pathInfo); diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkSubmissionServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkSubmissionServlet.java index 68e701d..1b2e175 100644 --- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkSubmissionServlet.java +++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkSubmissionServlet.java @@ -30,7 +30,7 @@ import org.argeo.app.xforms.FormSubmissionListener; import org.argeo.cms.auth.RemoteAuthRequest; import org.argeo.cms.auth.RemoteAuthUtils; import org.argeo.cms.jcr.acr.JcrContent; -import org.argeo.cms.servlet.ServletHttpRequest; +import org.argeo.cms.servlet.javax.JavaxServletHttpRequest; import org.argeo.jcr.JcrUtils; /** Receives a form submission. */ @@ -54,7 +54,7 @@ public class OdkSubmissionServlet extends HttpServlet { resp.setHeader("X-OpenRosa-Version", "1.0"); resp.setDateHeader("Date", System.currentTimeMillis()); - RemoteAuthRequest request = new ServletHttpRequest(req); + RemoteAuthRequest request = new JavaxServletHttpRequest(req); CmsSession cmsSession = RemoteAuthUtils.getCmsSession(request); boolean isIncomplete = false; diff --git a/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java index 246a0c2..a03a236 100644 --- a/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java +++ b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java @@ -47,7 +47,7 @@ import org.argeo.api.cms.ux.CmsTheme; import org.argeo.app.docbook.DbkType; import org.argeo.app.jcr.docbook.DbkJcrUtils; import org.argeo.cms.auth.RemoteAuthUtils; -import org.argeo.cms.servlet.ServletHttpRequest; +import org.argeo.cms.servlet.javax.JavaxServletHttpRequest; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrException; import org.argeo.jcr.JcrUtils; @@ -111,7 +111,7 @@ public class DbkServlet extends HttpServlet { Session session = null; try { - session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, null), new ServletHttpRequest(req)); + session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, null), new JavaxServletHttpRequest(req)); Node node = session.getNode(path); if (node.hasNode(DbkType.article.get())) { diff --git a/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/FopServlet.java b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/FopServlet.java index a4e07ba..be2ab20 100644 --- a/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/FopServlet.java +++ b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/FopServlet.java @@ -46,7 +46,7 @@ import org.argeo.app.geo.GpxUtils; import org.argeo.app.geo.acr.GeoEntityUtils; import org.argeo.cms.acr.xml.XmlNormalizer; import org.argeo.cms.auth.RemoteAuthUtils; -import org.argeo.cms.servlet.ServletHttpRequest; +import org.argeo.cms.servlet.javax.JavaxServletHttpRequest; import org.argeo.cms.util.LangUtils; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.Polygon; @@ -78,7 +78,7 @@ public class FopServlet extends HttpServlet { String path = URLDecoder.decode(servletPath, StandardCharsets.UTF_8); boolean pdf = ".pdf".equals(ext); - ContentSession session = RemoteAuthUtils.doAs(() -> contentRepository.get(), new ServletHttpRequest(req)); + ContentSession session = RemoteAuthUtils.doAs(() -> contentRepository.get(), new JavaxServletHttpRequest(req)); Content content = session.get(path); // dev only diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsFileComposite.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsFileComposite.java index d4b70bb..488a62f 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsFileComposite.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsFileComposite.java @@ -1,5 +1,6 @@ package org.argeo.app.ui.library; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path;