From 9ba6c016cc5f9ae5a126d64a5e89d9edb2cfa2ad Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Thu, 20 Mar 2014 20:53:35 +0000
Subject: [PATCH] Update and session management pattern for view and editor to
 remove old deprecated way. See
 https://www.argeo.org/bugzilla/show_bug.cgi?id=211

git-svn-id: https://svn.argeo.org/commons/trunk@6902 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/spring/common.xml                |  8 +++----
 .../META-INF/spring/editors.xml               |  2 +-
 .../META-INF/spring/views.xml                 |  3 ++-
 .../ui/admin/editors/ArgeoUserEditor.java     | 21 +++++++++++++-----
 .../security/ui/admin/views/RolesView.java    |  3 ++-
 .../security/ui/admin/views/UsersView.java    | 22 +++++++++++++++----
 6 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/common.xml b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/common.xml
index bb669427a..737f30430 100644
--- a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/common.xml
+++ b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/common.xml
@@ -11,10 +11,10 @@
 		</property>
 	</bean>
 
-	<bean id="session" class="org.argeo.security.jcr.SecureThreadBoundSession">
-		<property name="repository" ref="nodeRepository" />
-	</bean>
-
+	<!-- FIXME Hard-coded dependency to Jackrabbit for user management -->
 	<bean name="jcrSecurityModel" class="org.argeo.security.jackrabbit.JackrabbitSecurityModel" />
 
+	<!-- Old deprecated way. -->
+	<!-- <bean id="session" class="org.argeo.security.jcr.SecureThreadBoundSession"> 
+		<property name="repository" ref="nodeRepository" /> </bean> -->
 </beans>
\ No newline at end of file
diff --git a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/editors.xml b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/editors.xml
index 8510866f9..740792a61 100644
--- a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/editors.xml
+++ b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/editors.xml
@@ -8,6 +8,6 @@
 	<bean id="adminArgeoUserEditor" class="org.argeo.security.ui.admin.editors.ArgeoUserEditor"
 		scope="prototype">
 		<property name="userAdminService" ref="userAdminService" />
-		<property name="session" ref="session" />
+		<property name="repository" ref="nodeRepository" />
 	</bean>
 </beans>
diff --git a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/views.xml b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/views.xml
index d399c895b..2ddb05f60 100644
--- a/security/plugins/org.argeo.security.ui.admin/META-INF/spring/views.xml
+++ b/security/plugins/org.argeo.security.ui.admin/META-INF/spring/views.xml
@@ -6,7 +6,8 @@
 
 	<bean id="adminUsersView" class="org.argeo.security.ui.admin.views.UsersView"
 		scope="prototype">
-		<property name="session" ref="session" />
+		<property name="repository" ref="nodeRepository" />
+		<!-- <property name="session" ref="session" />  -->
 	</bean>
 	
 	<bean id="adminRolesView" class="org.argeo.security.ui.admin.views.RolesView"
diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
index c32553050..9e564a4af 100644
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
@@ -16,6 +16,7 @@
 package org.argeo.security.ui.admin.editors;
 
 import javax.jcr.Node;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
@@ -35,13 +36,16 @@ import org.springframework.security.GrantedAuthority;
 
 /** Editor for an Argeo user. */
 public class ArgeoUserEditor extends FormEditor {
-	public final static String ID = "org.argeo.security.ui.admin.adminArgeoUserEditor";
+	public final static String ID = SecurityAdminPlugin.PLUGIN_ID
+			+ ".adminArgeoUserEditor";
+
+	/* DEPENDENCY INJECTION */
+	private Session session;
+	private UserAdminService userAdminService;
 
-	private JcrUserDetails userDetails;
 	// private Node userHome;
 	private Node userProfile;
-	private UserAdminService userAdminService;
-	private Session session;
+	private JcrUserDetails userDetails;
 
 	public void init(IEditorSite site, IEditorInput input)
 			throws PartInitException {
@@ -132,11 +136,16 @@ public class ArgeoUserEditor extends FormEditor {
 		userRolesPage.refresh();
 	}
 
+	/* DEPENDENCY INJECTION */
 	public void setUserAdminService(UserAdminService userAdminService) {
 		this.userAdminService = userAdminService;
 	}
 
-	public void setSession(Session session) {
-		this.session = session;
+	public void setRepository(Repository repository) {
+		try {
+			session = repository.login();
+		} catch (RepositoryException re) {
+			throw new ArgeoException("Unable to initialise local session", re);
+		}
 	}
 }
diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/RolesView.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/RolesView.java
index 91f8622f0..fbe7dd570 100644
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/RolesView.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/RolesView.java
@@ -39,7 +39,8 @@ import org.eclipse.ui.part.ViewPart;
 
 /** List all roles. */
 public class RolesView extends ViewPart {
-	public final static String ID = "org.argeo.security.ui.admin.adminRolesView";
+	public final static String ID = SecurityAdminPlugin.PLUGIN_ID
+			+ ".adminRolesView";
 
 	private Text newRole;
 
diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java
index 5f47741f5..a7437156d 100644
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java
@@ -16,6 +16,7 @@
 package org.argeo.security.ui.admin.views;
 
 import javax.jcr.Node;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.observation.Event;
@@ -45,8 +46,10 @@ public class UsersView extends ViewPart implements ArgeoNames {
 	public final static String ID = SecurityAdminPlugin.PLUGIN_ID
 			+ ".adminUsersView";
 
-	private UserTableComposite userTableCmp;
+	/* DEPENDENCY INJECTION */
 	private Session session;
+
+	private UserTableComposite userTableCmp;
 	private JcrUserListener userStructureListener;
 	private JcrUserListener userPropertiesListener;
 
@@ -86,12 +89,13 @@ public class UsersView extends ViewPart implements ArgeoNames {
 	public void dispose() {
 		JcrUtils.removeListenerQuietly(session, userStructureListener);
 		JcrUtils.removeListenerQuietly(session, userPropertiesListener);
+		JcrUtils.logoutQuietly(session);
 		super.dispose();
 	}
 
-	public void setSession(Session session) {
-		this.session = session;
-	}
+	// public void setSession(Session session) {
+	// this.session = session;
+	// }
 
 	public void refresh() {
 		this.getSite().getShell().getDisplay().asyncExec(new Runnable() {
@@ -141,4 +145,14 @@ public class UsersView extends ViewPart implements ArgeoNames {
 			}
 		}
 	}
+
+	/* DEPENDENCY INJECTION */
+	public void setRepository(Repository repository) {
+		try {
+			session = repository.login();
+		} catch (RepositoryException re) {
+			throw new ArgeoException("Unable to initialise local session", re);
+		}
+	}
+
 }
\ No newline at end of file
-- 
2.30.2