diff --git a/pom.xml b/pom.xml
index b5c5bfd..ea435a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,17 @@
aslcore
provided
+
+
+ org.gcube.portlets.user
+ gcube-widgets
+
+
+
+ org.gcube.portlets.widgets
+ session-checker
+ [0.0.0-SNAPSHOT,1.0.0-SNAPSHOT)
+
diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/DatabasesManager.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/DatabasesManager.java
index 3f31948..bf208a6 100644
--- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/DatabasesManager.java
+++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/DatabasesManager.java
@@ -12,6 +12,7 @@ import com.google.gwt.user.client.ui.RootPanel;
import org.gcube.portlets.user.databasesmanager.client.panels.GxtBorderLayoutPanel;
import org.gcube.portlets.user.databasesmanager.client.resources.Resources;
import org.gcube.portlets.user.databasesmanager.client.utils.ConstantsPortlet;
+import org.gcube.portlets.widgets.sessionchecker.client.CheckSession;
/**
* @author "Loredana Liccardo loredana.liccardo@isti.cnr.it"
@@ -31,6 +32,8 @@ public class DatabasesManager implements EntryPoint {
*/
public void onModuleLoad() {
+
+ CheckSession.getInstance().startPolling();
HandlerManager eventBus = new HandlerManager(this);
diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java b/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java
index 55b3454..01bd834 100644
--- a/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java
@@ -115,7 +115,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements
// config.setOverflowToDisk(true);
} catch (Exception e) {
- logger.error("dbmanager-> Failed to get cache: " + e);
+ logger.error("dbmanager-> Failed to get cache: ", e);
// e.printStackTrace();
throw e;
}
@@ -152,7 +152,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements
} catch (Exception e) {
// TODO: handle exception
- logger.error("dbmanager-> " + e);
+ logger.error("dbmanager-> ", e);
// e.printStackTrace();
}
@@ -279,7 +279,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements
// TODO: handle exception
// e.printStackTrace();
// throw new Exception("Failed to load data. " + e);
- logger.error("dbmanager-> " + e);
+ logger.error("dbmanager-> ", e);
throw e;
}
// }
@@ -377,7 +377,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements
// TODO: handle exception
// e.printStackTrace();
// throw new Exception("Failed to load data " + );
- logger.error("dbmanager-> " + e);
+ logger.error("dbmanager-> ", e);
throw e;
}
@@ -486,7 +486,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements
// TODO: handle exception
// e.printStackTrace();
// throw new Exception("Failed to load data. " + e);
- logger.error("dbmanager-> " + e);
+ logger.error("dbmanager-> ", e);
throw e;
}
@@ -607,7 +607,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements
} catch (Exception e) {
// e.printStackTrace();
// throw new Exception("Failed to load data. " + e);
- logger.error("dbmanager-> " + e);
+ logger.error("dbmanager-> ", e);
throw e;
}
@@ -878,7 +878,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements
"javax.xml.ws.soap.SOAPFaultException: java.lang.IndexOutOfBoundsException")) {
e = new Exception("ServerException");
}
- logger.error("dbmanager-> " + e);
+ logger.error("dbmanager-> ", e);
throw e;
}
@@ -1674,7 +1674,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements
} catch (Exception e) {
logger.info("dbmanager-> startComputation: the job submit has failed!");
// e.printStackTrace();
- logger.error("dbmanager-> " + e);
+ logger.error("dbmanager-> ", e);
throw e;
}
}
@@ -1752,7 +1752,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements
if (smResType.equals(SMResourceType.ERROR)) {
Exception e = new Exception(smResource.description());
// e.printStackTrace();
- logger.error("dbmanager-> " + e);
+ logger.error("dbmanager-> ", e);
throw e;
}
}
@@ -1880,7 +1880,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements
logger.info("dbmanager-> Could not remove the computation ID "
+ computationId + " corresponding to jobID "
+ uidSubmitQuery);
- logger.error("dbmanager-> " + e);
+ logger.error("dbmanager-> ", e);
}
}
// remove job status
@@ -2015,7 +2015,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements
employeeCache.remove(key);
} catch (Exception e) {
// TODO: handle exception
- logger.error("dbmanager-> " + e);
+ logger.error("dbmanager-> ", e);
throw new Exception("Failure to clear the cache. " + e);
}
}
@@ -2050,7 +2050,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements
}
} catch (Exception e) {
- logger.error(e);
+ logger.error("dbmanager-> ", e);
throw e;
} finally {
diff --git a/src/main/resources/org/gcube/portlets/user/databasesmanager/DatabasesManager.gwt.xml b/src/main/resources/org/gcube/portlets/user/databasesmanager/DatabasesManager.gwt.xml
index 7302a74..c7551cd 100644
--- a/src/main/resources/org/gcube/portlets/user/databasesmanager/DatabasesManager.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/databasesmanager/DatabasesManager.gwt.xml
@@ -14,9 +14,14 @@
-
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index e3e898a..bd87f43 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -17,10 +17,15 @@
com.google.gwt.junit.server.JUnitHostImpl
-
-
-
-
+
+
+
+
+
+
+ checkServlet
+ org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl
+
@@ -37,6 +42,11 @@
jUnitHostImpl
/databasesmanager/junithost/*
+
+
+ checkServlet
+ /databasesmanager/checksession
+