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 a1ddcb0babb26315ac569bf0297e03f7094e6a43..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;
@@ -26,7 +25,7 @@ public class CmsSessionProvider implements SessionProvider, Serializable {
 
        private final String alias;
 
-       private LinkedHashMap<Session, CmsSessionImpl> cmsSessions = new LinkedHashMap<>();
+//     private LinkedHashMap<Session, CmsSessionImpl> cmsSessions = new LinkedHashMap<>();
 
        public CmsSessionProvider(String alias) {
                this.alias = alias;
@@ -35,47 +34,27 @@ public class CmsSessionProvider implements SessionProvider, Serializable {
        public Session getSession(HttpServletRequest request, Repository rep, String workspace)
                        throws javax.jcr.LoginException, ServletException, RepositoryException {
 
+               // a client is scanning parent URLs.
+               if (workspace == null)
+                       return null;
+
                CmsSessionImpl cmsSession = WebCmsSessionImpl.getCmsSession(request);
-               // if (cmsSession == null)
-               // return anonymousSession(request, rep, workspace);
                if (log.isTraceEnabled()) {
                        log.trace("Get JCR session from " + cmsSession);
                }
-               Session session = cmsSession.getDataSession(alias, workspace, rep);
-               cmsSessions.put(session, cmsSession);
+               Session session = cmsSession.newDataSession(alias, workspace, rep);
+//             cmsSessions.put(session, cmsSession);
                return session;
        }
 
-       // private synchronized Session anonymousSession(HttpServletRequest request,
-       // Repository repository, String workspace) {
-       // // TODO rather log in here as anonymous?
-       // LoginContext lc = (LoginContext)
-       // request.getAttribute(NodeConstants.LOGIN_CONTEXT_ANONYMOUS);
-       // if (lc == null)
-       // throw new CmsException("No login context available");
-       // // optimize
-       // Session session;
-       // try {
-       // session = Subject.doAs(lc.getSubject(), new
-       // PrivilegedExceptionAction<Session>() {
-       // @Override
-       // public Session run() throws Exception {
-       // return repository.login(workspace);
-       // }
-       // });
-       // } catch (Exception e) {
-       // throw new CmsException("Cannot log in to JCR", e);
-       // }
-       // return session;
-       // }
-
-       public synchronized void releaseSession(Session 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);
-               }
+       public void releaseSession(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);
+//             }
        }
 }