From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 12 Sep 2015 11:27:05 +0000 (+0000)
Subject: Introduce transaction in user admin UI.
X-Git-Tag: argeo-commons-2.1.30~163
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=70bf531fd1410ffbaaa4083a4f763b04a7c3f95b;p=lgpl%2Fargeo-commons.git

Introduce transaction in user admin UI.

git-svn-id: https://svn.argeo.org/commons/trunk@8389 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.security.ui.admin/META-INF/spring/editors.xml b/org.argeo.security.ui.admin/META-INF/spring/editors.xml
index 5de9ede20..263cfccb4 100644
--- a/org.argeo.security.ui.admin/META-INF/spring/editors.xml
+++ b/org.argeo.security.ui.admin/META-INF/spring/editors.xml
@@ -9,6 +9,7 @@
 	<bean id="userEditor" class="org.argeo.security.ui.admin.editors.UserEditor"
 		scope="prototype">
 		<property name="userAdmin" ref="userAdmin" />
+		<property name="userTransaction" ref="userTransaction" />
 	</bean>
 
 	<!-- <bean id="groupEditor" class="org.argeo.security.ui.admin.editors.GroupEditor" 
diff --git a/org.argeo.security.ui.admin/META-INF/spring/osgi.xml b/org.argeo.security.ui.admin/META-INF/spring/osgi.xml
index b2154564a..9d1d4645c 100644
--- a/org.argeo.security.ui.admin/META-INF/spring/osgi.xml
+++ b/org.argeo.security.ui.admin/META-INF/spring/osgi.xml
@@ -14,5 +14,5 @@
 		/> -->
 	<!-- new useradmin -->
 	<reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />
-
+	<reference id="userTransaction" interface="javax.transaction.UserTransaction" />
 </beans:beans>
\ No newline at end of file
diff --git a/org.argeo.security.ui.admin/META-INF/spring/views.xml b/org.argeo.security.ui.admin/META-INF/spring/views.xml
index 23d29d28b..6b0970e41 100644
--- a/org.argeo.security.ui.admin/META-INF/spring/views.xml
+++ b/org.argeo.security.ui.admin/META-INF/spring/views.xml
@@ -7,6 +7,7 @@
 	<bean id="usersView" class="org.argeo.security.ui.admin.views.UsersView"
 		scope="prototype">
 		<property name="userAdmin" ref="userAdmin" />
+		<property name="userTransaction" ref="userTransaction" />
 	</bean>
 
 	<bean id="groupsView" class="org.argeo.security.ui.admin.views.GroupsView"
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditor.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditor.java
index 761f48b80..af6f5748e 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditor.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditor.java
@@ -18,6 +18,8 @@ package org.argeo.security.ui.admin.editors;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.transaction.UserTransaction;
+
 import org.argeo.ArgeoException;
 import org.argeo.security.ui.admin.SecurityAdminImages;
 import org.argeo.security.ui.admin.SecurityAdminPlugin;
@@ -41,6 +43,7 @@ public class UserEditor extends FormEditor implements UserAdminConstants {
 
 	/* DEPENDENCY INJECTION */
 	private UserAdmin userAdmin;
+	private UserTransaction userTransaction;
 
 	// Context
 	private User user;
@@ -116,6 +119,12 @@ public class UserEditor extends FormEditor implements UserAdminConstants {
 	public void doSave(IProgressMonitor monitor) {
 		commitPages(true);
 		firePropertyChange(PROP_DIRTY);
+		// FIXME transaction should be managed at a higher level
+		try {
+			userTransaction.commit();
+		} catch (Exception e) {
+			throw new ArgeoException("Could not save user editor", e);
+		}
 	}
 
 	@Override
@@ -140,4 +149,9 @@ public class UserEditor extends FormEditor implements UserAdminConstants {
 	public void setUserAdmin(UserAdmin userAdmin) {
 		this.userAdmin = userAdmin;
 	}
+
+	public void setUserTransaction(UserTransaction userTransaction) {
+		this.userTransaction = userTransaction;
+	}
+
 }
\ No newline at end of file
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/views/UsersView.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/views/UsersView.java
index d380f0cc1..989b1975e 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/views/UsersView.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/views/UsersView.java
@@ -18,6 +18,10 @@ package org.argeo.security.ui.admin.views;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.transaction.UserTransaction;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.ArgeoNames;
@@ -39,11 +43,13 @@ import org.osgi.service.useradmin.UserAdmin;
 
 /** List all users with filter - based on Ldif userAdmin */
 public class UsersView extends ViewPart implements ArgeoNames {
+	private final static Log log = LogFactory.getLog(UsersView.class);
 	public final static String ID = SecurityAdminPlugin.PLUGIN_ID
 			+ ".usersView";
 
 	/* DEPENDENCY INJECTION */
 	private UserAdmin userAdmin;
+	private UserTransaction userTransaction;
 
 	// UI Objects
 	private UserTableViewer userTableViewerCmp;
@@ -75,6 +81,13 @@ public class UsersView extends ViewPart implements ArgeoNames {
 
 		// Really?
 		userTableViewerCmp.refresh();
+
+		try {
+			if (userTransaction != null)
+				userTransaction.begin();
+		} catch (Exception e) {
+			throw new ArgeoException("Cannot begin transaction", e);
+		}
 	}
 
 	private class MyUserTableViewer extends UserTableViewer {
@@ -110,6 +123,13 @@ public class UsersView extends ViewPart implements ArgeoNames {
 	@Override
 	public void dispose() {
 		super.dispose();
+		// try {
+		// if (userTransaction != null
+		// && userTransaction.getStatus() != Status.STATUS_NO_TRANSACTION)
+		// userTransaction.rollback();
+		// } catch (Exception e) {
+		// log.error("Cannot clean transaction", e);
+		// }
 	}
 
 	@Override
@@ -121,4 +141,9 @@ public class UsersView extends ViewPart implements ArgeoNames {
 	public void setUserAdmin(UserAdmin userAdmin) {
 		this.userAdmin = userAdmin;
 	}
+
+	public void setUserTransaction(UserTransaction userTransaction) {
+		this.userTransaction = userTransaction;
+	}
+
 }
\ No newline at end of file