From e9a9b6690808723800226bde4280d4f693035a2e Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 5 Nov 2011 11:22:40 +0000
Subject: [PATCH] Make session provider a singleton

git-svn-id: https://svn.argeo.org/commons/trunk@4886 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../WEB-INF/applicationContext.xml            | 15 +++++-----
 .../remote/SimpleSessionProvider.java         | 29 ++++++++++++++-----
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
index d56d0d478..a037553ca 100644
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
@@ -16,15 +16,14 @@
 		</property>
 	</bean>
 
-<!-- 	<bean id="repositoryRegister" class="org.argeo.jcr.DefaultRepositoryRegister" /> -->
+	<!-- <bean id="repositoryRegister" class="org.argeo.jcr.DefaultRepositoryRegister" 
+		/> -->
 
-	<bean id="sessionProvider" scope="session" init-method="init"
-		destroy-method="dispose" class="org.argeo.jackrabbit.remote.SimpleSessionProvider">
-		<aop:scoped-proxy proxy-target-class="false" />
-	</bean>
+	<bean id="sessionProvider" init-method="init" destroy-method="destroy"
+		class="org.argeo.jackrabbit.remote.SimpleSessionProvider" />
 
-<!-- 	<bean id="osivInterceptor" class="org.argeo.jcr.mvc.OpenSessionInViewJcrInterceptor"> -->
-<!-- 		<property name="session" ref="jcrSession" /> -->
-<!-- 	</bean> -->
+	<!-- <bean id="osivInterceptor" class="org.argeo.jcr.mvc.OpenSessionInViewJcrInterceptor"> -->
+	<!-- <property name="session" ref="jcrSession" /> -->
+	<!-- </bean> -->
 
 </beans>
\ No newline at end of file
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java
index 74b96e9ed..0cf59d5f9 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/remote/SimpleSessionProvider.java
@@ -29,8 +29,8 @@ import org.argeo.jcr.ArgeoNames;
 import org.argeo.jcr.JcrUtils;
 
 /**
- * To be injected, typically of scope="session". Implements an open session in
- * view patter: a new JCR session is created for each request
+ * Implements an open session in view patter: a new JCR session is created for
+ * each request
  */
 public class SimpleSessionProvider implements SessionProvider, Serializable {
 	private static final long serialVersionUID = 2270957712453841368L;
@@ -51,7 +51,8 @@ public class SimpleSessionProvider implements SessionProvider, Serializable {
 		if (openSessionInView) {
 			JackrabbitSession session = (JackrabbitSession) rep
 					.login(workspace);
-			writeRemoteRoles(session);
+			if (!workspace.equals(securityWorkspace))
+				writeRemoteRoles(session);
 			return session;
 		} else {
 			// since sessions is transient it can't be restored from the session
@@ -63,7 +64,8 @@ public class SimpleSessionProvider implements SessionProvider, Serializable {
 				try {
 					JackrabbitSession session = (JackrabbitSession) rep.login(
 							null, workspace);
-					writeRemoteRoles(session);
+					if (!workspace.equals(securityWorkspace))
+						writeRemoteRoles(session);
 					if (log.isTraceEnabled())
 						log.trace("User " + session.getUserID()
 								+ " logged into " + request.getServletPath());
@@ -86,9 +88,6 @@ public class SimpleSessionProvider implements SessionProvider, Serializable {
 
 	protected void writeRemoteRoles(JackrabbitSession session)
 			throws RepositoryException {
-		if (!session.getWorkspace().getName().equals(securityWorkspace))
-			return;
-
 		// retrieve roles
 		String userId = session.getUserID();
 		UserManager userManager = session.getUserManager();
@@ -147,7 +146,7 @@ public class SimpleSessionProvider implements SessionProvider, Serializable {
 	public void init() {
 	}
 
-	public void dispose() {
+	public void destroy() {
 		if (sessions != null)
 			for (String workspace : sessions.keySet()) {
 				Session session = sessions.get(workspace);
@@ -158,4 +157,18 @@ public class SimpleSessionProvider implements SessionProvider, Serializable {
 				}
 			}
 	}
+
+	/**
+	 * If set to true a new session will be created each time (the default),
+	 * otherwise a single session is cached by workspace and the object should
+	 * be of scope session (not supported)
+	 */
+	public void setOpenSessionInView(Boolean openSessionInView) {
+		this.openSessionInView = openSessionInView;
+	}
+
+	public void setSecurityWorkspace(String securityWorkspace) {
+		this.securityWorkspace = securityWorkspace;
+	}
+
 }
-- 
2.39.2