From 27ebe7f3c4bce2981bef6c379acec385033c4c78 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Mon, 5 Oct 2015 12:24:23 +0000 Subject: [PATCH] fix for bug #712 git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/vre-deploy@119377 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.wst.common.component | 2 +- .../server/VREDeployerServiceImpl.java | 47 ++++++++++--------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index ed06e30..6713afc 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -3,7 +3,7 @@ - + uses diff --git a/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java b/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java index 0c2480a..0783d5d 100644 --- a/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java @@ -726,6 +726,9 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre } String designer = (String) getASLSession().getAttribute(DESIGNER); String manager = (String) getASLSession().getAttribute(MANAGER); + + log.info("\n*** ADDING user designer and manager, found designer: " + designer + " found manager: "+manager); + Organization vreCreated = createCommunityAndLayout(name); if (vreCreated != null) { try { @@ -1204,7 +1207,7 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre private Organization createCommunityAndLayout(String vreName) { if (vreExists(vreName)) { - System.out.println("VRE Exists already"); + log.warn("VRE Exists already"); return null; } @@ -1219,35 +1222,36 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre String manager = (String) session.getAttribute(MANAGER); log.info("Manager found Name : " + manager); - OrganizationManagerImpl orgManager = OrganizationManagerImpl.getInstance(session); + try { - GCUBESiteLayout siteLayout = OrganizationManagerImpl.getBaseLayout(vreName, orgManager, false, session.getUsername()); - long groupModelid = orgManager.createVRE(vreName, desc, currOrgid, siteLayout, OrganizationsUtil.getgCubeThemeId(ThemesIdManager.GCUBE_LOGGEDIN_THEME)); + GCUBESiteLayout siteLayout = OrganizationManagerImpl.getBaseLayout(vreName, false, session.getUsername()); + long groupModelid = OrganizationManagerImpl.createVRE(session.getUsername(), vreName, desc, currOrgid, siteLayout, OrganizationsUtil.getgCubeThemeId(ThemesIdManager.GCUBE_LOGGEDIN_THEME)); //the method above create a VRE and assign the manager Role to the person that triggers the creation //however the VRE-Designer and the VRE-Manager persons of the VRE could be different and need to be created too UserManager uman = new LiferayUserManager(); - + Organization toReturn = OrganizationLocalServiceUtil.getOrganization(groupModelid); + Group vreCreated = toReturn.getGroup(); //if the manager is not the one who triggered the creation - if (manager.compareTo(getASLSession().getUsername()) != 0) { + String currUser = session.getUsername(); + log.info("***Username of who triggered the creation is: " + currUser); + + if (manager.compareTo(currUser) != 0) { //add the role VRE-Manager long uid = Long.parseLong(uman.getUserId(manager)); Role created = createRole("VRE-Manager", vreName, uid); - log.debug("Admin Role "+ created.getName() + " Created Successfully"); - - Organization toReturn = OrganizationLocalServiceUtil.getOrganization(groupModelid); - Group vreCreated = toReturn.getGroup(); + log.info("Admin Role "+ created.getName() + " Created Successfully"); uman.assignUserToGroup(""+vreCreated.getClassPK(), ""+uid); - log.debug("Added user " + manager + " to group " + vreCreated.getName() + " with Success"); + log.info("Added manager " + manager + " to group " + vreCreated.getName() + " with Success"); - log.debug("Assigning Role: VRE-Manager"); + log.info("Assigning Role: VRE-Manager"); RoleManager rm = new LiferayRoleManager(); rm.assignRoleToUser(""+vreCreated.getClassPK(), ""+created.getRoleId(), ""+uid); - log.debug("Admin Role VRE-Manager Associated to user " + designer + " .... returning ..."); - return toReturn; + log.info("Admin Role VRE-Manager Associated to user " + manager + " .... returning ..."); + } //if the designer is different @@ -1255,26 +1259,23 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre //add the role VRE-Designer long uid = Long.parseLong(uman.getUserId(designer)); Role created = createRole("VRE-Designer", vreName, uid); - log.debug("Admin Role "+ created.getName() + " Created Successfully"); - - Organization toReturn = OrganizationLocalServiceUtil.getOrganization(groupModelid); - Group vreCreated = toReturn.getGroup(); + log.info("Admin Role "+ created.getName() + " Created Successfully"); uman.assignUserToGroup(""+vreCreated.getClassPK(), ""+uid); - log.debug("Added user " + designer + " to group " + vreCreated.getName() + " with Success"); - + log.info("Added designer " + designer + " to group " + vreCreated.getName() + " with Success"); RoleManager rm = new LiferayRoleManager(); rm.assignRoleToUser(""+vreCreated.getClassPK(), ""+created.getRoleId(), ""+uid); - log.debug("Admin Role VRE-Designer Associated to user " + designer + " .... returning ..."); - return toReturn; + log.info("Admin Role VRE-Designer Associated to user " + designer + " .... returning ..."); } + + return toReturn; } catch (Exception e) { e.printStackTrace(); return null; } - return null; + } /** * Create a Regular Manager Role for the community