Remove node data model, home areas based on workspaces instead.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / http / CmsSessionProvider.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/http/CmsSessionProvider.java b/org.argeo.cms/src/org/argeo/cms/internal/http/CmsSessionProvider.java
index 375520171a213ea5cc9f6ab5e9267e78b6d37d13..14f311f3796903721987b8c197f8cd4d3f0ca690 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/http/CmsSessionProvider.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/http/CmsSessionProvider.java
@@ -1,7 +1,6 @@
 package org.argeo.cms.internal.http;
 
 import java.io.Serializable;
-import java.util.LinkedHashMap;
 
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -12,20 +11,21 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.server.SessionProvider;
-import org.argeo.cms.auth.CmsSession;
+import org.argeo.cms.internal.auth.CmsSessionImpl;
+import org.argeo.jcr.JcrUtils;
 
 /**
  * Implements an open session in view patter: a new JCR session is created for
  * each request
  */
-class CmsSessionProvider implements SessionProvider, Serializable {
+public class CmsSessionProvider implements SessionProvider, Serializable {
        private static final long serialVersionUID = -1358136599534938466L;
 
        private final static Log log = LogFactory.getLog(CmsSessionProvider.class);
 
        private final String alias;
 
-       private LinkedHashMap<Session, CmsSession> cmsSessions = new LinkedHashMap<>();
+//     private LinkedHashMap<Session, CmsSessionImpl> cmsSessions = new LinkedHashMap<>();
 
        public CmsSessionProvider(String alias) {
                this.alias = alias;
@@ -34,18 +34,27 @@ class CmsSessionProvider implements SessionProvider, Serializable {
        public Session getSession(HttpServletRequest request, Repository rep, String workspace)
                        throws javax.jcr.LoginException, ServletException, RepositoryException {
 
-               CmsSession cmsSession = WebCmsSessionImpl.getCmsSession(request);
-               Session session = cmsSession.getDataSession(alias, workspace, rep);
-               cmsSessions.put(session, cmsSession);
+               // a client is scanning parent URLs.
+               if (workspace == null)
+                       return null;
+
+               CmsSessionImpl cmsSession = WebCmsSessionImpl.getCmsSession(request);
+               if (log.isTraceEnabled()) {
+                       log.trace("Get JCR session from " + cmsSession);
+               }
+               Session session = cmsSession.newDataSession(alias, workspace, rep);
+//             cmsSessions.put(session, cmsSession);
                return session;
        }
 
        public void releaseSession(Session session) {
-               if (cmsSessions.containsKey(session)) {
-                       CmsSession cmsSession = cmsSessions.get(session);
-                       cmsSession.releaseDataSession(alias, session);
-               } else {
-                       log.warn("No CMS session for JCR session " + session);
-               }
+               JcrUtils.logoutQuietly(session);
+//             if (cmsSessions.containsKey(session)) {
+//                     CmsSessionImpl cmsSession = cmsSessions.get(session);
+//                     cmsSession.releaseDataSession(alias, session);
+//             } else {
+//                     log.warn("JCR session " + session + " not found in CMS session list. Logging it out...");
+//                     JcrUtils.logoutQuietly(session);
+//             }
        }
 }