Adapt to changes in Argeo Commons

diff --git a/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java b/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java
index c236e93b378173012e0f7d82cb1e70a5e5649f09..4025890f7ef1abf91015895a7d4526b8204303ce 100644 (file)
--- a/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java
+++ b/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java
@@ -37,6 +37,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.xalan.processor.TransformerFactoryImpl;
 import org.argeo.api.cms.CmsTheme;
 import org.argeo.cms.servlet.ServletAuthUtils;
 import org.apache.xalan.processor.TransformerFactoryImpl;
 import org.argeo.api.cms.CmsTheme;
 import org.argeo.cms.servlet.ServletAuthUtils;

+import org.argeo.cms.servlet.ServletHttpRequest;

 import org.argeo.docbook.DbkType;
 import org.argeo.docbook.DbkUtils;
 import org.argeo.jcr.Jcr;
 import org.argeo.docbook.DbkType;
 import org.argeo.docbook.DbkUtils;
 import org.argeo.jcr.Jcr;


@@ -85,7 +86,7 @@ public class DbkServlet extends HttpServlet {
 
                Session session = null;
                try {
 
                Session session = null;
                try {

-                       session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), req);
+                       session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), new ServletHttpRequest(req));

                        Node node = session.getNode(path);
 
                        if (node.hasNode(DbkType.article.get())) {
                        Node node = session.getNode(path);
 
                        if (node.hasNode(DbkType.article.get())) {

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 36bdaaea0c13465136229495ca04556a5f4fc058..7fde1ace09882ce6f2a1b145892663d954e8eeee 100644 (file)
--- 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
@@ -23,6 +23,7 @@ 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.apache.commons.logging.LogFactory;
 import org.argeo.api.NodeConstants;
 import org.argeo.cms.servlet.ServletAuthUtils;

+import org.argeo.cms.servlet.ServletHttpRequest;

 import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrxApi;
 import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrxApi;


@@ -54,7 +55,8 @@ public class OdkFormListServlet extends HttpServlet {
 
                String pathInfo = req.getPathInfo();
 
 
                String pathInfo = req.getPathInfo();
 

-               Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, NodeConstants.SYS_WORKSPACE), req);
+               Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, NodeConstants.SYS_WORKSPACE),
+                               new ServletHttpRequest(req));

 //             session = NodeUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE);
                Writer writer = resp.getWriter();
                writer.append("<?xml version='1.0' encoding='UTF-8' ?>");
 //             session = NodeUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE);
                Writer writer = resp.getWriter();
                writer.append("<?xml version='1.0' encoding='UTF-8' ?>");

diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java
index cab562cc6465fbd462d3675bec8f7b4f2e9fda27..89bdf7e8d8d52ed553fcb07bab1861fb94103b78 100644 (file)
--- a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java
+++ b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java
@@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FilenameUtils;
 import org.argeo.cms.servlet.ServletAuthUtils;
 
 import org.apache.commons.io.FilenameUtils;
 import org.argeo.cms.servlet.ServletAuthUtils;

+import org.argeo.cms.servlet.ServletHttpRequest;

 import org.argeo.jcr.Jcr;
 import org.argeo.support.odk.OdkForm;
 import org.argeo.support.odk.OdkNames;
 import org.argeo.jcr.Jcr;
 import org.argeo.support.odk.OdkForm;
 import org.argeo.support.odk.OdkNames;


@@ -34,7 +35,7 @@ public class OdkFormServlet extends HttpServlet {
        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
                resp.setContentType("text/xml; charset=utf-8");
 
        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
                resp.setContentType("text/xml; charset=utf-8");
 

-               Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), req);
+               Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), new ServletHttpRequest(req));

 
                String pathInfo = req.getPathInfo();
                if (pathInfo.startsWith("//"))
 
                String pathInfo = req.getPathInfo();
                if (pathInfo.startsWith("//"))

diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkManifestServlet.java b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkManifestServlet.java
index 3510e06ee154b50e7426c38773f01fe8107cd15c..9eb1cdcce7ca2dd255a1abcd41cb34f737a8051a 100644 (file)
--- a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkManifestServlet.java
+++ b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkManifestServlet.java
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.output.NullOutputStream;
 import org.argeo.cms.servlet.ServletAuthUtils;
 
 import org.apache.commons.io.output.NullOutputStream;
 import org.argeo.cms.servlet.ServletAuthUtils;

+import org.argeo.cms.servlet.ServletHttpRequest;

 import org.argeo.entity.EntityMimeType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
 import org.argeo.entity.EntityMimeType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;


@@ -56,7 +57,7 @@ public class OdkManifestServlet extends HttpServlet {
                int serverPort = req.getServerPort();
                String protocol = serverPort == 443 || req.isSecure() ? "https" : "http";
 
                int serverPort = req.getServerPort();
                String protocol = serverPort == 443 || req.isSecure() ? "https" : "http";
 

-               Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), req);
+               Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), new ServletHttpRequest(req));

 
                try {
                        Node node = session.getNode(pathInfo);
 
                try {
                        Node node = session.getNode(pathInfo);

diff --git a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java
index 222c6812400b38ba088596b87a7460c0ebe735df..55bd9d2227f755ac35dcc94929e317aab8911851 100644 (file)
--- a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java
+++ b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java
@@ -24,8 +24,10 @@ import javax.servlet.http.Part;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.cms.CmsSession;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.cms.CmsSession;

+import org.argeo.cms.auth.HttpRequest;

 import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.cms.servlet.ServletAuthUtils;
 import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.cms.servlet.ServletAuthUtils;

+import org.argeo.cms.servlet.ServletHttpRequest;

 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.suite.SuiteUtils;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.suite.SuiteUtils;


@@ -53,12 +55,13 @@ public class OdkSubmissionServlet extends HttpServlet {
                resp.setDateHeader("Date", System.currentTimeMillis());
                resp.setIntHeader("X-OpenRosa-Accept-Content-Length", 1024 * 1024);
 
                resp.setDateHeader("Date", System.currentTimeMillis());
                resp.setIntHeader("X-OpenRosa-Accept-Content-Length", 1024 * 1024);
 

-               Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), req);
+               HttpRequest request = new ServletHttpRequest(req);
+               Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), request);

 
                try {
 //                     Node submissions = JcrUtils.mkdirs(session,
 //                                     "/" + EntityType.form.get() + "/" + EntityNames.SUBMISSIONS_BASE);
 
                try {
 //                     Node submissions = JcrUtils.mkdirs(session,
 //                                     "/" + EntityType.form.get() + "/" + EntityNames.SUBMISSIONS_BASE);

-                       CmsSession cmsSession = ServletAuthUtils.getCmsSession(req);
+                       CmsSession cmsSession = ServletAuthUtils.getCmsSession(request);

 
                        ClassLoader currentContextCl = Thread.currentThread().getContextClassLoader();
                        Thread.currentThread().setContextClassLoader(ServletAuthUtils.class.getClassLoader());
 
                        ClassLoader currentContextCl = Thread.currentThread().getContextClassLoader();
                        Thread.currentThread().setContextClassLoader(ServletAuthUtils.class.getClassLoader());