Rename remote auth interfaces

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 4025890f7ef1abf91015895a7d4526b8204303ce..26a0fedafb79779ff06947f5d8a61c1cba8e099e 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
@@ -36,7 +36,7 @@ import javax.xml.transform.stream.StreamSource;
 import org.apache.commons.io.IOUtils;
 import org.apache.xalan.processor.TransformerFactoryImpl;
 import org.argeo.api.cms.CmsTheme;
 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.argeo.cms.auth.RemoteAuthUtils;

 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.docbook.DbkType;
 import org.argeo.docbook.DbkUtils;
 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.docbook.DbkType;
 import org.argeo.docbook.DbkUtils;


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

-                       session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), new ServletHttpRequest(req));
+                       session = RemoteAuthUtils.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 7fde1ace09882ce6f2a1b145892663d954e8eeee..11a9ccbf47e5f2fc30a23cfd5728a6236c2a3a72 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
@@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.NodeConstants;
 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.cms.auth.RemoteAuthUtils;

 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;


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

-               Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, NodeConstants.SYS_WORKSPACE),
+               Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, NodeConstants.SYS_WORKSPACE),

                                new ServletHttpRequest(req));
 //             session = NodeUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE);
                Writer writer = resp.getWriter();
                                new ServletHttpRequest(req));
 //             session = NodeUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE);
                Writer writer = resp.getWriter();

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 89bdf7e8d8d52ed553fcb07bab1861fb94103b78..9f84e5262c425bc15c8ec3080cf6dd3356483c02 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
@@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FilenameUtils;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FilenameUtils;

-import org.argeo.cms.servlet.ServletAuthUtils;
+import org.argeo.cms.auth.RemoteAuthUtils;

 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.jcr.Jcr;
 import org.argeo.support.odk.OdkForm;
 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.jcr.Jcr;
 import org.argeo.support.odk.OdkForm;


@@ -35,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), new ServletHttpRequest(req));
+               Session session = RemoteAuthUtils.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 9eb1cdcce7ca2dd255a1abcd41cb34f737a8051a..63472fca8f6661b4e77841f7b5c102c2640a5148 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
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.output.NullOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.output.NullOutputStream;

-import org.argeo.cms.servlet.ServletAuthUtils;
+import org.argeo.cms.auth.RemoteAuthUtils;

 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.entity.EntityMimeType;
 import org.argeo.jcr.Jcr;
 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.entity.EntityMimeType;
 import org.argeo.jcr.Jcr;


@@ -57,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), new ServletHttpRequest(req));
+               Session session = RemoteAuthUtils.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 55bd9d2227f755ac35dcc94929e317aab8911851..1d40743dc81c238b71b2f1b93d4827b876e83ea7 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,9 +24,9 @@ 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.auth.RemoteAuthRequest;
+import org.argeo.cms.auth.RemoteAuthUtils;

 import org.argeo.cms.jcr.CmsJcrUtils;
 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.cms.servlet.ServletHttpRequest;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrUtils;


@@ -55,16 +55,16 @@ 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);
 

-               HttpRequest request = new ServletHttpRequest(req);
-               Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), request);
+               RemoteAuthRequest request = new ServletHttpRequest(req);
+               Session session = RemoteAuthUtils.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(request);
+                       CmsSession cmsSession = RemoteAuthUtils.getCmsSession(request);

 
                        ClassLoader currentContextCl = Thread.currentThread().getContextClassLoader();
 
                        ClassLoader currentContextCl = Thread.currentThread().getContextClassLoader();

-                       Thread.currentThread().setContextClassLoader(ServletAuthUtils.class.getClassLoader());
+                       Thread.currentThread().setContextClassLoader(RemoteAuthUtils.class.getClassLoader());

                        Session adminSession = null;
                        try {
                                // TODO centralise at a deeper level
                        Session adminSession = null;
                        try {
                                // TODO centralise at a deeper level