From 2ddc168d8e4428f115e302a59ee2af30867cc813 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 18 Jun 2014 15:19:20 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@97521 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../td/gwtservice/server/SessionUtil.java | 7 +- .../gwtservice/server/TDGWTServiceImpl.java | 192 +++++++++++++++++- .../td/gwtservice/shared/tr/TabResource.java | 14 +- 3 files changed, 202 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java index 1f3fe6b..7760cb7 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java @@ -17,6 +17,7 @@ import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; import org.gcube.portlets.user.td.gwtservice.server.file.CSVFileUploadSession; import org.gcube.portlets.user.td.gwtservice.server.file.CodelistMappingFileUploadSession; import org.gcube.portlets.user.td.gwtservice.server.trservice.TRTasksManager; +import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingMonitor; import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession; @@ -86,8 +87,8 @@ public class SessionUtil { ASLSession session; if (username == null) { logger.warn("no user found in session, using test one"); - throw new TDGWTSessionExpiredException("Session Expired!"); - /* + /*throw new TDGWTSessionExpiredException("Session Expired!")*/; + username = Constants.DEFAULT_USER; String scope = Constants.DEFAULT_SCOPE; @@ -95,7 +96,7 @@ public class SessionUtil { session = SessionManager.getInstance().getASLSession( httpSession.getId(), username); session.setScope(scope); - */ + } else { session = SessionManager.getInstance().getASLSession( httpSession.getId(), username); diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java index 694728d..c2609cb 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java @@ -36,7 +36,7 @@ import org.gcube.common.resources.gcore.ServiceEndpoint.Profile; import org.gcube.common.resources.gcore.utils.Group; import org.gcube.data.analysis.tabulardata.commons.utils.AuthorizationProvider; import org.gcube.data.analysis.tabulardata.commons.utils.AuthorizationToken; -import org.gcube.data.analysis.tabulardata.commons.webservice.exception.SecurityException; + import org.gcube.data.analysis.tabulardata.commons.webservice.types.TaskStatus; import org.gcube.data.analysis.tabulardata.commons.webservice.types.TemplateDescription; import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationDefinition; @@ -271,6 +271,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (Throwable e) { logger.error( "Error setting TabResource parameter: " @@ -310,6 +311,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error("getCurrentTRID(): " + e.getLocalizedMessage(), e); throw new TDGWTServiceException("Error retrieving TR id: " @@ -354,11 +358,13 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements TabularResource tr = service .getTabularResource(new TabularResourceId(Long .valueOf(currentTR.getTrId().getId()))); - + + currentTR.setDate(sdf.format(tr.getCreationDate().getTime())); currentTR.setValid(tr.isValid()); currentTR.setFinalized(tr.isFinalized()); - + Contacts owner=new Contacts("", tr.getOwner(), false); + currentTR.setOwner(owner); SessionUtil.setTabResource(session, currentTR); logger.debug("GetTabResourceInformation() updated information:" + currentTR.toString()); @@ -366,6 +372,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error( "Error setting TabResource parameter: " @@ -412,6 +421,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements currentTR.setDate(sdf.format(tr.getCreationDate().getTime())); currentTR.setValid(tr.isValid()); currentTR.setFinalized(tr.isFinalized()); + Contacts owner=new Contacts("", tr.getOwner(), false); + currentTR.setOwner(owner); logger.debug("GetTabResourceInformation() updated information:" + currentTR.toString()); @@ -419,6 +430,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error( "Error setting TabResource parameter: " @@ -570,6 +584,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error( "Error retrieving Columns: " + e.getLocalizedMessage(), e); @@ -684,6 +701,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error( "Error retrieving Columns: " + e.getLocalizedMessage(), e); @@ -802,6 +822,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error("Error retrieving Column: " + e.getLocalizedMessage(), e); @@ -920,6 +943,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error("Error retrieving Column: " + e.getLocalizedMessage(), e); @@ -1028,6 +1054,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error( "Error retrieving Validation Columns: " @@ -1198,6 +1227,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error("Error in getLastTable(): " + e.getLocalizedMessage(), e); @@ -1367,6 +1399,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error("Error in getTable(): " + e.getLocalizedMessage(), e); throw new TDGWTServiceException("Error in getTable(): " @@ -1456,6 +1491,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements t.setTrId(trId); t.setValid(tr.isValid()); t.setFinalized(tr.isFinalized()); + Contacts owner=new Contacts("", tr.getOwner(), false); + t.setOwner(owner); + if (tr.contains(NameMetadata.class)) { NameMetadata nameMeta = tr.getMetadata(NameMetadata.class); if (nameMeta != null && nameMeta.getValue() != null) { @@ -1609,6 +1647,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); logger.error("Error retrieving Codelist in setCodelistsPagingLoader(): " @@ -1689,6 +1730,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); logger.error("Error retrieving Codelist in getCodelistsPagingLoader(): " @@ -1976,6 +2020,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); logger.error("Error retrieving TabularResources: " @@ -2030,6 +2077,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); logger.error("Error retrieving TabularResources: " @@ -2075,6 +2125,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error( "Error deleting the tabular resource: " @@ -2119,6 +2172,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error( "Error creating new TabularResource: " @@ -2257,6 +2313,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error in Client Library Request: " @@ -2319,6 +2378,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error in Client Library Request: " @@ -2428,6 +2490,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException( @@ -2450,6 +2513,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (Throwable e) { logger.error( "Error setting SDMXRegistrySource parameter: " @@ -2998,8 +3062,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements .getId()))); logger.debug("IsTabularResourceValid: " + tr.isValid()); return tr.isValid(); + } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error("Error checking if it is a valid tabular resource: " + e.getLocalizedMessage(), e); @@ -3035,6 +3103,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return tr.isFinalized(); } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error( "Error checking if it is a finalized tabular resource: " @@ -3112,6 +3183,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error( "Error in getTRMetadata(): " + e.getLocalizedMessage(), e); @@ -3166,6 +3240,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error( "Error in getTableValidationMetadata(): " @@ -3614,6 +3691,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements try { trTask = service.execute(invocation, new TabularResourceId(Long.valueOf(trId.getId()))); + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException( @@ -4576,6 +4656,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error in ChangeColumnType: " @@ -4728,6 +4811,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error in AddColumn: " @@ -4877,6 +4963,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error in DeleteColumn: " @@ -5028,6 +5117,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return; } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error Changing The Column Label: " @@ -5177,6 +5269,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return; } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error Changing Table Type: " @@ -5400,6 +5495,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return columns; } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error( "Error in getColumnsForDimension() retrieving Columns: " @@ -5441,6 +5539,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return; } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error Deleting Rows: " @@ -5620,6 +5721,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return trId; } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error Cloning: " @@ -5660,6 +5764,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return; } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException( @@ -5812,6 +5919,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return shareInfo; } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error in getShareInfo: " @@ -5850,7 +5960,6 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (SecurityException e) { e.printStackTrace(); throw new TDGWTServiceException(e.getLocalizedMessage()); - } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error on service"); @@ -5908,6 +6017,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.debug("Error in setTabResourceInformation: " + e.getLocalizedMessage()); @@ -5945,6 +6057,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.debug("Error in GetOccurencesForBatchReplace: " + e.getLocalizedMessage()); @@ -6004,6 +6119,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.debug("Error in GetTemplates: " + e.getLocalizedMessage()); e.printStackTrace(); @@ -6041,6 +6159,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.debug("Error StartTemplateApply: " + e.getLocalizedMessage()); e.printStackTrace(); @@ -6151,6 +6272,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException( @@ -6188,6 +6312,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements e.printStackTrace(); throw new TDGWTServiceException( "Error StartTemplateDelete: No such Template"); + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.debug("Error StartTemplateDelete: " + e.getLocalizedMessage()); @@ -6231,6 +6358,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException( @@ -6390,6 +6520,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException( @@ -6597,6 +6730,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.debug("getLastOperationInfo(): " + e.getLocalizedMessage()); e.printStackTrace(); @@ -6651,6 +6787,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.debug("getLastOperationInfo(): " + e.getLocalizedMessage()); e.printStackTrace(); @@ -6711,6 +6850,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.debug("getHistory(): " + e.getLocalizedMessage()); e.printStackTrace(); @@ -6765,6 +6907,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.debug("getHistory(): " + e.getLocalizedMessage()); e.printStackTrace(); @@ -6827,6 +6972,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.debug("discard(): " + e.getLocalizedMessage()); e.printStackTrace(); @@ -6866,8 +7014,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Start Task on service: " + trTask.getId()); SessionUtil.setRollBackSessionTask(session, trTask); return; + } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.debug("rollBack(): " + e.getLocalizedMessage()); e.printStackTrace(); @@ -6972,6 +7124,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return rollBackMonitor; } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.debug("Error in RollBackSessionMonitor: " + e.getLocalizedMessage()); @@ -7058,6 +7213,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return validationsTasksMetadata; } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { logger.error( "Error in getValidationsTasksMetadata(): " @@ -7103,6 +7261,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error in operation: " @@ -7201,7 +7362,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("EditMonitor(): " + editRowMonitor); return editRowMonitor; } catch (TDGWTSessionExpiredException e) { - throw e; + throw e; } catch (Throwable e) { logger.debug("Error in EditRowMonitor: " + e.getLocalizedMessage()); e.printStackTrace(); @@ -7288,9 +7449,13 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Resubmit Task on service: TaskId " + trTask.getId()); SessionUtil.setTaskResubmitTask(session, trTask); return; - + + } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error in resubmit task: " @@ -7389,6 +7554,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("TaskResubmitMonitor(): " + taskResubmitMonitor); return taskResubmitMonitor; + + + } catch (TDGWTSessionExpiredException e) { throw e; } catch (Throwable e) { @@ -7435,6 +7603,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error in resume task: " @@ -7583,6 +7754,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error in extract codelist: " @@ -7728,6 +7902,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error in split column: " @@ -7873,6 +8050,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } catch (TDGWTSessionExpiredException e) { throw e; + } catch (SecurityException e) { + e.printStackTrace(); + throw new TDGWTServiceException(e.getLocalizedMessage()); } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException("Error in split column: " diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TabResource.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TabResource.java index 7899183..7f85c59 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TabResource.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/TabResource.java @@ -2,6 +2,7 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr; import java.io.Serializable; +import org.gcube.portlets.user.td.gwtservice.shared.share.Contacts; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; @@ -24,6 +25,7 @@ public class TabResource implements Serializable { protected String agency; protected String date; protected String right; + protected Contacts owner; protected boolean valid; protected boolean finalized; @@ -104,6 +106,14 @@ public class TabResource implements Serializable { this.description = description; } + public Contacts getOwner() { + return owner; + } + + public void setOwner(Contacts owner) { + this.owner = owner; + } + public boolean isValid() { return valid; } @@ -124,8 +134,8 @@ public class TabResource implements Serializable { public String toString() { return "TabResource [trId=" + trId + ", id=" + id + ", name=" + name + ", description=" + description + ", agency=" + agency - + ", date=" + date + ", right=" + right + ", valid=" + valid - + ", finalized=" + finalized + "]"; + + ", date=" + date + ", right=" + right + ", owner=" + owner + + ", valid=" + valid + ", finalized=" + finalized + "]"; }