diff --git a/pom.xml b/pom.xml index 12998c1..af5488c 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ usermanagement-core provided - + org.gcube.portal custom-portal-handler @@ -171,12 +171,6 @@ aslsocial provided - - org.gcube.dvos - usermanagement-core - provided - - org.gcube.portlets.user workspace-application-handler diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java index 0b4e81a..a8a1d91 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java @@ -1574,7 +1574,7 @@ public class GWTWorkspaceBuilder { List listContactsModel = new ArrayList(); - + logger.trace("Building list contact model list user model"); for (UserModel userModel : listUsers) { String fullName = UserUtil.getUserFullName(userModel.getFullname()); @@ -1583,7 +1583,7 @@ public class GWTWorkspaceBuilder { else logger.trace("buildGXTListContactsModel doesn't return user: "+userModel.getScreenName()+ "because name is null or empty"); } - + logger.trace("List contact model completed, return " +listContactsModel.size()+" contacts"); // for(User user: listUsers){ // String fullName = UserUtil.getUserFullName(user.getPortalLogin()); // diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index 7c74c35..18d9778 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -1260,10 +1260,12 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT } UserManager userManag = new LiferayUserManager(); + workspaceLogger.trace("user manager getting list users..."); return builder.buildGXTListContactsModel(userManag.listUsers()); } catch (Exception e) { workspaceLogger.error("Error in server get all contacts ", e); +// return new ArrayList(); throw new Exception(e.getMessage()); } } diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java index 01ab49e..03197e5 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java @@ -54,10 +54,10 @@ public class WsUtil { // public static final String TEST_USER = "federico.defaveri"; // public static final String TEST_USER = "massimiliano.assante"; // public static final String TEST_USER = "pasquale.pagano"; - public static final String TEST_USER = "francesco.mangiacrapa"; +// public static final String TEST_USER = "francesco.mangiacrapa"; // public static final String TEST_USER_FULL_NAME = "Francesco Mangiacrapa"; // public static final String TEST_USER = "aureliano.gentile"; -// public static final String TEST_USER = "test.user"; + public static final String TEST_USER = "test.user"; // public static final String TEST_USER = "antonio.gioia"; public static final String TEST_USER_FULL_NAME = "Test User";