From b8ab0415c523454a0b5eab31de929966c7b348d6 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Wed, 10 Sep 2014 12:41:37 +0000
Subject: [PATCH] gCube 3.4

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/news-feed@99677 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component             |  5 ++++-
 .../gcube/portlets/user/newsfeed/client/NewsFeed.java  |  3 ++-
 .../user/newsfeed/client/panels/NewsFeedPanel.java     |  2 ++
 .../portlets/user/newsfeed/server/NewsServiceImpl.java |  2 +-
 src/main/webapp/WEB-INF/web.xml                        | 10 ++++++++++
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 798c90f..704948a 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,7 +4,10 @@
     <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="/target/generated-sources/gwt"/>
-        <dependent-module archiveName="pickuser-widget-0.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/pickuser-widget/pickuser-widget">
+        <dependent-module archiveName="session-checker-0.2.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/session-checker/session-checker">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="wsmail-widget-1.7.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wsmail-widget/wsmail-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsFeed.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsFeed.java
index c48a84f..386e8ee 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsFeed.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsFeed.java
@@ -8,6 +8,7 @@ import net.eliasbalasis.tibcopagebus4gwt.client.PageBusListener;
 import org.gcube.portal.databook.shared.ClientFeed;
 import org.gcube.portal.databook.shared.ClientFeed.ClientFeedJsonizer;
 import org.gcube.portlets.user.newsfeed.client.panels.NewsFeedPanel;
+import org.gcube.portlets.widgets.sessionchecker.client.CheckSession;
 import org.jsonmaker.gwt.client.Jsonizer;
 
 import com.google.gwt.core.client.EntryPoint;
@@ -32,7 +33,7 @@ public class NewsFeed implements EntryPoint {
 		mainPanel = new NewsFeedPanel();
 		resize();
 		RootPanel.get(UNIQUE_DIV).add(mainPanel);
-
+		
 		Window.addResizeHandler(new ResizeHandler() {
 			public void onResize(ResizeEvent event) {
 				int width = RootPanel.get(UNIQUE_DIV).getOffsetWidth();
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java
index 29eb722..0329dd0 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java
@@ -250,6 +250,8 @@ public class NewsFeedPanel extends Composite {
 		loadingImage = new Image(loading);
 		newsPanel.add(loadingImage);
 
+		CheckSession.getInstance().startPolling();
+		
 		newsService.getUserSettings(new AsyncCallback<UserSettings>() {
 			@Override
 			public void onFailure(Throwable caught) {		
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
index e5ab628..cc761ec 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
@@ -117,7 +117,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
 	 */
 	public String getDevelopmentUser() {
 		String user = TEST_USER;
-		//user = "massimiliano.assante";
+//		user = "massimiliano.assante";
 		return user;
 	}
 	/**
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 21cc887..be77104 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -33,6 +33,16 @@
 		<servlet-name>workspaceServiceImpl</servlet-name>
 		<url-pattern>/newsfeed/WorkspaceLightService</url-pattern>
 	</servlet-mapping>	
+	
+	<servlet>
+		<servlet-name>checkServlet</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class>
+	</servlet>
+ 
+	<servlet-mapping>
+		<servlet-name>checkServlet</servlet-name>
+		<url-pattern>/newsfeed/checksession</url-pattern>
+	</servlet-mapping>
 
 	<!-- Default page to serve -->
 	<welcome-file-list>