From e8072c0db11dc064383bd23604ea50c71f2ec40a Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Mon, 29 Sep 2014 16:12:44 +0000
Subject: [PATCH] Added Session Checker

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@100264 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component             |  5 +----
 pom.xml                                                |  5 +++++
 .../portlets/user/workspace/client/AppController.java  |  9 +++++++--
 .../portlets/user/workspace/WorkspacePortlet.gwt.xml   |  4 ++--
 src/main/webapp/WEB-INF/web.xml                        | 10 ++++++++++
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 6aec920..2b4da6a 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,10 +5,7 @@
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
         <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="workspace-tree-widget-6.6.7-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="workspace-sharing-widget-1.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-sharing-widget/workspace-sharing-widget">
+        <dependent-module archiveName="workspace-tree-widget-6.6.8-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
             <dependency-type>uses</dependency-type>
         </dependent-module>
 
diff --git a/pom.xml b/pom.xml
index f4c05ab..d2977f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,11 @@
 		</dependency>
 		<!-- END FWS -->
 
+		<dependency>
+			<groupId>org.gcube.portlets.widgets</groupId>
+			<artifactId>session-checker</artifactId>
+			<version>[0.0.1-SNAPSHOT, 1.0.0-SNAPSHOT)</version>
+		</dependency>
 
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
index d02a94d..5ee6477 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
@@ -104,6 +104,7 @@ import org.gcube.portlets.user.workspace.shared.SessionExpiredException;
 import org.gcube.portlets.user.workspace.shared.TrashContent;
 import org.gcube.portlets.user.workspace.shared.TrashOperationContent;
 import org.gcube.portlets.user.workspace.shared.WorkspaceTrashOperation;
+import org.gcube.portlets.widgets.sessionchecker.client.CheckSession;
 import org.gcube.portlets.widgets.wsmail.client.forms.MailForm;
 
 import com.extjs.gxt.ui.client.event.Listener;
@@ -1192,6 +1193,8 @@ public class AppController implements SubscriberInterface {
 		else
 			initPortlet(rootPanel, instanceWithGrouping, searchingForItemId, searchParameter, itemIdParameter, operationParameter);
 
+		//CheckSession if you do not need to something when the session expire
+		CheckSession.getInstance().startPolling();
 	}
 
 	private void initPortlet(final HasWidgets rootPanel, final boolean instanceWithGrouping, boolean isSearchForItemId, final String searchParameter, final String itemIdParameter, final String operationParameter){
@@ -1612,11 +1615,13 @@ public class AppController implements SubscriberInterface {
 	@Override
 	public void viewSessionExpiredPanel() {
 
-		if(this.rootPanel!=null){
+		/*if(this.rootPanel!=null){
 			rootPanel.clear();
 			rootPanel.add(showProblems());
 			getMainPanel().setHeight(350);
-		}
+		}*/
+		
+		CheckSession.showLogoutDialog();
 	}
 
 
diff --git a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
index 68c693a..1023447 100644
--- a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
@@ -6,7 +6,7 @@
 
 	<!-- inherits GCUBE Quick tour -->
 	<!-- To Comment out -->
-<!-- 	<set-property name="user.agent" value="gecko1_8" /> -->
+	<!-- <set-property name="user.agent" value="gecko1_8" /> -->
 	<inherits name='org.gcube.portlets.widgets.guidedtour.GuidedTour' />
 
 	<inherits name="com.github.gwtbootstrap.Bootstrap" />
@@ -23,7 +23,7 @@
 	<inherits name='org.gcube.portlets.widgets.wsmail.WsMail_Widget' />
 
 	<inherits name='org.gcube.portlets.widgets.fileupload.FileUpload' />
-
+	<inherits name='org.gcube.portlets.widgets.sessionchecker.SessionChecker' />
 	<!-- Specify the app entry point class. -->
 	<entry-point
 		class='org.gcube.portlets.user.workspace.client.WorkspacePortlet' />
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 29095ec..91029b9 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -103,6 +103,16 @@
 		<servlet-name>mailWisdgetServlet</servlet-name>
 		<servlet-class>org.gcube.portlets.widgets.wsmail.server.WsMailServiceImpl</servlet-class>
 	</servlet>
+	
+	<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>/workspace/checksession</url-pattern>
+	</servlet-mapping>
 
 	<servlet-mapping>
 		<servlet-name>mailWisdgetServlet</servlet-name>