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
This commit is contained in:
parent
7dee759b82
commit
27ebe7f3c4
|
@ -3,7 +3,7 @@
|
||||||
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
<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="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
<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>
|
<dependency-type>uses</dependency-type>
|
||||||
</dependent-module>
|
</dependent-module>
|
||||||
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
|
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
|
||||||
|
|
|
@ -726,6 +726,9 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre
|
||||||
}
|
}
|
||||||
String designer = (String) getASLSession().getAttribute(DESIGNER);
|
String designer = (String) getASLSession().getAttribute(DESIGNER);
|
||||||
String manager = (String) getASLSession().getAttribute(MANAGER);
|
String manager = (String) getASLSession().getAttribute(MANAGER);
|
||||||
|
|
||||||
|
log.info("\n*** ADDING user designer and manager, found designer: " + designer + " found manager: "+manager);
|
||||||
|
|
||||||
Organization vreCreated = createCommunityAndLayout(name);
|
Organization vreCreated = createCommunityAndLayout(name);
|
||||||
if (vreCreated != null) {
|
if (vreCreated != null) {
|
||||||
try {
|
try {
|
||||||
|
@ -1204,7 +1207,7 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre
|
||||||
private Organization createCommunityAndLayout(String vreName) {
|
private Organization createCommunityAndLayout(String vreName) {
|
||||||
|
|
||||||
if (vreExists(vreName)) {
|
if (vreExists(vreName)) {
|
||||||
System.out.println("VRE Exists already");
|
log.warn("VRE Exists already");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1219,35 +1222,36 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre
|
||||||
String manager = (String) session.getAttribute(MANAGER);
|
String manager = (String) session.getAttribute(MANAGER);
|
||||||
log.info("Manager found Name : " + manager);
|
log.info("Manager found Name : " + manager);
|
||||||
|
|
||||||
OrganizationManagerImpl orgManager = OrganizationManagerImpl.getInstance(session);
|
|
||||||
try {
|
try {
|
||||||
GCUBESiteLayout siteLayout = OrganizationManagerImpl.getBaseLayout(vreName, orgManager, false, session.getUsername());
|
GCUBESiteLayout siteLayout = OrganizationManagerImpl.getBaseLayout(vreName, false, session.getUsername());
|
||||||
long groupModelid = orgManager.createVRE(vreName, desc, currOrgid, siteLayout, OrganizationsUtil.getgCubeThemeId(ThemesIdManager.GCUBE_LOGGEDIN_THEME));
|
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
|
//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
|
//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();
|
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 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
|
//add the role VRE-Manager
|
||||||
long uid = Long.parseLong(uman.getUserId(manager));
|
long uid = Long.parseLong(uman.getUserId(manager));
|
||||||
Role created = createRole("VRE-Manager", vreName, uid);
|
Role created = createRole("VRE-Manager", vreName, uid);
|
||||||
log.debug("Admin Role "+ created.getName() + " Created Successfully");
|
log.info("Admin Role "+ created.getName() + " Created Successfully");
|
||||||
|
|
||||||
Organization toReturn = OrganizationLocalServiceUtil.getOrganization(groupModelid);
|
|
||||||
Group vreCreated = toReturn.getGroup();
|
|
||||||
|
|
||||||
uman.assignUserToGroup(""+vreCreated.getClassPK(), ""+uid);
|
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();
|
RoleManager rm = new LiferayRoleManager();
|
||||||
rm.assignRoleToUser(""+vreCreated.getClassPK(), ""+created.getRoleId(), ""+uid);
|
rm.assignRoleToUser(""+vreCreated.getClassPK(), ""+created.getRoleId(), ""+uid);
|
||||||
log.debug("Admin Role VRE-Manager Associated to user " + designer + " .... returning ...");
|
log.info("Admin Role VRE-Manager Associated to user " + manager + " .... returning ...");
|
||||||
return toReturn;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
//if the designer is different
|
//if the designer is different
|
||||||
|
@ -1255,26 +1259,23 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre
|
||||||
//add the role VRE-Designer
|
//add the role VRE-Designer
|
||||||
long uid = Long.parseLong(uman.getUserId(designer));
|
long uid = Long.parseLong(uman.getUserId(designer));
|
||||||
Role created = createRole("VRE-Designer", vreName, uid);
|
Role created = createRole("VRE-Designer", vreName, uid);
|
||||||
log.debug("Admin Role "+ created.getName() + " Created Successfully");
|
log.info("Admin Role "+ created.getName() + " Created Successfully");
|
||||||
|
|
||||||
Organization toReturn = OrganizationLocalServiceUtil.getOrganization(groupModelid);
|
|
||||||
Group vreCreated = toReturn.getGroup();
|
|
||||||
|
|
||||||
uman.assignUserToGroup(""+vreCreated.getClassPK(), ""+uid);
|
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();
|
RoleManager rm = new LiferayRoleManager();
|
||||||
rm.assignRoleToUser(""+vreCreated.getClassPK(), ""+created.getRoleId(), ""+uid);
|
rm.assignRoleToUser(""+vreCreated.getClassPK(), ""+created.getRoleId(), ""+uid);
|
||||||
log.debug("Admin Role VRE-Designer Associated to user " + designer + " .... returning ...");
|
log.info("Admin Role VRE-Designer Associated to user " + designer + " .... returning ...");
|
||||||
return toReturn;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return toReturn;
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Create a Regular Manager Role for the community
|
* Create a Regular Manager Role for the community
|
||||||
|
|
Loading…
Reference in New Issue