import java.util.List;
import java.util.Map;
+import org.argeo.api.acr.ldap.LdapAttr;
+import org.argeo.api.acr.ldap.LdapObj;
import org.argeo.api.cms.CmsConstants;
import org.argeo.api.cms.CmsLog;
-import org.argeo.cms.auth.CurrentUser;
+import org.argeo.api.cms.transaction.WorkTransaction;
+import org.argeo.cms.CurrentUser;
import org.argeo.cms.auth.UserAdminUtils;
import org.argeo.cms.e4.users.providers.CommonNameLP;
import org.argeo.cms.e4.users.providers.DomainNameLP;
import org.argeo.cms.swt.useradmin.LdifUsersTable;
import org.argeo.eclipse.ui.ColumnDefinition;
import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.util.naming.LdapAttrs;
-import org.argeo.util.naming.LdapObjs;
-import org.argeo.util.transaction.WorkTransaction;
import org.eclipse.jface.dialogs.IPageChangeProvider;
import org.eclipse.jface.dialogs.IPageChangedListener;
import org.eclipse.jface.dialogs.MessageDialog;
try {
for (User user : usersToUpdate) {
// the char array is emptied after being used.
- user.getProperties().put(LdapAttrs.mail.name(), newEmail);
+ user.getProperties().put(LdapAttr.mail.name(), newEmail);
}
userAdminWrapper.commitOrNotifyTransactionStateChange();
private class ChooseUserTableViewer extends LdifUsersTable {
private static final long serialVersionUID = 5080437561015853124L;
- private final String[] knownProps = { LdapAttrs.uid.name(), LdapAttrs.DN, LdapAttrs.cn.name(),
- LdapAttrs.givenName.name(), LdapAttrs.sn.name(), LdapAttrs.mail.name() };
+ private final String[] knownProps = { LdapAttr.uid.name(), LdapAttr.DN, LdapAttr.cn.name(),
+ LdapAttr.givenName.name(), LdapAttr.sn.name(), LdapAttr.mail.name() };
public ChooseUserTableViewer(Composite parent, int style) {
super(parent, style);
tmpBuilder.append("*)");
}
if (tmpBuilder.length() > 1) {
- builder.append("(&(").append(LdapAttrs.objectClass.name()).append("=")
- .append(LdapObjs.inetOrgPerson.name()).append(")(|");
+ builder.append("(&(").append(LdapAttr.objectClass.name()).append("=")
+ .append(LdapObj.inetOrgPerson.name()).append(")(|");
builder.append(tmpBuilder.toString());
builder.append("))");
} else
- builder.append("(").append(LdapAttrs.objectClass.name()).append("=")
- .append(LdapObjs.inetOrgPerson.name()).append(")");
+ builder.append("(").append(LdapAttr.objectClass.name()).append("=")
+ .append(LdapObj.inetOrgPerson.name()).append(")");
roles = userAdminWrapper.getUserAdmin().getRoles(builder.toString());
} catch (InvalidSyntaxException e) {
throw new CmsException("Unable to get roles with filter: " + filter, e);