From 941356e038b24d41bd95d8103a369dcb090ae039 Mon Sep 17 00:00:00 2001 From: Mathieu Date: Sun, 13 Nov 2022 08:22:54 +0100 Subject: [PATCH] Adapt to changes in Argeo Commons --- .../cms/e4/users/AbstractRoleEditor.java | 6 ++-- .../org/argeo/cms/e4/users/GroupEditor.java | 10 +++---- .../org/argeo/cms/e4/users/GroupsView.java | 24 +++++++-------- .../cms/e4/users/UserBatchUpdateWizard.java | 18 +++++------ .../org/argeo/cms/e4/users/UserEditor.java | 30 +++++++++---------- .../users/UserTableDefaultDClickListener.java | 4 +-- .../src/org/argeo/cms/e4/users/UsersView.java | 16 +++++----- .../argeo/cms/e4/users/handlers/NewGroup.java | 6 ++-- .../argeo/cms/e4/users/handlers/NewUser.java | 12 ++++---- .../cms/e4/users/providers/CommonNameLP.java | 6 ++-- .../argeo/cms/e4/users/providers/MailLP.java | 4 +-- .../cms/e4/users/providers/RoleIconLP.java | 4 +-- .../cms/e4/users/providers/UserFilter.java | 6 ++-- .../cms/swt/useradmin/PickUpUserDialog.java | 18 +++++------ 14 files changed, 82 insertions(+), 82 deletions(-) diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java index 878a7fb1d..e3ec91350 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/AbstractRoleEditor.java @@ -7,7 +7,7 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.inject.Inject; -import org.argeo.api.acr.ldap.LdapAttrs; +import org.argeo.api.acr.ldap.LdapAttr; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.cms.ui.eclipse.forms.AbstractFormPart; import org.argeo.cms.ui.eclipse.forms.IManagedForm; @@ -65,7 +65,7 @@ public abstract class AbstractRoleEditor { @PostConstruct public void init(Composite parent) { this.userAdmin = userAdminWrapper.getUserAdmin(); - username = mPart.getPersistedState().get(LdapAttrs.uid.name()); + username = mPart.getPersistedState().get(LdapAttr.uid.name()); user = (User) userAdmin.getRole(username); listener = new NameChangeListener(Display.getCurrent()); @@ -125,7 +125,7 @@ public abstract class AbstractRoleEditor { void updateEditorTitle(String title) { if (title == null) { - String commonName = UserAdminUtils.getProperty(user, LdapAttrs.cn.name()); + String commonName = UserAdminUtils.getProperty(user, LdapAttr.cn.name()); title = "".equals(commonName) ? user.getName() : commonName; } setPartName(title); diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupEditor.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupEditor.java index 4bc4f2929..8ec162131 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupEditor.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupEditor.java @@ -1,7 +1,7 @@ package org.argeo.cms.e4.users; -import static org.argeo.api.acr.ldap.LdapAttrs.businessCategory; -import static org.argeo.api.acr.ldap.LdapAttrs.description; +import static org.argeo.api.acr.ldap.LdapAttr.businessCategory; +import static org.argeo.api.acr.ldap.LdapAttr.description; import static org.argeo.api.cms.CmsContext.WORKGROUP; import static org.argeo.cms.auth.UserAdminUtils.setProperty; @@ -16,7 +16,7 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.argeo.api.acr.ldap.LdapAttrs; +import org.argeo.api.acr.ldap.LdapAttr; import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsContext; import org.argeo.api.cms.transaction.WorkTransaction; @@ -146,7 +146,7 @@ public class GroupEditor extends AbstractRoleEditor { body.setLayout(layout); body.setLayoutData(CmsSwtUtils.fillWidth()); - String cn = UserAdminUtils.getProperty(group, LdapAttrs.cn.name()); + String cn = UserAdminUtils.getProperty(group, LdapAttr.cn.name()); createReadOnlyLT(body, "Name", cn); createReadOnlyLT(body, "DN", group.getName()); createReadOnlyLT(body, "Domain", UserAdminUtils.getDomainName(group)); @@ -194,7 +194,7 @@ public class GroupEditor extends AbstractRoleEditor { public void refresh() { // dnTxt.setText(group.getName()); // cnTxt.setText(UserAdminUtils.getProperty(group, LdapAttrs.cn.name())); - descTxt.setText(UserAdminUtils.getProperty(group, LdapAttrs.description.name())); + descTxt.setText(UserAdminUtils.getProperty(group, LdapAttr.description.name())); Node workgroupHome = CmsJcrUtils.getGroupHome(groupsSession, cn); if (workgroupHome == null) markAsWorkgroupLk.setText("Mark as workgroup"); diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupsView.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupsView.java index b31a040b5..d9411591f 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupsView.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/GroupsView.java @@ -7,8 +7,8 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.inject.Inject; -import org.argeo.api.acr.ldap.LdapAttrs; -import org.argeo.api.acr.ldap.LdapObjs; +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.CurrentUser; @@ -150,7 +150,7 @@ public class GroupsView { private boolean showSystemRoles = true; - private final String[] knownProps = { LdapAttrs.uid.name(), LdapAttrs.cn.name(), LdapAttrs.DN }; + private final String[] knownProps = { LdapAttr.uid.name(), LdapAttr.cn.name(), LdapAttr.DN }; public MyUserTableViewer(Composite parent, int style) { super(parent, style); @@ -191,27 +191,27 @@ public class GroupsView { tmpBuilder.append("*)"); } if (tmpBuilder.length() > 1) { - builder.append("(&(").append(LdapAttrs.objectClass.name()).append("=") - .append(LdapObjs.groupOfNames.name()).append(")"); + builder.append("(&(").append(LdapAttr.objectClass.name()).append("=") + .append(LdapObj.groupOfNames.name()).append(")"); // hide tokens - builder.append("(!(").append(LdapAttrs.DN).append("=*").append(CmsConstants.TOKENS_BASEDN) + builder.append("(!(").append(LdapAttr.DN).append("=*").append(CmsConstants.TOKENS_BASEDN) .append("))"); if (!showSystemRoles) - builder.append("(!(").append(LdapAttrs.DN).append("=*").append(CmsConstants.SYSTEM_ROLES_BASEDN) + builder.append("(!(").append(LdapAttr.DN).append("=*").append(CmsConstants.SYSTEM_ROLES_BASEDN) .append("))"); builder.append("(|"); builder.append(tmpBuilder.toString()); builder.append("))"); } else { if (!showSystemRoles) - builder.append("(&(").append(LdapAttrs.objectClass.name()).append("=") - .append(LdapObjs.groupOfNames.name()).append(")(!(").append(LdapAttrs.DN).append("=*") - .append(CmsConstants.SYSTEM_ROLES_BASEDN).append("))(!(").append(LdapAttrs.DN).append("=*") + builder.append("(&(").append(LdapAttr.objectClass.name()).append("=") + .append(LdapObj.groupOfNames.name()).append(")(!(").append(LdapAttr.DN).append("=*") + .append(CmsConstants.SYSTEM_ROLES_BASEDN).append("))(!(").append(LdapAttr.DN).append("=*") .append(CmsConstants.TOKENS_BASEDN).append(")))"); else - builder.append("(&(").append(LdapAttrs.objectClass.name()).append("=") - .append(LdapObjs.groupOfNames.name()).append(")(!(").append(LdapAttrs.DN).append("=*") + builder.append("(&(").append(LdapAttr.objectClass.name()).append("=") + .append(LdapObj.groupOfNames.name()).append(")(!(").append(LdapAttr.DN).append("=*") .append(CmsConstants.TOKENS_BASEDN).append(")))"); } diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java index 350992706..07efcbbbc 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserBatchUpdateWizard.java @@ -5,8 +5,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.argeo.api.acr.ldap.LdapAttrs; -import org.argeo.api.acr.ldap.LdapObjs; +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.api.cms.transaction.WorkTransaction; @@ -167,7 +167,7 @@ public class UserBatchUpdateWizard extends Wizard { 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(); @@ -495,8 +495,8 @@ public class UserBatchUpdateWizard extends Wizard { 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); @@ -519,13 +519,13 @@ public class UserBatchUpdateWizard extends Wizard { 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); diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserEditor.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserEditor.java index 74acdbb5e..34892b5a2 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserEditor.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserEditor.java @@ -1,10 +1,10 @@ package org.argeo.cms.e4.users; -import static org.argeo.api.acr.ldap.LdapAttrs.cn; -import static org.argeo.api.acr.ldap.LdapAttrs.givenName; -import static org.argeo.api.acr.ldap.LdapAttrs.mail; -import static org.argeo.api.acr.ldap.LdapAttrs.sn; -import static org.argeo.api.acr.ldap.LdapAttrs.uid; +import static org.argeo.api.acr.ldap.LdapAttr.cn; +import static org.argeo.api.acr.ldap.LdapAttr.givenName; +import static org.argeo.api.acr.ldap.LdapAttr.mail; +import static org.argeo.api.acr.ldap.LdapAttr.sn; +import static org.argeo.api.acr.ldap.LdapAttr.uid; import static org.argeo.cms.auth.UserAdminUtils.getProperty; import java.util.ArrayList; @@ -13,7 +13,7 @@ import java.util.List; import javax.inject.Inject; -import org.argeo.api.acr.ldap.LdapAttrs; +import org.argeo.api.acr.ldap.LdapAttr; import org.argeo.api.cms.CmsConstants; import org.argeo.cms.CurrentUser; import org.argeo.cms.auth.UserAdminUtils; @@ -158,20 +158,20 @@ public class UserEditor extends AbstractRoleEditor { @SuppressWarnings("unchecked") public void commit(boolean onSave) { // TODO Sanity checks (mail validity...) - user.getProperties().put(LdapAttrs.givenName.name(), firstName.getText()); - user.getProperties().put(LdapAttrs.sn.name(), lastName.getText()); - user.getProperties().put(LdapAttrs.cn.name(), commonName.getText()); - user.getProperties().put(LdapAttrs.mail.name(), email.getText()); + user.getProperties().put(LdapAttr.givenName.name(), firstName.getText()); + user.getProperties().put(LdapAttr.sn.name(), lastName.getText()); + user.getProperties().put(LdapAttr.cn.name(), commonName.getText()); + user.getProperties().put(LdapAttr.mail.name(), email.getText()); super.commit(onSave); } @Override public void refresh() { - distinguishedName.setText(UserAdminUtils.getProperty(user, LdapAttrs.uid.name())); - commonName.setText(UserAdminUtils.getProperty(user, LdapAttrs.cn.name())); - firstName.setText(UserAdminUtils.getProperty(user, LdapAttrs.givenName.name())); - lastName.setText(UserAdminUtils.getProperty(user, LdapAttrs.sn.name())); - email.setText(UserAdminUtils.getProperty(user, LdapAttrs.mail.name())); + distinguishedName.setText(UserAdminUtils.getProperty(user, LdapAttr.uid.name())); + commonName.setText(UserAdminUtils.getProperty(user, LdapAttr.cn.name())); + firstName.setText(UserAdminUtils.getProperty(user, LdapAttr.givenName.name())); + lastName.setText(UserAdminUtils.getProperty(user, LdapAttr.sn.name())); + email.setText(UserAdminUtils.getProperty(user, LdapAttr.mail.name())); refreshFormTitle(user); super.refresh(); } diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserTableDefaultDClickListener.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserTableDefaultDClickListener.java index 4d175113e..c3e6b0c95 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserTableDefaultDClickListener.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserTableDefaultDClickListener.java @@ -1,6 +1,6 @@ package org.argeo.cms.e4.users; -import org.argeo.api.acr.ldap.LdapAttrs; +import org.argeo.api.acr.ldap.LdapAttr; import org.argeo.cms.e4.CmsE4Utils; import org.eclipse.e4.ui.workbench.modeling.EPartService; import org.eclipse.jface.viewers.DoubleClickEvent; @@ -27,7 +27,7 @@ public class UserTableDefaultDClickListener implements IDoubleClickListener { User user = (User) obj; String editorId = getEditorId(user); - CmsE4Utils.openEditor(partService, editorId, LdapAttrs.uid.name(), user.getName()); + CmsE4Utils.openEditor(partService, editorId, LdapAttr.uid.name(), user.getName()); } protected String getEditorId(User user) { diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UsersView.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UsersView.java index 99132f99e..238ae4d1e 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UsersView.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UsersView.java @@ -7,8 +7,8 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.inject.Inject; -import org.argeo.api.acr.ldap.LdapAttrs; -import org.argeo.api.acr.ldap.LdapObjs; +import org.argeo.api.acr.ldap.LdapAttr; +import org.argeo.api.acr.ldap.LdapObj; import org.argeo.api.cms.CmsConstants; import org.argeo.cms.CurrentUser; import org.argeo.cms.e4.users.providers.CommonNameLP; @@ -116,8 +116,8 @@ public class UsersView { private class MyUserTableViewer extends LdifUsersTable { private static final long serialVersionUID = 8467999509931900367L; - private final String[] knownProps = { LdapAttrs.DN, LdapAttrs.uid.name(), LdapAttrs.cn.name(), - LdapAttrs.givenName.name(), LdapAttrs.sn.name(), LdapAttrs.mail.name() }; + private final String[] knownProps = { LdapAttr.DN, LdapAttr.uid.name(), LdapAttr.cn.name(), + LdapAttr.givenName.name(), LdapAttr.sn.name(), LdapAttr.mail.name() }; public MyUserTableViewer(Composite parent, int style) { super(parent, style); @@ -140,13 +140,13 @@ public class UsersView { 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); diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java index 763fff7e8..5b41eaeb3 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewGroup.java @@ -5,7 +5,7 @@ import java.util.Map; import javax.inject.Inject; -import org.argeo.api.acr.ldap.LdapAttrs; +import org.argeo.api.acr.ldap.LdapAttr; import org.argeo.cms.e4.users.UserAdminWrapper; import org.argeo.cms.runtime.DirectoryConf; import org.argeo.cms.swt.CmsException; @@ -77,7 +77,7 @@ public class NewGroup { Dictionary props = group.getProperties(); String descStr = descriptionTxt.getText(); if (EclipseUiUtils.notEmpty(descStr)) - props.put(LdapAttrs.description.name(), descStr); + props.put(LdapAttr.description.name(), descStr); userAdminWrapper.commitOrNotifyTransactionStateChange(); userAdminWrapper.notifyListeners(new UserAdminEvent(null, UserAdminEvent.ROLE_CREATED, group)); return true; @@ -180,7 +180,7 @@ public class NewGroup { String bdn = baseDnCmb.getText(); if (EclipseUiUtils.notEmpty(bdn)) { Dictionary props = DirectoryConf.uriAsProperties(dns.get(bdn)); - String dn = LdapAttrs.cn.name() + "=" + cn + "," + DirectoryConf.groupBase.getValue(props) + "," + bdn; + String dn = LdapAttr.cn.name() + "=" + cn + "," + DirectoryConf.groupBase.getValue(props) + "," + bdn; return dn; } return null; diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java index b2285e053..d8fb0fe88 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/handlers/NewUser.java @@ -9,7 +9,7 @@ import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; import javax.naming.ldap.Rdn; -import org.argeo.api.acr.ldap.LdapAttrs; +import org.argeo.api.acr.ldap.LdapAttr; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.cms.e4.users.UiAdminUtils; import org.argeo.cms.e4.users.UserAdminWrapper; @@ -90,19 +90,19 @@ public class NewUser { String lastNameStr = lastNameTxt.getText(); if (EclipseUiUtils.notEmpty(lastNameStr)) - props.put(LdapAttrs.sn.name(), lastNameStr); + props.put(LdapAttr.sn.name(), lastNameStr); String firstNameStr = firstNameTxt.getText(); if (EclipseUiUtils.notEmpty(firstNameStr)) - props.put(LdapAttrs.givenName.name(), firstNameStr); + props.put(LdapAttr.givenName.name(), firstNameStr); String cn = UserAdminUtils.buildDefaultCn(firstNameStr, lastNameStr); if (EclipseUiUtils.notEmpty(cn)) - props.put(LdapAttrs.cn.name(), cn); + props.put(LdapAttr.cn.name(), cn); String mailStr = primaryMailTxt.getText(); if (EclipseUiUtils.notEmpty(mailStr)) - props.put(LdapAttrs.mail.name(), mailStr); + props.put(LdapAttr.mail.name(), mailStr); char[] password = mainUserInfo.getPassword(); user.getCredentials().put(null, password); @@ -242,7 +242,7 @@ public class NewUser { String bdn = baseDnCmb.getText(); if (EclipseUiUtils.notEmpty(bdn)) { Dictionary props = DirectoryConf.uriAsProperties(dns.get(bdn)); - String dn = LdapAttrs.uid.name() + "=" + uid + "," + DirectoryConf.userBase.getValue(props) + "," + bdn; + String dn = LdapAttr.uid.name() + "=" + uid + "," + DirectoryConf.userBase.getValue(props) + "," + bdn; return dn; } return null; diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/CommonNameLP.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/CommonNameLP.java index 09e71245e..fb76f712e 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/CommonNameLP.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/CommonNameLP.java @@ -1,6 +1,6 @@ package org.argeo.cms.e4.users.providers; -import org.argeo.api.acr.ldap.LdapAttrs; +import org.argeo.api.acr.ldap.LdapAttr; import org.argeo.cms.auth.UserAdminUtils; import org.osgi.service.useradmin.User; @@ -10,12 +10,12 @@ public class CommonNameLP extends UserAdminAbstractLP { @Override public String getText(User user) { - return UserAdminUtils.getProperty(user, LdapAttrs.cn.name()); + return UserAdminUtils.getProperty(user, LdapAttr.cn.name()); } @Override public String getToolTipText(Object element) { - return UserAdminUtils.getProperty((User) element, LdapAttrs.DN); + return UserAdminUtils.getProperty((User) element, LdapAttr.DN); } } diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/MailLP.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/MailLP.java index 0d6d9b298..fe17a095c 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/MailLP.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/MailLP.java @@ -1,6 +1,6 @@ package org.argeo.cms.e4.users.providers; -import org.argeo.api.acr.ldap.LdapAttrs; +import org.argeo.api.acr.ldap.LdapAttr; import org.argeo.cms.auth.UserAdminUtils; import org.osgi.service.useradmin.User; @@ -10,6 +10,6 @@ public class MailLP extends UserAdminAbstractLP { @Override public String getText(User user) { - return UserAdminUtils.getProperty(user, LdapAttrs.mail.name()); + return UserAdminUtils.getProperty(user, LdapAttr.mail.name()); } } diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java index 6126e2bb8..d3c000e79 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/RoleIconLP.java @@ -1,7 +1,7 @@ package org.argeo.cms.e4.users.providers; import org.argeo.api.cms.CmsContext; -import org.argeo.api.acr.ldap.LdapAttrs; +import org.argeo.api.acr.ldap.LdapAttr; import org.argeo.api.cms.CmsConstants; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.cms.e4.users.SecurityAdminImages; @@ -25,7 +25,7 @@ public class RoleIconLP extends UserAdminAbstractLP { if (dn.endsWith(CmsConstants.SYSTEM_ROLES_BASEDN)) return SecurityAdminImages.ICON_ROLE; else if (user.getType() == Role.GROUP) { - String businessCategory = UserAdminUtils.getProperty(user, LdapAttrs.businessCategory); + String businessCategory = UserAdminUtils.getProperty(user, LdapAttr.businessCategory); if (businessCategory != null && businessCategory.equals(CmsContext.WORKGROUP)) return SecurityAdminImages.ICON_WORKGROUP; return SecurityAdminImages.ICON_GROUP; diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/UserFilter.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/UserFilter.java index 7d07d45bb..2cfc10bab 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/UserFilter.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/providers/UserFilter.java @@ -2,7 +2,7 @@ package org.argeo.cms.e4.users.providers; import static org.argeo.eclipse.ui.EclipseUiUtils.notEmpty; -import org.argeo.api.acr.ldap.LdapAttrs; +import org.argeo.api.acr.ldap.LdapAttr; import org.argeo.api.cms.CmsConstants; import org.argeo.cms.auth.UserAdminUtils; import org.eclipse.jface.viewers.Viewer; @@ -19,8 +19,8 @@ public class UserFilter extends ViewerFilter { private String searchString; private boolean showSystemRole = true; - private final String[] knownProps = { LdapAttrs.DN, LdapAttrs.cn.name(), LdapAttrs.givenName.name(), - LdapAttrs.sn.name(), LdapAttrs.uid.name(), LdapAttrs.description.name(), LdapAttrs.mail.name() }; + private final String[] knownProps = { LdapAttr.DN, LdapAttr.cn.name(), LdapAttr.givenName.name(), + LdapAttr.sn.name(), LdapAttr.uid.name(), LdapAttr.description.name(), LdapAttr.mail.name() }; public void setSearchText(String s) { // ensure that the value can be used for matching diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/swt/useradmin/PickUpUserDialog.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/swt/useradmin/PickUpUserDialog.java index 53a51ed70..3e70ca315 100644 --- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/swt/useradmin/PickUpUserDialog.java +++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/swt/useradmin/PickUpUserDialog.java @@ -3,8 +3,8 @@ package org.argeo.cms.swt.useradmin; import java.util.ArrayList; import java.util.List; -import org.argeo.api.acr.ldap.LdapAttrs; -import org.argeo.api.acr.ldap.LdapObjs; +import org.argeo.api.acr.ldap.LdapAttr; +import org.argeo.api.acr.ldap.LdapObj; import org.argeo.api.cms.CmsConstants; import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiException; @@ -157,8 +157,8 @@ public class PickUpUserDialog extends TrayDialog { private class MyUserTableViewer extends LdifUsersTable { private static final long serialVersionUID = 8467999509931900367L; - private final String[] knownProps = { LdapAttrs.uid.name(), - LdapAttrs.cn.name(), LdapAttrs.DN }; + private final String[] knownProps = { LdapAttr.uid.name(), + LdapAttr.cn.name(), LdapAttr.DN }; private Button showSystemRoleBtn; private Button showUserBtn; @@ -204,15 +204,15 @@ public class PickUpUserDialog extends TrayDialog { filterBuilder.append("*)"); } - String typeStr = "(" + LdapAttrs.objectClass.name() + "=" - + LdapObjs.groupOfNames.name() + ")"; + String typeStr = "(" + LdapAttr.objectClass.name() + "=" + + LdapObj.groupOfNames.name() + ")"; if ((showUserBtn.getSelection())) - typeStr = "(|(" + LdapAttrs.objectClass.name() + "=" - + LdapObjs.inetOrgPerson.name() + ")" + typeStr + typeStr = "(|(" + LdapAttr.objectClass.name() + "=" + + LdapObj.inetOrgPerson.name() + ")" + typeStr + ")"; if (!showSystemRoleBtn.getSelection()) - typeStr = "(& " + typeStr + "(!(" + LdapAttrs.DN + "=*" + typeStr = "(& " + typeStr + "(!(" + LdapAttr.DN + "=*" + CmsConstants.SYSTEM_ROLES_BASEDN + ")))"; if (filterBuilder.length() > 1) { -- 2.30.2