diff --git a/src/main/java/org/gcube/portlets/admin/manageusers/server/ManageUsersServiceImpl.java b/src/main/java/org/gcube/portlets/admin/manageusers/server/ManageUsersServiceImpl.java index 0ec23f3..6ba9d1f 100644 --- a/src/main/java/org/gcube/portlets/admin/manageusers/server/ManageUsersServiceImpl.java +++ b/src/main/java/org/gcube/portlets/admin/manageusers/server/ManageUsersServiceImpl.java @@ -5,7 +5,6 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; - import org.gcube.applicationsupportlayer.social.ApplicationNotificationsManager; import org.gcube.applicationsupportlayer.social.NotificationsManager; import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingSite; @@ -15,16 +14,12 @@ import org.gcube.common.homelibrary.home.workspace.Workspace; import org.gcube.common.portal.PortalContext; import org.gcube.common.scope.impl.ScopeBean; import org.gcube.common.scope.impl.ScopeBean.Type; -import org.gcube.portal.custom.communitymanager.SiteManagerUtil; import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; import org.gcube.portal.notifications.bean.GenericItemBean; import org.gcube.portal.notifications.thread.MessageNotificationsThread; import org.gcube.portlets.admin.manageusers.client.ManageUsersService; import org.gcube.portlets.admin.manageusers.shared.PortalUserDTO; -import org.gcube.vomanagement.usermanagement.GroupManager; import org.gcube.vomanagement.usermanagement.UserManager; -import org.gcube.vomanagement.usermanagement.exception.GroupRetrievalFault; -import org.gcube.vomanagement.usermanagement.exception.UserManagementSystemException; import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager; import org.gcube.vomanagement.usermanagement.impl.LiferayUserManager; import org.gcube.vomanagement.usermanagement.model.GCubeUser; @@ -102,8 +97,6 @@ public class ManageUsersServiceImpl extends RemoteServiceServlet implements Mana * * @param request * @return the current Group instance based on the request - * @throws PortalException - * @throws SystemException */ private Group getSiteFromServletRequest(final HttpServletRequest request) throws Exception { String serverName = request.getServerName(); @@ -145,7 +138,7 @@ public class ManageUsersServiceImpl extends RemoteServiceServlet implements Mana //List notBelongingUsers = userM.listUnregisteredUsersByGroup(getCurrentGroupID()); long currSiteGroupId = getSiteFromServletRequest(getThreadLocalRequest()).getGroupId(); UserManager userM = new LiferayUserManager(); - List nonBelongingUsers = userM.listUsersByGroup(currSiteGroupId); //the users of i-marine or services etc + List nonBelongingUsers = userM.listUsersByGroup(currSiteGroupId, false); //the users of i-marine or services etc nonBelongingUsers.removeAll(userM.listUsersByGroup(pContext.getCurrentGroupId(getThreadLocalRequest()))); for (GCubeUser u : nonBelongingUsers) {