Adapt to changes in Argeo Commons

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 878a7fb1d51278f980ec0299f5a0cba2e3ffa5fe..e3ec91350f171c5448ac33bfce36258dee63c711 100644 (file)
--- 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 4bc4f292957204a33a80e033deb856ba9aa67a8d..8ec16213125983f0d66da827ba296e58be0d91cb 100644 (file)
--- 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("<a>Mark as workgroup</a>");

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 b31a040b596fe2f69a1799f322ea3ddf8dc94a80..d9411591f5f6af7f562ace073255b82c3b319c84 100644 (file)
--- 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 3509927062e73951c809fb3ba2a9104dca20f2fc..07efcbbbcde06ee5126a9d88145cd860379dbc75 100644 (file)
--- 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 74acdbb5ec3358b5f6c0e558185968690c9a60d9..34892b5a2acdd8ba07bfe07e55cedc157ce71338 100644 (file)
--- 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 4d175113ee902b7f1026e4d8e106e28625bb9f05..c3e6b0c950d07c0de21d9afc98868153e473dbc5 100644 (file)
--- 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 99132f99e6bb78321eaf7eb8e438c656944dcbb6..238ae4d1e2c3705dc7cc4fafbe71c32de5a070b1 100644 (file)
--- 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 763fff7e8a660a100c7d8943dba7ea5add1f40b7..5b41eaeb30b02fc26b2371fe2a629b343f775dac 100644 (file)
--- 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<String, ?> 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 b2285e053bb7a531be7c008439ac1ba54f5c6149..d8fb0fe8863ff7fd66606915ad1be2d7c9b3a87b 100644 (file)
--- 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<String, ?> 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 09e71245e168437b702f402f223b631ce8a8b691..fb76f712e1d5c2106100883ffad2e3dc45f8daf9 100644 (file)
--- 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 0d6d9b298d5b52fb9e08b9d68baf938495c087a4..fe17a095c1280bc66e6d0a4510a3cfe1568f5638 100644 (file)
--- 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 6126e2bb8d86a6d6052d47dfd6fcf8460a2edb74..d3c000e79898a733a2a6ab11eb7635c94b8065e7 100644 (file)
--- 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 7d07d45bbe6e04598d3e223aa11c014d141568f4..2cfc10baba2d98d0fba8c20132084115c6479f78 100644 (file)
--- 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 53a51ed70ac2abe047dd7edf6d2a658dd68d73d0..3e70ca315eb61c3875d5bdc4c35bb289c61d2967 100644 (file)
--- 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) {