X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.support.odk%2Fsrc%2Forg%2Fargeo%2Fsupport%2Fodk%2Fservlet%2FOdkSubmissionServlet.java;h=1d40743dc81c238b71b2f1b93d4827b876e83ea7;hp=55bd9d2227f755ac35dcc94929e317aab8911851;hb=ce100ada2264b524a4188a1d7e6a2d21a64bcf91;hpb=df2bd5aec38fd065ec8d109383911bf814d2ed28

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 55bd9d2..1d40743 100644
--- 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.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.servlet.ServletAuthUtils;
 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);
 
-		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);
-			CmsSession cmsSession = ServletAuthUtils.getCmsSession(request);
+			CmsSession cmsSession = RemoteAuthUtils.getCmsSession(request);
 
 			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