diff --git a/pom.xml b/pom.xml index fe736e6..02f81fd 100644 --- a/pom.xml +++ b/pom.xml @@ -60,8 +60,7 @@ localRun - + org.slf4j slf4j-api diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java index bf4d678..1eda14b 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java @@ -34,7 +34,7 @@ import org.gcube.portlets.user.dataminermanager.shared.Constants; import org.gcube.portlets.user.dataminermanager.shared.data.OutputData; import org.gcube.portlets.user.dataminermanager.shared.data.computations.ComputationData; import org.gcube.portlets.user.dataminermanager.shared.data.computations.ComputationId; -import org.gcube.portlets.user.dataminermanager.shared.exception.ExpiredSessionServiceException; +import org.gcube.portlets.user.dataminermanager.shared.exception.SessionExpiredServiceException; import org.gcube.portlets.user.dataminermanager.shared.session.UserInfo; import org.gcube.portlets.user.dataminermanager.shared.workspace.DataMinerWorkArea; import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription; @@ -263,7 +263,7 @@ public class DataMinerManagerController { @Override public void onFailure(Throwable caught) { - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { UtilsGXT3.alert("Error", "Expired Session!"); EventBusProvider.INSTANCE .fireEvent(new SessionExpiredEvent()); @@ -309,7 +309,7 @@ public class DataMinerManagerController { @Override public void onFailure(Throwable caught) { - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { UtilsGXT3.alert("Error", "Expired Session!"); EventBusProvider.INSTANCE .fireEvent(new SessionExpiredEvent()); @@ -353,7 +353,7 @@ public class DataMinerManagerController { @Override public void onFailure(Throwable caught) { - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { UtilsGXT3.alert("Error", "Expired Session!"); EventBusProvider.INSTANCE .fireEvent(new SessionExpiredEvent()); @@ -394,7 +394,7 @@ public class DataMinerManagerController { @Override public void onFailure(Throwable caught) { - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { UtilsGXT3.alert("Error", "Expired Session!"); EventBusProvider.INSTANCE .fireEvent(new SessionExpiredEvent()); @@ -427,7 +427,7 @@ public class DataMinerManagerController { @Override public void onFailure(Throwable caught) { - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { UtilsGXT3.alert("Error", "Expired Session!"); EventBusProvider.INSTANCE .fireEvent(new SessionExpiredEvent()); @@ -496,7 +496,7 @@ public class DataMinerManagerController { @Override public void onFailure(Throwable caught) { - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { UtilsGXT3.alert("Error", "Expired Session"); EventBusProvider.INSTANCE .fireEvent(new SessionExpiredEvent()); @@ -558,7 +558,7 @@ public class DataMinerManagerController { @Override public void onFailure(Throwable caught) { monitor.hide(); - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { UtilsGXT3.alert("Error", "Expired Session"); EventBusProvider.INSTANCE .fireEvent(new SessionExpiredEvent()); @@ -598,7 +598,7 @@ public class DataMinerManagerController { @Override public void onFailure(Throwable caught) { monitor.hide(); - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { UtilsGXT3.alert("Error", "Expired Session"); EventBusProvider.INSTANCE .fireEvent(new SessionExpiredEvent()); diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsExecutedPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsExecutedPanel.java index d00e03b..c6d30c4 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsExecutedPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsExecutedPanel.java @@ -19,7 +19,7 @@ import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServi import org.gcube.portlets.user.dataminermanager.client.type.DataMinerWorkAreaElementType; import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3; import org.gcube.portlets.user.dataminermanager.shared.Constants; -import org.gcube.portlets.user.dataminermanager.shared.exception.ExpiredSessionServiceException; +import org.gcube.portlets.user.dataminermanager.shared.exception.SessionExpiredServiceException; import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription; import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE; @@ -516,7 +516,7 @@ public class ComputationsExecutedPanel extends FramedPanel { @Override public void onFailure(Throwable caught) { - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { EventBusProvider.INSTANCE .fireEvent(new SessionExpiredEvent()); } else { diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/InputDataSetsPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/InputDataSetsPanel.java index c24415a..7ce5112 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/InputDataSetsPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/InputDataSetsPanel.java @@ -16,7 +16,7 @@ import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServi import org.gcube.portlets.user.dataminermanager.client.type.DataMinerWorkAreaElementType; import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3; import org.gcube.portlets.user.dataminermanager.shared.Constants; -import org.gcube.portlets.user.dataminermanager.shared.exception.ExpiredSessionServiceException; +import org.gcube.portlets.user.dataminermanager.shared.exception.SessionExpiredServiceException; import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription; import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE; @@ -437,7 +437,7 @@ public class InputDataSetsPanel extends FramedPanel { @Override public void onFailure(Throwable caught) { - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { EventBusProvider.INSTANCE .fireEvent(new SessionExpiredEvent()); } else { diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/OutputDataSetsPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/OutputDataSetsPanel.java index f9de1fa..8ae5b6e 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/OutputDataSetsPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/OutputDataSetsPanel.java @@ -16,7 +16,7 @@ import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServi import org.gcube.portlets.user.dataminermanager.client.type.DataMinerWorkAreaElementType; import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3; import org.gcube.portlets.user.dataminermanager.shared.Constants; -import org.gcube.portlets.user.dataminermanager.shared.exception.ExpiredSessionServiceException; +import org.gcube.portlets.user.dataminermanager.shared.exception.SessionExpiredServiceException; import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription; import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE; @@ -435,7 +435,7 @@ public class OutputDataSetsPanel extends FramedPanel { @Override public void onFailure(Throwable caught) { - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { EventBusProvider.INSTANCE .fireEvent(new SessionExpiredEvent()); } else { diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java index f590c8b..f3eee5f 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java @@ -19,7 +19,7 @@ import org.gcube.portlets.user.dataminermanager.client.parametersfield.OperatorF import org.gcube.portlets.user.dataminermanager.client.parametersfield.TabularFld; import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync; import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3; -import org.gcube.portlets.user.dataminermanager.shared.exception.ExpiredSessionServiceException; +import org.gcube.portlets.user.dataminermanager.shared.exception.SessionExpiredServiceException; import org.gcube.portlets.user.dataminermanager.shared.parameters.ColumnListParameter; import org.gcube.portlets.user.dataminermanager.shared.parameters.ColumnParameter; import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter; @@ -201,7 +201,7 @@ public class ComputationParametersPanel extends SimpleContainer { @Override public void onFailure(Throwable caught) { - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { UtilsGXT3.alert("Error", "Expired Session!"); EventBusProvider.INSTANCE .fireEvent(new SessionExpiredEvent()); diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java index 0026e7e..bf3f9c0 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java @@ -12,7 +12,7 @@ import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider; import org.gcube.portlets.user.dataminermanager.client.events.SessionExpiredEvent; import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync; import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3; -import org.gcube.portlets.user.dataminermanager.shared.exception.ExpiredSessionServiceException; +import org.gcube.portlets.user.dataminermanager.shared.exception.SessionExpiredServiceException; import org.gcube.portlets.user.dataminermanager.shared.parameters.FileParameter; import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter; import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription; @@ -203,7 +203,7 @@ public class FileFld extends AbstractFld { public void onFailure(Throwable caught) { Log.error("Error in retrieveFileInformation: " + caught.getMessage()); - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { UtilsGXT3.alert("Error", "Expired Session"); } else { @@ -233,7 +233,7 @@ public class FileFld extends AbstractFld { @Override public void onFailure(Throwable caught) { - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { EventBusProvider.INSTANCE .fireEvent(new SessionExpiredEvent()); } else { diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java index 7acaeac..895bcd7 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java @@ -10,7 +10,7 @@ import org.gcube.portlets.user.dataminermanager.client.events.SessionExpiredEven import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync; import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3; import org.gcube.portlets.user.dataminermanager.shared.data.TableItemSimple; -import org.gcube.portlets.user.dataminermanager.shared.exception.ExpiredSessionServiceException; +import org.gcube.portlets.user.dataminermanager.shared.exception.SessionExpiredServiceException; import org.gcube.portlets.user.dataminermanager.shared.parameters.TabularParameter; import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription; import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSelectNotification.WorskpaceExplorerSelectNotificationListener; @@ -225,7 +225,7 @@ public class TabItem extends HBoxLayoutContainer { public void onFailure(Throwable caught) { Log.error("Error in retrieveTableInformation " + caught.getMessage()); - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { UtilsGXT3.alert("Error", "Expired Session"); } else { @@ -254,7 +254,7 @@ public class TabItem extends HBoxLayoutContainer { @Override public void onFailure(Throwable caught) { - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { EventBusProvider.INSTANCE .fireEvent(new SessionExpiredEvent()); } else { diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java index 0e47054..bb9b9c9 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java @@ -16,7 +16,7 @@ import org.gcube.portlets.user.dataminermanager.client.events.TabularFldChangeEv import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync; import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3; import org.gcube.portlets.user.dataminermanager.shared.data.TableItemSimple; -import org.gcube.portlets.user.dataminermanager.shared.exception.ExpiredSessionServiceException; +import org.gcube.portlets.user.dataminermanager.shared.exception.SessionExpiredServiceException; import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter; import org.gcube.portlets.user.dataminermanager.shared.parameters.TabularParameter; import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription; @@ -280,7 +280,7 @@ public class TabularFld extends AbstractFld implements public void onFailure(Throwable caught) { Log.error("Error in retrieveTableInformation " + caught.getMessage()); - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { UtilsGXT3.alert("Error", "Expired Session"); } else { @@ -308,7 +308,7 @@ public class TabularFld extends AbstractFld implements @Override public void onFailure(Throwable caught) { - if (caught instanceof ExpiredSessionServiceException) { + if (caught instanceof SessionExpiredServiceException) { EventBusProvider.INSTANCE .fireEvent(new SessionExpiredEvent()); } else { diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/SessionUtil.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/SessionUtil.java index f8bc57c..0e8c561 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/SessionUtil.java @@ -20,7 +20,7 @@ import org.gcube.portlets.user.dataminermanager.server.smservice.SClientBuilder; import org.gcube.portlets.user.dataminermanager.server.smservice.SClientDirector; import org.gcube.portlets.user.dataminermanager.server.util.ServiceCredential; import org.gcube.portlets.user.dataminermanager.shared.Constants; -import org.gcube.portlets.user.dataminermanager.shared.exception.ExpiredSessionServiceException; +import org.gcube.portlets.user.dataminermanager.shared.exception.SessionExpiredServiceException; import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException; /** @@ -51,7 +51,7 @@ public class SessionUtil { aslSession.setScope(scope); } else { logger.info("no user found in session!"); - throw new ExpiredSessionServiceException("Session Expired!"); + throw new SessionExpiredServiceException("Session Expired!"); } } else { @@ -90,7 +90,7 @@ public class SessionUtil { if(aslSession==null){ logger.error("ASLSession is null!"); - throw new ExpiredSessionServiceException("Session Expired!"); + throw new SessionExpiredServiceException("Session Expired!"); } SClient sClient; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/exception/ExpiredSessionServiceException.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/exception/SessionExpiredServiceException.java similarity index 59% rename from src/main/java/org/gcube/portlets/user/dataminermanager/shared/exception/ExpiredSessionServiceException.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/shared/exception/SessionExpiredServiceException.java index 644e518..24ec0c3 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/exception/ExpiredSessionServiceException.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/exception/SessionExpiredServiceException.java @@ -1,12 +1,12 @@ package org.gcube.portlets.user.dataminermanager.shared.exception; /** - * ASL Session Expired Exception + * Session Expired Service Exception * * @author "Giancarlo Panichi" * */ -public class ExpiredSessionServiceException extends +public class SessionExpiredServiceException extends ServiceException { private static final long serialVersionUID = -4831171355042165166L; @@ -14,14 +14,14 @@ public class ExpiredSessionServiceException extends /** * */ - public ExpiredSessionServiceException() { + public SessionExpiredServiceException() { super(); } /** * @param message */ - public ExpiredSessionServiceException(String message) { + public SessionExpiredServiceException(String message) { super(message); } @@ -30,7 +30,7 @@ public class ExpiredSessionServiceException extends * @param message * @param t */ - public ExpiredSessionServiceException(String message, Throwable t) { + public SessionExpiredServiceException(String message, Throwable t) { super(message, t); }