X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fcommands%2FNewUser.java;h=1a85253ad9238a4e83cc0a428c93f7141d72e19f;hb=3a0d866fbeea3f78c293212f4b4fbaeba7dfe2bd;hp=e302087c1e434ca039e60d4cd595e451e2b2a740;hpb=f295f8e7a43efc1839416158f4e0f268506c88b5;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
index e302087c1..1a85253ad 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
@@ -23,7 +23,7 @@ import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
 
-import org.argeo.ArgeoException;
+import org.argeo.cms.CmsException;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
@@ -121,7 +121,7 @@ public class NewUser extends AbstractHandler {
 				if (EclipseUiUtils.notEmpty(firstNameStr))
 					props.put(LdifName.givenName.name(), firstNameStr);
 
-				String cn = UserAdminUtils.getDefaultCn(firstNameStr,
+				String cn = UserAdminUtils.buildDefaultCn(firstNameStr,
 						lastNameStr);
 				if (EclipseUiUtils.notEmpty(cn))
 					props.put(LdifName.cn.name(), cn);
@@ -289,7 +289,7 @@ public class NewUser extends AbstractHandler {
 		private void initialiseDnCmb(Combo combo) {
 			Map<String, String> dns = userAdminWrapper.getKnownBaseDns(true);
 			if (dns.isEmpty())
-				throw new ArgeoException(
+				throw new CmsException(
 						"No writable base dn found. Cannot create user");
 			combo.setItems(dns.keySet().toArray(new String[0]));
 			if (dns.size() == 1)
@@ -306,7 +306,7 @@ public class NewUser extends AbstractHandler {
 				return username + "@" + (String) rdns.get(1).getValue() + '.'
 						+ (String) rdns.get(0).getValue();
 			} catch (InvalidNameException e) {
-				throw new ArgeoException("Unable to generate mail for "
+				throw new CmsException("Unable to generate mail for "
 						+ username + " with base dn " + baseDn, e);
 			}
 		}