refs 2521: Explore the possibility to port the StatMan interface onto Dataminer
https://support.d4science.org/issues/2521 Updated to Liferay 6.2 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@129241 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
a2691a1552
commit
c5194dbe18
3
pom.xml
3
pom.xml
|
@ -60,8 +60,7 @@
|
||||||
<profile>
|
<profile>
|
||||||
<id>localRun</id>
|
<id>localRun</id>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<!-- <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId>
|
<!-- Logger -->
|
||||||
<version>2.7.1</version> </dependency> -->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
|
|
|
@ -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.OutputData;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.data.computations.ComputationData;
|
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.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.session.UserInfo;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.workspace.DataMinerWorkArea;
|
import org.gcube.portlets.user.dataminermanager.shared.workspace.DataMinerWorkArea;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;
|
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;
|
||||||
|
@ -263,7 +263,7 @@ public class DataMinerManagerController {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
UtilsGXT3.alert("Error", "Expired Session!");
|
UtilsGXT3.alert("Error", "Expired Session!");
|
||||||
EventBusProvider.INSTANCE
|
EventBusProvider.INSTANCE
|
||||||
.fireEvent(new SessionExpiredEvent());
|
.fireEvent(new SessionExpiredEvent());
|
||||||
|
@ -309,7 +309,7 @@ public class DataMinerManagerController {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
UtilsGXT3.alert("Error", "Expired Session!");
|
UtilsGXT3.alert("Error", "Expired Session!");
|
||||||
EventBusProvider.INSTANCE
|
EventBusProvider.INSTANCE
|
||||||
.fireEvent(new SessionExpiredEvent());
|
.fireEvent(new SessionExpiredEvent());
|
||||||
|
@ -353,7 +353,7 @@ public class DataMinerManagerController {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
UtilsGXT3.alert("Error", "Expired Session!");
|
UtilsGXT3.alert("Error", "Expired Session!");
|
||||||
EventBusProvider.INSTANCE
|
EventBusProvider.INSTANCE
|
||||||
.fireEvent(new SessionExpiredEvent());
|
.fireEvent(new SessionExpiredEvent());
|
||||||
|
@ -394,7 +394,7 @@ public class DataMinerManagerController {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
UtilsGXT3.alert("Error", "Expired Session!");
|
UtilsGXT3.alert("Error", "Expired Session!");
|
||||||
EventBusProvider.INSTANCE
|
EventBusProvider.INSTANCE
|
||||||
.fireEvent(new SessionExpiredEvent());
|
.fireEvent(new SessionExpiredEvent());
|
||||||
|
@ -427,7 +427,7 @@ public class DataMinerManagerController {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
UtilsGXT3.alert("Error", "Expired Session!");
|
UtilsGXT3.alert("Error", "Expired Session!");
|
||||||
EventBusProvider.INSTANCE
|
EventBusProvider.INSTANCE
|
||||||
.fireEvent(new SessionExpiredEvent());
|
.fireEvent(new SessionExpiredEvent());
|
||||||
|
@ -496,7 +496,7 @@ public class DataMinerManagerController {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
UtilsGXT3.alert("Error", "Expired Session");
|
UtilsGXT3.alert("Error", "Expired Session");
|
||||||
EventBusProvider.INSTANCE
|
EventBusProvider.INSTANCE
|
||||||
.fireEvent(new SessionExpiredEvent());
|
.fireEvent(new SessionExpiredEvent());
|
||||||
|
@ -558,7 +558,7 @@ public class DataMinerManagerController {
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
monitor.hide();
|
monitor.hide();
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
UtilsGXT3.alert("Error", "Expired Session");
|
UtilsGXT3.alert("Error", "Expired Session");
|
||||||
EventBusProvider.INSTANCE
|
EventBusProvider.INSTANCE
|
||||||
.fireEvent(new SessionExpiredEvent());
|
.fireEvent(new SessionExpiredEvent());
|
||||||
|
@ -598,7 +598,7 @@ public class DataMinerManagerController {
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
monitor.hide();
|
monitor.hide();
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
UtilsGXT3.alert("Error", "Expired Session");
|
UtilsGXT3.alert("Error", "Expired Session");
|
||||||
EventBusProvider.INSTANCE
|
EventBusProvider.INSTANCE
|
||||||
.fireEvent(new SessionExpiredEvent());
|
.fireEvent(new SessionExpiredEvent());
|
||||||
|
|
|
@ -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.type.DataMinerWorkAreaElementType;
|
||||||
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
|
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.Constants;
|
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.user.dataminermanager.shared.workspace.ItemDescription;
|
||||||
import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener;
|
import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener;
|
||||||
import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE;
|
import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE;
|
||||||
|
@ -516,7 +516,7 @@ public class ComputationsExecutedPanel extends FramedPanel {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
EventBusProvider.INSTANCE
|
EventBusProvider.INSTANCE
|
||||||
.fireEvent(new SessionExpiredEvent());
|
.fireEvent(new SessionExpiredEvent());
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -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.type.DataMinerWorkAreaElementType;
|
||||||
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
|
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.Constants;
|
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.user.dataminermanager.shared.workspace.ItemDescription;
|
||||||
import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener;
|
import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener;
|
||||||
import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE;
|
import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE;
|
||||||
|
@ -437,7 +437,7 @@ public class InputDataSetsPanel extends FramedPanel {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
EventBusProvider.INSTANCE
|
EventBusProvider.INSTANCE
|
||||||
.fireEvent(new SessionExpiredEvent());
|
.fireEvent(new SessionExpiredEvent());
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -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.type.DataMinerWorkAreaElementType;
|
||||||
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
|
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.Constants;
|
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.user.dataminermanager.shared.workspace.ItemDescription;
|
||||||
import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener;
|
import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener;
|
||||||
import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE;
|
import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE;
|
||||||
|
@ -435,7 +435,7 @@ public class OutputDataSetsPanel extends FramedPanel {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
EventBusProvider.INSTANCE
|
EventBusProvider.INSTANCE
|
||||||
.fireEvent(new SessionExpiredEvent());
|
.fireEvent(new SessionExpiredEvent());
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -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.parametersfield.TabularFld;
|
||||||
import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync;
|
import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync;
|
||||||
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
|
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.ColumnListParameter;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.parameters.ColumnParameter;
|
import org.gcube.portlets.user.dataminermanager.shared.parameters.ColumnParameter;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
|
import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
|
||||||
|
@ -201,7 +201,7 @@ public class ComputationParametersPanel extends SimpleContainer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
UtilsGXT3.alert("Error", "Expired Session!");
|
UtilsGXT3.alert("Error", "Expired Session!");
|
||||||
EventBusProvider.INSTANCE
|
EventBusProvider.INSTANCE
|
||||||
.fireEvent(new SessionExpiredEvent());
|
.fireEvent(new SessionExpiredEvent());
|
||||||
|
|
|
@ -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.events.SessionExpiredEvent;
|
||||||
import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync;
|
import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync;
|
||||||
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
|
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.FileParameter;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
|
import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;
|
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;
|
||||||
|
@ -203,7 +203,7 @@ public class FileFld extends AbstractFld {
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
Log.error("Error in retrieveFileInformation: "
|
Log.error("Error in retrieveFileInformation: "
|
||||||
+ caught.getMessage());
|
+ caught.getMessage());
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
UtilsGXT3.alert("Error", "Expired Session");
|
UtilsGXT3.alert("Error", "Expired Session");
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
@ -233,7 +233,7 @@ public class FileFld extends AbstractFld {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
EventBusProvider.INSTANCE
|
EventBusProvider.INSTANCE
|
||||||
.fireEvent(new SessionExpiredEvent());
|
.fireEvent(new SessionExpiredEvent());
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -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.rpc.DataMinerPortletServiceAsync;
|
||||||
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
|
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.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.parameters.TabularParameter;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;
|
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;
|
||||||
import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSelectNotification.WorskpaceExplorerSelectNotificationListener;
|
import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSelectNotification.WorskpaceExplorerSelectNotificationListener;
|
||||||
|
@ -225,7 +225,7 @@ public class TabItem extends HBoxLayoutContainer {
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
Log.error("Error in retrieveTableInformation "
|
Log.error("Error in retrieveTableInformation "
|
||||||
+ caught.getMessage());
|
+ caught.getMessage());
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
UtilsGXT3.alert("Error", "Expired Session");
|
UtilsGXT3.alert("Error", "Expired Session");
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
@ -254,7 +254,7 @@ public class TabItem extends HBoxLayoutContainer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
EventBusProvider.INSTANCE
|
EventBusProvider.INSTANCE
|
||||||
.fireEvent(new SessionExpiredEvent());
|
.fireEvent(new SessionExpiredEvent());
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -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.rpc.DataMinerPortletServiceAsync;
|
||||||
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
|
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.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.Parameter;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.parameters.TabularParameter;
|
import org.gcube.portlets.user.dataminermanager.shared.parameters.TabularParameter;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;
|
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;
|
||||||
|
@ -280,7 +280,7 @@ public class TabularFld extends AbstractFld implements
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
Log.error("Error in retrieveTableInformation "
|
Log.error("Error in retrieveTableInformation "
|
||||||
+ caught.getMessage());
|
+ caught.getMessage());
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
UtilsGXT3.alert("Error", "Expired Session");
|
UtilsGXT3.alert("Error", "Expired Session");
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
@ -308,7 +308,7 @@ public class TabularFld extends AbstractFld implements
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
if (caught instanceof ExpiredSessionServiceException) {
|
if (caught instanceof SessionExpiredServiceException) {
|
||||||
EventBusProvider.INSTANCE
|
EventBusProvider.INSTANCE
|
||||||
.fireEvent(new SessionExpiredEvent());
|
.fireEvent(new SessionExpiredEvent());
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -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.smservice.SClientDirector;
|
||||||
import org.gcube.portlets.user.dataminermanager.server.util.ServiceCredential;
|
import org.gcube.portlets.user.dataminermanager.server.util.ServiceCredential;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.Constants;
|
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;
|
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -51,7 +51,7 @@ public class SessionUtil {
|
||||||
aslSession.setScope(scope);
|
aslSession.setScope(scope);
|
||||||
} else {
|
} else {
|
||||||
logger.info("no user found in session!");
|
logger.info("no user found in session!");
|
||||||
throw new ExpiredSessionServiceException("Session Expired!");
|
throw new SessionExpiredServiceException("Session Expired!");
|
||||||
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -90,7 +90,7 @@ public class SessionUtil {
|
||||||
|
|
||||||
if(aslSession==null){
|
if(aslSession==null){
|
||||||
logger.error("ASLSession is null!");
|
logger.error("ASLSession is null!");
|
||||||
throw new ExpiredSessionServiceException("Session Expired!");
|
throw new SessionExpiredServiceException("Session Expired!");
|
||||||
}
|
}
|
||||||
SClient sClient;
|
SClient sClient;
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
package org.gcube.portlets.user.dataminermanager.shared.exception;
|
package org.gcube.portlets.user.dataminermanager.shared.exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ASL Session Expired Exception
|
* Session Expired Service Exception
|
||||||
*
|
*
|
||||||
* @author "Giancarlo Panichi"
|
* @author "Giancarlo Panichi"
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class ExpiredSessionServiceException extends
|
public class SessionExpiredServiceException extends
|
||||||
ServiceException {
|
ServiceException {
|
||||||
|
|
||||||
private static final long serialVersionUID = -4831171355042165166L;
|
private static final long serialVersionUID = -4831171355042165166L;
|
||||||
|
@ -14,14 +14,14 @@ public class ExpiredSessionServiceException extends
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public ExpiredSessionServiceException() {
|
public SessionExpiredServiceException() {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param message
|
* @param message
|
||||||
*/
|
*/
|
||||||
public ExpiredSessionServiceException(String message) {
|
public SessionExpiredServiceException(String message) {
|
||||||
super(message);
|
super(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ public class ExpiredSessionServiceException extends
|
||||||
* @param message
|
* @param message
|
||||||
* @param t
|
* @param t
|
||||||
*/
|
*/
|
||||||
public ExpiredSessionServiceException(String message, Throwable t) {
|
public SessionExpiredServiceException(String message, Throwable t) {
|
||||||
super(message, t);
|
super(message, t);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue