import java.util.ArrayList;
import java.util.List;
+import org.argeo.cms.ArgeoNames;
import org.argeo.cms.CmsException;
+import org.argeo.cms.auth.CurrentUser;
import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
import org.argeo.cms.ui.workbench.internal.useradmin.UiUserAdminListener;
import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserDragListener;
import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserNameLP;
import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTableDefaultDClickListener;
-import org.argeo.cms.util.useradmin.UserAdminUtils;
import org.argeo.eclipse.ui.ColumnDefinition;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.eclipse.ui.parts.LdifUsersTable;
-import org.argeo.node.ArgeoNames;
+import org.argeo.naming.LdapAttrs;
+import org.argeo.naming.LdapObjs;
import org.argeo.node.NodeConstants;
-import org.argeo.osgi.useradmin.LdifName;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.DND;
columnDefs.add(new ColumnDefinition(new MailLP(), "E-mail", 150));
columnDefs.add(new ColumnDefinition(new DomainNameLP(), "Domain", 200));
// Only show technical DN to admin
- if (UserAdminUtils.isUserInRole(NodeConstants.ROLE_ADMIN))
+ if (CurrentUser.isInRole(NodeConstants.ROLE_ADMIN))
columnDefs.add(new ColumnDefinition(new UserNameLP(),
"Distinguished Name", 300));
private class MyUserTableViewer extends LdifUsersTable {
private static final long serialVersionUID = 8467999509931900367L;
- private final String[] knownProps = { LdifName.uid.name(),
- LdifName.dn.name(), LdifName.cn.name(),
- LdifName.givenName.name(), LdifName.sn.name(),
- LdifName.mail.name() };
+ private final String[] knownProps = { LdapAttrs.DN,
+ LdapAttrs.uid.name(), LdapAttrs.cn.name(),
+ LdapAttrs.givenName.name(), LdapAttrs.sn.name(),
+ LdapAttrs.mail.name() };
public MyUserTableViewer(Composite parent, int style) {
super(parent, style);
tmpBuilder.append("*)");
}
if (tmpBuilder.length() > 1) {
- builder.append("(&(").append(LdifName.objectClass.name())
- .append("=").append(LdifName.inetOrgPerson.name())
+ builder.append("(&(").append(LdapAttrs.objectClass.name())
+ .append("=").append(LdapObjs.inetOrgPerson.name())
.append(")(|");
builder.append(tmpBuilder.toString());
builder.append("))");
} else
- builder.append("(").append(LdifName.objectClass.name())
- .append("=").append(LdifName.inetOrgPerson.name())
+ builder.append("(").append(LdapAttrs.objectClass.name())
+ .append("=").append(LdapObjs.inetOrgPerson.name())
.append(")");
roles = userAdminWrapper.getUserAdmin().getRoles(
builder.toString());
public void setUserAdminWrapper(UserAdminWrapper userAdminWrapper) {
this.userAdminWrapper = userAdminWrapper;
}
-}
\ No newline at end of file
+}