gCubeSystem
/
usermanagement-core
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/vo-management/usermanagement-core@125248 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Massimiliano Assante 2016-03-15 11:43:45 +00:00
parent 1c5e1c00dc
commit ddc2488b72
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
distro/descriptor.xml
View File

@ -15,8 +15,6 @@
<includes> <includes>
<include>README</include> <include>README</include>
<include>LICENSE</include> <include>LICENSE</include>
<include>INSTALL</include>
<include>MAINTAINERS</include>
<include>changelog.xml</include> <include>changelog.xml</include>
</includes> </includes>
<fileMode>755</fileMode> <fileMode>755</fileMode>
@ -39,10 +37,5 @@
<source>target/${build.finalName}.jar</source> <source>target/${build.finalName}.jar</source>
<outputDirectory>/${artifactId}</outputDirectory> <outputDirectory>/${artifactId}</outputDirectory>
</file> </file>
<file>
<source>${distroDirectory}/svnpath.txt</source>
<outputDirectory>/${artifactId}</outputDirectory>
<filtered>true</filtered>
</file>
</files> </files>
</assembly> </assembly>

9
src/main/java/org/gcube/vomanagement/usermanagement/impl/LiferayRoleManager.java
View File

@ -92,7 +92,7 @@ public class LiferayRoleManager implements RoleManager {
} catch (PortalException e) { } catch (PortalException e) {
_log.warn(roleId + " Role id not existing"); _log.warn(roleId + " Role id not existing");
} catch (SystemException e) { } catch (SystemException e) {
e.printStackTrace(); _log.error("Liferay SystemException");
} }
return null; return null;
} }
@ -112,10 +112,11 @@ public class LiferayRoleManager implements RoleManager {
Role toReturn = RoleLocalServiceUtil.getRole(ManagementUtils.getCompany().getCompanyId(), roleName); Role toReturn = RoleLocalServiceUtil.getRole(ManagementUtils.getCompany().getCompanyId(), roleName);
return toReturn.getRoleId(); return toReturn.getRoleId();
} catch (PortalException e) { } catch (PortalException e) {
throw new RoleRetrievalFault("Role not existing", e); throw new RoleRetrievalFault("Role not existing");
} catch (SystemException e) { } catch (SystemException e) {
throw new RoleRetrievalFault(e.getMessage(), e); _log.error("Liferay SystemException");
} }
return -1;
} }
/** /**
* {@inheritDoc} * {@inheritDoc}
@ -157,7 +158,7 @@ public class LiferayRoleManager implements RoleManager {
long existingroleId = -1; long existingroleId = -1;
try { try {
existingroleId = getRoleIdByName(roleName); existingroleId = getRoleIdByName(roleName);
} catch (RoleRetrievalFault e1) { } catch (Exception e) {
_log.debug("Site Role having name " + roleName + " does not exist, proceed with creation OK"); _log.debug("Site Role having name " + roleName + " does not exist, proceed with creation OK");
} }
if (existingroleId == -1) { if (existingroleId == -1) {