diff --git a/distro/descriptor.xml b/distro/descriptor.xml index c468f13..308f7f9 100644 --- a/distro/descriptor.xml +++ b/distro/descriptor.xml @@ -15,8 +15,6 @@ README LICENSE - INSTALL - MAINTAINERS changelog.xml 755 @@ -39,10 +37,5 @@ target/${build.finalName}.jar /${artifactId} - - ${distroDirectory}/svnpath.txt - /${artifactId} - true - \ No newline at end of file diff --git a/src/main/java/org/gcube/vomanagement/usermanagement/impl/LiferayRoleManager.java b/src/main/java/org/gcube/vomanagement/usermanagement/impl/LiferayRoleManager.java index ef2922f..eb8bade 100644 --- a/src/main/java/org/gcube/vomanagement/usermanagement/impl/LiferayRoleManager.java +++ b/src/main/java/org/gcube/vomanagement/usermanagement/impl/LiferayRoleManager.java @@ -92,7 +92,7 @@ public class LiferayRoleManager implements RoleManager { } catch (PortalException e) { _log.warn(roleId + " Role id not existing"); } catch (SystemException e) { - e.printStackTrace(); + _log.error("Liferay SystemException"); } return null; } @@ -112,10 +112,11 @@ public class LiferayRoleManager implements RoleManager { Role toReturn = RoleLocalServiceUtil.getRole(ManagementUtils.getCompany().getCompanyId(), roleName); return toReturn.getRoleId(); } catch (PortalException e) { - throw new RoleRetrievalFault("Role not existing", e); + throw new RoleRetrievalFault("Role not existing"); } catch (SystemException e) { - throw new RoleRetrievalFault(e.getMessage(), e); + _log.error("Liferay SystemException"); } + return -1; } /** * {@inheritDoc} @@ -157,7 +158,7 @@ public class LiferayRoleManager implements RoleManager { long existingroleId = -1; try { existingroleId = getRoleIdByName(roleName); - } catch (RoleRetrievalFault e1) { + } catch (Exception e) { _log.debug("Site Role having name " + roleName + " does not exist, proceed with creation OK"); } if (existingroleId == -1) {