From 6dcf97c7e60964991173ea2c0e0a63a7bad5df8b Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Thu, 22 Sep 2016 13:24:40 +0000
Subject: [PATCH] Logo VRE was not updated in the portlet due to liferay
 versioning of Document Library

git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/join-vre@131637 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                       | 16 ++++++++++++----
 .project                                         |  1 +
 distro/changelog.xml                             |  3 ++-
 pom.xml                                          |  2 +-
 .../user/joinvre/server/JoinServiceImpl.java     |  7 +++----
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.classpath b/.classpath
index cbad3c9..bc43adb 100644
--- a/.classpath
+++ b/.classpath
@@ -1,19 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/join-vre-3.0.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/join-vre-3.0.2-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/join-vre-3.0.2-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
@@ -31,5 +39,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/join-vre-3.0.1-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/join-vre-3.0.2-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.project b/.project
index b8d67b9..f69a01a 100644
--- a/.project
+++ b/.project
@@ -55,5 +55,6 @@
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>com.google.gwt.eclipse.core.gwtNature</nature>
+		<nature>com.liferay.ide.core.liferayNature</nature>
 	</natures>
 </projectDescription>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 057973c..0743cd9 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,8 +1,9 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.portlets-user.join-vre.3.0.1"
+	<Changeset component="org.gcube.portlets-user.join-vre.3.0.2"
 		date="2016-08-25">
 		<Change>Fix for Bug #4877 Email Notification sent multiple times
 			sometimes</Change>
+			<Change>Logo VRE was not updated in the portlet due to liferay versioning of Document Library</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets-user.join-vre.3.0.0"
 		date="2016-03-28">
diff --git a/pom.xml b/pom.xml
index 26dcaad..b06703a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>join-vre</artifactId>
 	<packaging>war</packaging>
-	<version>3.0.1-SNAPSHOT</version>
+	<version>3.0.2-SNAPSHOT</version>
 	<name>gCube Join VRE Portlet</name>
 	<description>Display the available VRE to Join</description>
 	<scm>
diff --git a/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java b/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java
index b3e861e..1b9f621 100644
--- a/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java
@@ -185,14 +185,13 @@ public class JoinServiceImpl extends RemoteServiceServlet implements JoinService
 			_log.error("Cannot find root organziation, please check gcube-data.properties file in $CATALINA_HOME/conf folder, unless your installing the Bundle");
 			return toReturn;
 		}
-		CacheRegistryUtil.clear();
-
+		
 		List<GCubeGroup> currUserGroups = new ArrayList<GCubeGroup>();
 		if (session.getUsername().compareTo(TEST_USER) != 0) {
 			GCubeUser currUser = new LiferayUserManager().getUserByUsername(session.getUsername());
 			currUserGroups = gm.listGroupsByUser(currUser.getUserId());
 		}
-
+		long nowInMillis = new Date().getTime();
 		//for each root sub organizations (VO)
 		for (GCubeGroup vOrg : rootGroupVO.getChildren()) {
 			for (GCubeGroup vreOrganization : vOrg.getChildren()) {
@@ -201,7 +200,7 @@ public class JoinServiceImpl extends RemoteServiceServlet implements JoinService
 				String vreDescription = vreOrganization.getDescription();
 
 				long logoId = vreOrganization.getLogoId();
-				String vreLogoURL = "/image/layout_set_logo?img_id="+ logoId;
+				String vreLogoURL = "/image/layout_set_logo?img_id="+ logoId+"&t="+nowInMillis;;
 				String groupName = gm.getInfrastructureScope(vreOrganization.getGroupId());
 				String friendlyURL =  GCubePortalConstants.PREFIX_GROUP_URL+vreOrganization.getFriendlyURL();