X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui.admin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Fwizards%2FNewUserWizard.java;h=c2d041f56832bf07f6ddc92bb6440983fe1d6e36;hb=9ba6c016cc5f9ae5a126d64a5e89d9edb2cfa2ad;hp=a4cd0edb8a4ee06e89ea8777d819e648b99c625a;hpb=2c4852dcd20d4cde88776c527ae935f242ae1e77;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/NewUserWizard.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/NewUserWizard.java
index a4cd0edb8..c2d041f56 100644
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/NewUserWizard.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/NewUserWizard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,10 +22,10 @@ import javax.jcr.Session;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.eclipse.ui.ErrorFeedback;
-import org.argeo.jcr.ArgeoJcrUtils;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.jcr.security.SecurityJcrUtils;
+import org.argeo.jcr.UserJcrUtils;
 import org.argeo.security.UserAdminService;
+import org.argeo.security.jcr.JcrSecurityModel;
 import org.argeo.security.jcr.JcrUserDetails;
 import org.eclipse.jface.wizard.Wizard;
 import org.springframework.security.GrantedAuthority;
@@ -35,13 +35,16 @@ public class NewUserWizard extends Wizard {
 	private final static Log log = LogFactory.getLog(NewUserWizard.class);
 	private Session session;
 	private UserAdminService userAdminService;
+	private JcrSecurityModel jcrSecurityModel;
 
 	// pages
 	private MainUserInfoWizardPage mainUserInfo;
 
-	public NewUserWizard(Session session, UserAdminService userAdminService) {
+	public NewUserWizard(Session session, UserAdminService userAdminService,
+			JcrSecurityModel jcrSecurityModel) {
 		this.session = session;
 		this.userAdminService = userAdminService;
+		this.jcrSecurityModel = jcrSecurityModel;
 	}
 
 	@Override
@@ -57,9 +60,11 @@ public class NewUserWizard extends Wizard {
 
 		String username = mainUserInfo.getUsername();
 		try {
-			Node userProfile = SecurityJcrUtils.createUserProfile(session, username);
-			// session.getWorkspace().getVersionManager()
-			// .checkout(userProfile.getPath());
+			// Node userProfile = SecurityJcrUtils.createUserProfile(session,
+			// username);
+			Node userProfile = jcrSecurityModel.sync(session, username, null);
+			session.getWorkspace().getVersionManager()
+					.checkout(userProfile.getPath());
 			mainUserInfo.mapToProfileNode(userProfile);
 			String password = mainUserInfo.getPassword();
 			// TODO add roles
@@ -72,7 +77,7 @@ public class NewUserWizard extends Wizard {
 			return true;
 		} catch (Exception e) {
 			JcrUtils.discardQuietly(session);
-			Node userHome = ArgeoJcrUtils.getUserHome(session, username);
+			Node userHome = UserJcrUtils.getUserHome(session, username);
 			if (userHome != null) {
 				try {
 					userHome.remove();