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 @@
-
- uses
-
-
+
uses
diff --git a/pom.xml b/pom.xml
index f4c05ab..d2977f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,11 @@
+
+ org.gcube.portlets.widgets
+ session-checker
+ [0.0.1-SNAPSHOT, 1.0.0-SNAPSHOT)
+
org.gcube.portlets.user
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 @@
-
+
@@ -23,7 +23,7 @@
-
+
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 @@
mailWisdgetServlet
org.gcube.portlets.widgets.wsmail.server.WsMailServiceImpl
+
+
+ checkServlet
+ org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl
+
+
+
+ checkServlet
+ /workspace/checksession
+
mailWisdgetServlet