projects
/
gpl
/
argeo-slc.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f164da8
)
Adapt to changes in Argeo Commons
author
Mathieu <mbaudier@argeo.org>
Sat, 12 Nov 2022 07:03:09 +0000
(08:03 +0100)
committer
Mathieu <mbaudier@argeo.org>
Sat, 12 Nov 2022 07:03:09 +0000
(08:03 +0100)
swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java
patch
|
blob
|
history
swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java
patch
|
blob
|
history
diff --git
a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java
b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java
index 9822c0fe9c785a4e32f02ed45968bc7ea7aef52a..0f98f5827734a866be3b61712d2093369dcfb4d9 100644
(file)
--- a/
swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java
+++ b/
swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java
@@
-10,7
+10,7
@@
import java.util.List;
import javax.annotation.PostConstruct;
import org.argeo.api.cms.CmsSession;
import javax.annotation.PostConstruct;
import org.argeo.api.cms.CmsSession;
-import org.argeo.cms.
auth.
RoleNameUtils;
+import org.argeo.cms.RoleNameUtils;
import org.argeo.cms.util.LangUtils;
import org.argeo.eclipse.ui.ColumnViewerComparator;
import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;
import org.argeo.cms.util.LangUtils;
import org.argeo.eclipse.ui.ColumnViewerComparator;
import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;
diff --git
a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java
b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java
index 0ece07dff4d554c0b1e280ce9b91035fb1c2d9e2..9f333a76daed1e0ed39590c8d14fd8fe1d3e0b62 100644
(file)
--- a/
swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java
+++ b/
swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java
@@
-9,8
+9,8
@@
import java.util.List;
import java.util.Map;
import org.argeo.api.cms.CmsConstants;
import java.util.Map;
import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.directory.UserDirectory;
import org.argeo.api.cms.transaction.WorkTransaction;
import org.argeo.api.cms.transaction.WorkTransaction;
-import org.argeo.cms.osgi.useradmin.UserDirectory;
import org.argeo.cms.runtime.DirectoryConf;
import org.argeo.cms.swt.CmsException;
import org.osgi.service.useradmin.UserAdmin;
import org.argeo.cms.runtime.DirectoryConf;
import org.argeo.cms.swt.CmsException;
import org.osgi.service.useradmin.UserAdmin;