From f2404513da9ac306b38303693d7cae79739b38d3 Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Thu, 22 Sep 2016 14:53:15 +0000 Subject: [PATCH] Logo VRE was not updated in the portlet due to liferay versioning of Document Library git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/my-vres@131669 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/changelog.xml | 1 + .../user/my_vres/server/MyVREsServiceImpl.java | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/distro/changelog.xml b/distro/changelog.xml index 8d9f2ec..49e2487 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,6 +1,7 @@ Shows only the virtual groups available in the Site it is deployed on + VRE was not updated in the portlet due to liferay versioning of Document Library Ported to Liferay 6.2 diff --git a/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java b/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java index dc5d2db..1e9f698 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java +++ b/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java @@ -2,6 +2,7 @@ package org.gcube.portlet.user.my_vres.server; import java.util.ArrayList; import java.util.Collections; +import java.util.Date; import java.util.LinkedHashMap; import java.util.List; @@ -125,7 +126,7 @@ public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsSer _log.error("Cannot find root organziation, please check gcube-data.properties file in $CATALINA_HOME/conf folder, unless your installing the Bundle"); return toReturn; } - + long nowInMillis = new Date().getTime(); //for each root sub organizations (VO) for (GCubeGroup vOrg : rootGroupVO.getChildren()) { for (GCubeGroup vre : vOrg.getChildren()) { @@ -133,7 +134,7 @@ public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsSer vreToAdd.setName(vre.getGroupName()); vreToAdd.setGroupName(gm.getInfrastructureScope(vre.getGroupId())); long logoId = vre.getLogoId(); - String logoURL = "/image/layout_set_logo?img_id="+ logoId; + String logoURL = "/image/layout_set_logo?img_id="+ logoId+"&t="+nowInMillis; vreToAdd.setImageURL(logoURL); String vreUrl = GCubePortalConstants.PREFIX_GROUP_URL+vre.getFriendlyURL(); vreToAdd.setFriendlyURL(vreUrl); @@ -309,17 +310,17 @@ public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsSer */ private Group getSiteFromServletRequest(final HttpServletRequest request) throws PortalException, SystemException { String serverName = request.getServerName(); - _log.debug("currentHost is " + serverName); + _log.trace("currentHost is " + serverName); Group site = null; List vHosts = VirtualHostLocalServiceUtil.getVirtualHosts(0, VirtualHostLocalServiceUtil.getVirtualHostsCount()); for (VirtualHost virtualHost : vHosts) { - _log.debug("Found " + virtualHost.getHostname()); + _log.trace("Found " + virtualHost.getHostname()); if (virtualHost.getHostname().compareTo("localhost") != 0 && virtualHost.getLayoutSetId() != 0 && virtualHost.getHostname().compareTo(serverName) == 0) { long layoutSetId = virtualHost.getLayoutSetId(); site = LayoutSetLocalServiceUtil.getLayoutSet(layoutSetId).getGroup(); - _log.debug("Found match! Your site is " + site.getName()); + _log.trace("Found match! Your site is " + site.getName()); return site; } }