Moved to version 2.0.0 and liferay 6.2.5. Removed frame border and title from css/java. Changed a little hashtags' style

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/top-topics@128520 82a268e6-3cf1-43bd-a215-b396298e98cf

.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/top-topics-1.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/top-topics-2.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -30,5 +30,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/top-topics-1.1.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/top-topics-2.0.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>

.settings/org.eclipse.wst.common.component

@@ -4,9 +4,6 @@
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="gcube-widgets-1.9.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-widgets_trunk/gcube-widgets_trunk">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="top-topics"/>
   </wb-module>

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
   <fixed facet="wst.jsdt.web"/>
-  <installed facet="jst.web" version="2.3"/>
+  <installed facet="jst.web" version="3.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="java" version="1.7"/>
   <installed facet="liferay.portlet" version="6.0"/>

distro/changelog.xml

@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlet.user.toptopics.2-0-0"
+		date="2016-05-01">
+		<Change>Moved to Liferay 6.2</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlet.user.toptopics.1-1-0"
 		date="2015-08-28">
 		<Change>Minor Restyle</Change>

pom.xml

@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>top-topics</artifactId>
 	<packaging>war</packaging>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>Top Topics Portlet</name>
 	<description>
 		Top Topics Portle shows the top 10 topics in the scope where is deployed.
@@ -27,6 +27,7 @@
 		<!-- Convenience property to set the GWT version -->
 		<gwtVersion>2.5.1</gwtVersion>
 		<distroDirectory>distro</distroDirectory>
+		<liferayVersion>6.2.5</liferayVersion>
 		<!-- GWT needs at least java 1.6 -->
 		<maven.compiler.source>1.7</maven.compiler.source>
 		<maven.compiler.target>1.7</maven.compiler.target>
@@ -59,7 +60,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
-			<artifactId>gcube-widgets</artifactId>			
+			<artifactId>gcube-widgets</artifactId>
+			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -77,6 +79,7 @@
 		<dependency>
 			<groupId>org.gcube.dvos</groupId>
 			<artifactId>usermanagement-core</artifactId>
+			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google</groupId>
@@ -95,6 +98,7 @@
 		<dependency>
 			<groupId>com.liferay.portal</groupId>
 			<artifactId>portal-service</artifactId>
+			<version>${liferayVersion}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

src/main/java/org/gcube/portlets/user/topics/client/panel/TopicsPanel.java

@@ -50,12 +50,6 @@ public class TopicsPanel extends Composite {
 					showServError();
 				}
 				else {
-					if (!result.isInfrastructure() && hashtags != null && !hashtags.isEmpty()) {
-						mainPanel.setStyleName("trending-frame");
-						HTML name = new HTML(DISPLAY_NAME);
-						name.setStyleName("topic-title");
-						mainPanel.add(name);
-					}
 					if (hashtags != null) {
 						for (String hashtag : hashtags) {
 							HTML toAdd = new HTML(hashtag);

src/main/java/org/gcube/portlets/user/topics/server/TopicServiceImpl.java

@@ -9,7 +9,7 @@ import org.gcube.application.framework.core.session.ASLSession;
 import org.gcube.application.framework.core.session.SessionManager;
 import org.gcube.common.scope.impl.ScopeBean;
 import org.gcube.common.scope.impl.ScopeBean.Type;
-import org.gcube.portal.custom.communitymanager.OrganizationsUtil;
+import org.gcube.portal.custom.communitymanager.SiteManagerUtil;
 import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
 import org.gcube.portal.databook.client.GCubeSocialNetworking;
 import org.gcube.portal.databook.server.DBCassandraAstyanaxImpl;
@@ -18,7 +18,7 @@ import org.gcube.portlets.user.topics.client.TopicService;
 import org.gcube.portlets.user.topics.shared.HashTagAndOccurrence;
 import org.gcube.portlets.user.topics.shared.HashtagsWrapper;
 import org.gcube.vomanagement.usermanagement.GroupManager;
-import org.gcube.vomanagement.usermanagement.impl.liferay.LiferayGroupManager;
+import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -96,11 +96,11 @@ public class TopicServiceImpl extends RemoteServiceServlet implements TopicServi
 
 			if (isInfrastructure) {
 				_log.debug("****** retrieving hashtags for user VREs");
-				User currUser = OrganizationsUtil.validateUser(userName);
+				User currUser = SiteManagerUtil.validateUser(userName);
 				GroupManager gm = new LiferayGroupManager();
 				for (Organization org : currUser.getOrganizations()) {					
-					if (gm.isVRE(org.getOrganizationId()+"")) {
+					if (gm.isVRE(org.getOrganizationId())) {
-						String vreid = gm.getScope(""+org.getOrganizationId()); //get the scope 
+						String vreid = gm.getInfrastructureScope(org.getOrganizationId()); //get the scope 
 						Map<String, Integer> map = store.getVREHashtagsWithOccurrence(vreid);
 						for (String hashtag : map.keySet()) {
 							toSort.add(new HashTagAndOccurrence(hashtag, map.get(hashtag)));

src/main/webapp/TopTopics.css

@@ -1,28 +1,12 @@
-.topic-title {
+a.topiclink, a.topiclink:active, a.topiclink:visited {
-	display: block;
-	font-size: 16px;
-	color: #555;
-	font-weight: 400;
-	margin-bottom: 10px;
-}
-
-.trending-frame {
-	padding: 10px;
-	background-color: #FFF;
-	border-radius: 6px !important;
-	-moz-border-radius: 6px !important;
-	-webkit-border-radius: 6px !important;
-	border: 1px solid #DBDBDB;
-}
-
-a.topiclink,a.topiclink:active,a.topiclink:visited {
 	font-family: 'Lucida Grande', Verdana, 'Bitstream Vera Sans', Arial,
 		sans-serif;
 	font-size: 15px;
 	cursor: pointer;
 	cursor: hand;
 	text-decoration: none;
-	color: #3B5998;
+	color: #0078b2 !important;
+	font-weight: bold !important;
 }
 
 a.topiclink:hover {

src/main/webapp/WEB-INF/liferay-display.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 6.0.0//EN" "http://www.liferay.com/dtd/liferay-display_6_0_0.dtd">
+<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 6.2.0//EN" "http://www.liferay.com/dtd/liferay-display_6_2_0.dtd">
 
 <display>
 	<category name="gCube Social Apps">

src/main/webapp/WEB-INF/liferay-portlet.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 5.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_6_0_0.dtd">
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 6.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_6_2_0.dtd">
-
 <liferay-portlet-app>
 	<portlet>
 		<portlet-name>Topics</portlet-name>

src/main/webapp/WEB-INF/web.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
 
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+          http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+	version="3.0">
 
 	<!-- Servlets -->
 	<servlet>