X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=org.argeo.cms.e4%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Fusers%2FGroupEditor.java;h=239bb3156e9b537e52cd1b058454598a40c99ac6;hp=2521612c765dcf16b7f1a6f434269b0fafccb5d0;hb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;hpb=4185ff8826f893a4a1f054f61a11b89333c3e85d

diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java
index 2521612c7..239bb3156 100644
--- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java
+++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java
@@ -1,9 +1,9 @@
 package org.argeo.cms.e4.users;
 
-import static org.argeo.api.NodeInstance.WORKGROUP;
+import static org.argeo.api.cms.CmsData.WORKGROUP;
 import static org.argeo.cms.auth.UserAdminUtils.setProperty;
-import static org.argeo.naming.LdapAttrs.businessCategory;
-import static org.argeo.naming.LdapAttrs.description;
+import static org.argeo.util.naming.LdapAttrs.businessCategory;
+import static org.argeo.util.naming.LdapAttrs.description;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -18,8 +18,8 @@ import javax.jcr.Session;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.api.NodeConstants;
-import org.argeo.api.NodeInstance;
+import org.argeo.api.cms.CmsData;
+import org.argeo.api.cms.CmsConstants;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.UserAdminUtils;
 import org.argeo.cms.e4.users.providers.CommonNameLP;
@@ -34,8 +34,8 @@ import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.parts.LdifUsersTable;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.naming.LdapAttrs;
 import org.argeo.osgi.transaction.WorkTransaction;
+import org.argeo.util.naming.LdapAttrs;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ToolBarManager;
@@ -87,7 +87,7 @@ public class GroupEditor extends AbstractRoleEditor {
 	@Inject
 	private Repository repository;
 	@Inject
-	private NodeInstance nodeInstance;
+	private CmsData nodeInstance;
 	// private final UserAdminWrapper userAdminWrapper;
 	private Session groupsSession;
 
@@ -119,7 +119,7 @@ public class GroupEditor extends AbstractRoleEditor {
 	@Override
 	protected void createUi(Composite parent) {
 		try {
-			groupsSession = repository.login(NodeConstants.SRV_WORKSPACE);
+			groupsSession = repository.login(CmsConstants.SRV_WORKSPACE);
 		} catch (RepositoryException e) {
 			throw new CmsException("Cannot retrieve session", e);
 		}