From a7b07bfb3c63926ecd5049e4eda550a7aca3a11c Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 14 Sep 2016 10:52:48 +0000 Subject: [PATCH] changed logger for getFullName from UserManagement git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@131343 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/GWTWorkspaceServiceImpl.java | 2 +- .../user/workspace/server/util/UserUtil.java | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) 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 6bbee2d..c8ec83c 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 @@ -2690,7 +2690,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT workspaceLogger.error("UserRetrievalFault for username: "+username); }catch (Exception e) { - workspaceLogger.error("Error during getMyLogin for username: "+username); + workspaceLogger.error("Error during getMyLogin for username: "+username, e); } } diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java index a908cc9..034c6c4 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java @@ -63,10 +63,10 @@ public class UserUtil { } catch (UserManagementSystemException e) { - logger.error("An error occurred in getUserFullName "+e,e); + logger.error("UserManagementSystemException, during getting fullname for: "+portalLogin); } catch (UserRetrievalFault e) { - logger.error("An error occurred in getUserFullName "+e,e); + logger.error("UserRetrievalFault, during getting fullname for: "+portalLogin); } }catch (Exception e) { logger.error("An error occurred in getUserFullName "+e,e); @@ -170,11 +170,11 @@ public class UserUtil { /** * Retrieve the highest ckan role the user has and also retrieve the list of organizations (scopes) in which the user has the ckan-admin role - * @param currentScope the current scope + * @param currentScope the current scope * @param username the current username * @param groupName the current groupName - * @param gcubeCkanDataCatalogServiceImpl - * @param orgsInWhichAdminRole + * @param gcubeCkanDataCatalogServiceImpl + * @param orgsInWhichAdminRole * @param ckanUtils ckanUtils */ public static boolean hasAdminRole(String currentScope, String username, String groupName, GWTWorkspaceServiceImpl workspaceInstance, List orgsInWhichAdminRole){ @@ -219,7 +219,7 @@ public class UserUtil { if(correspondentRoleToCheck.equals(RolesIntoOrganization.MEMBER)) continue; - checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, correspondentRoleToCheck, workspaceInstance, + checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, correspondentRoleToCheck, workspaceInstance, groupManager, gCubeGroup.getGroupId(), orgsInWhichAdminRole); } @@ -244,7 +244,7 @@ public class UserUtil { if(correspondentRoleToCheck.equals(RolesIntoOrganization.MEMBER)) continue; - checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, correspondentRoleToCheck, workspaceInstance, + checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, correspondentRoleToCheck, workspaceInstance, groupManager, gCubeGroup.getGroupId(), orgsInWhichAdminRole); } @@ -256,10 +256,10 @@ public class UserUtil { // get highest role RolesIntoOrganization correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles); - // if it the role is ADMIN we have to be sure to set it + // if it the role is ADMIN we have to be sure to set it if(correspondentRoleToCheck.equals(RolesIntoOrganization.ADMIN)){ - checkIfRoleIsSetInCkanInstance(username, groupName, correspondentRoleToCheck, workspaceInstance, + checkIfRoleIsSetInCkanInstance(username, groupName, correspondentRoleToCheck, workspaceInstance, groupManager, currentGroupId, orgsInWhichAdminRole); } } @@ -303,7 +303,7 @@ public class UserUtil { boolean res = ckanUtils.checkRole(username, gCubeGroupName, correspondentRoleToCheck); if(res){ - // get the orgs of the user + // get the orgs of the user List ckanOrgs = ckanUtils.getOrganizationsByUser(username); for (CkanOrganization ckanOrganization : ckanOrgs) { if(ckanOrganization.getName().equals(gCubeGroupName.toLowerCase()) || ckanOrganization.getName().equals(CKanUtilsImpl.PRODUCTION_CKAN_ORGNAME_ROOT)){