import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeUtils;
-import org.argeo.cms.auth.CmsSession;
-import org.argeo.cms.servlet.ServletAuthUtils;
+import org.argeo.api.cms.CmsSession;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.cms.auth.RemoteAuthRequest;
+import org.argeo.cms.auth.RemoteAuthUtils;
+import org.argeo.cms.jcr.CmsJcrUtils;
+import org.argeo.cms.servlet.ServletHttpRequest;
import org.argeo.jcr.Jcr;
import org.argeo.jcr.JcrUtils;
import org.argeo.suite.SuiteUtils;
/** Receives a form submission. */
public class OdkSubmissionServlet extends HttpServlet {
private static final long serialVersionUID = 7834401404691302385L;
- private final static Log log = LogFactory.getLog(OdkSubmissionServlet.class);
+ private final static CmsLog log = CmsLog.getLog(OdkSubmissionServlet.class);
private final static String XML_SUBMISSION_FILE = "xml_submission_file";
resp.setDateHeader("Date", System.currentTimeMillis());
resp.setIntHeader("X-OpenRosa-Accept-Content-Length", 1024 * 1024);
- Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), req);
+ 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(req);
+ 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
- adminSession = NodeUtils.openDataAdminSession(repository, null);
+ adminSession = CmsJcrUtils.openDataAdminSession(repository, null);
SuiteUtils.getOrCreateCmsSessionNode(adminSession, cmsSession);
} finally {
Jcr.logout(adminSession);