gCubeSystem
/
join-vre
15
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Massimiliano Assante 2016-09-22 13:24:40 +00:00
parent 41fbab1568
commit 6dcf97c7e6
5 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.classpath
View File

@ -1,19 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <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> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </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"> <classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </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="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>
@ -31,5 +39,5 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </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> </classpath>

1
.project
View File

@ -55,5 +55,6 @@
<nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature> <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
<nature>com.google.gwt.eclipse.core.gwtNature</nature> <nature>com.google.gwt.eclipse.core.gwtNature</nature>
<nature>com.liferay.ide.core.liferayNature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

3
distro/changelog.xml
View File

@ -1,8 +1,9 @@
<ReleaseNotes> <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"> date="2016-08-25">
<Change>Fix for Bug #4877 Email Notification sent multiple times <Change>Fix for Bug #4877 Email Notification sent multiple times
sometimes</Change> sometimes</Change>
<Change>Logo VRE was not updated in the portlet due to liferay versioning of Document Library</Change>
</Changeset> </Changeset>
<Changeset component="org.gcube.portlets-user.join-vre.3.0.0" <Changeset component="org.gcube.portlets-user.join-vre.3.0.0"
date="2016-03-28"> date="2016-03-28">

2
pom.xml
View File

@ -13,7 +13,7 @@
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>join-vre</artifactId> <artifactId>join-vre</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>3.0.1-SNAPSHOT</version> <version>3.0.2-SNAPSHOT</version>
<name>gCube Join VRE Portlet</name> <name>gCube Join VRE Portlet</name>
<description>Display the available VRE to Join</description> <description>Display the available VRE to Join</description>
<scm> <scm>

7
src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java
View File

@ -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"); _log.error("Cannot find root organziation, please check gcube-data.properties file in $CATALINA_HOME/conf folder, unless your installing the Bundle");
return toReturn; return toReturn;
} }
CacheRegistryUtil.clear();
List<GCubeGroup> currUserGroups = new ArrayList<GCubeGroup>(); List<GCubeGroup> currUserGroups = new ArrayList<GCubeGroup>();
if (session.getUsername().compareTo(TEST_USER) != 0) { if (session.getUsername().compareTo(TEST_USER) != 0) {
GCubeUser currUser = new LiferayUserManager().getUserByUsername(session.getUsername()); GCubeUser currUser = new LiferayUserManager().getUserByUsername(session.getUsername());
currUserGroups = gm.listGroupsByUser(currUser.getUserId()); currUserGroups = gm.listGroupsByUser(currUser.getUserId());
} }
long nowInMillis = new Date().getTime();
//for each root sub organizations (VO) //for each root sub organizations (VO)
for (GCubeGroup vOrg : rootGroupVO.getChildren()) { for (GCubeGroup vOrg : rootGroupVO.getChildren()) {
for (GCubeGroup vreOrganization : vOrg.getChildren()) { for (GCubeGroup vreOrganization : vOrg.getChildren()) {
@ -201,7 +200,7 @@ public class JoinServiceImpl extends RemoteServiceServlet implements JoinService
String vreDescription = vreOrganization.getDescription(); String vreDescription = vreOrganization.getDescription();
long logoId = vreOrganization.getLogoId(); 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 groupName = gm.getInfrastructureScope(vreOrganization.getGroupId());
String friendlyURL = GCubePortalConstants.PREFIX_GROUP_URL+vreOrganization.getFriendlyURL(); String friendlyURL = GCubePortalConstants.PREFIX_GROUP_URL+vreOrganization.getFriendlyURL();