gCubeSystem
/
vre-deploy
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix for bug #712

Browse Source 
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/vre-deploy@119377 82a268e6-3cf1-43bd-a215-b396298e98cf
master
Massimiliano Assante 9 years ago
parent 7dee759b82
commit 27ebe7f3c4
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
.settings/org.eclipse.wst.common.component
Unescape Escape View File

@ -3,7 +3,7 @@
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<dependent-module archiveName="aslvre-5.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/asl-vre/asl-vre">
<dependent-module archiveName="aslvre-5.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/asl-vre/asl-vre">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>

47
src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java
Unescape Escape View File

@ -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

Write Preview
Loading…
Cancel
Save