From 21739bac2ccd0aa284b288ab1e9a2864e50fbc53 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 24 Jan 2017 14:42:41 +0000 Subject: [PATCH] refs 6548: TDM - Migrate TabMan to new PortalContext Task-Url: https://support.d4science.org/issues/6548 Updated to new PortalContext git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@141738 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/CodelistMappingUploadServlet.java | 68 ++++++++++--------- .../user/td/gwtservice/shared/Constants.java | 8 +++ 2 files changed, 43 insertions(+), 33 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CodelistMappingUploadServlet.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CodelistMappingUploadServlet.java index 42531b5..b8bf73d 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CodelistMappingUploadServlet.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/CodelistMappingUploadServlet.java @@ -80,7 +80,7 @@ public class CodelistMappingUploadServlet extends HttpServlet { scopeGroupId); ScopeProvider.instance.set(serviceCredentials.getScope()); - + } catch (TDGWTServiceException e) { logger.error( "Error retrieving credentials:" + e.getLocalizedMessage(), @@ -88,26 +88,25 @@ public class CodelistMappingUploadServlet extends HttpServlet { throw new ServletException(e.getLocalizedMessage()); } - - CodelistMappingFileUploadSession codelistMappingFileUploadSession = new CodelistMappingFileUploadSession(); // CodelistMappingMonitor codelistMappingMonitor=new // CodelistMappingMonitor(); FileUploadMonitor fileUploadMonitor = new FileUploadMonitor(); - - String id=UUID.randomUUID().toString(); - logger.info("Upload Id: "+id); + + String id = UUID.randomUUID().toString(); + logger.info("Upload Id: " + id); codelistMappingFileUploadSession.setId(id); codelistMappingFileUploadSession .setFileUploadState(FileUploadState.STARTED); // codelistMappingFileUploadSession.setCodelistMappingMonitor(codelistMappingMonitor); - SessionUtil.setFileUploadMonitor(request, serviceCredentials, fileUploadMonitor); + SessionUtil.setFileUploadMonitor(request, serviceCredentials, + fileUploadMonitor); try { - SessionUtil.setCodelistMappingFileUploadSession(request, serviceCredentials, - codelistMappingFileUploadSession); + SessionUtil.setCodelistMappingFileUploadSession(request, + serviceCredentials, codelistMappingFileUploadSession); } catch (Exception e) { - logger.error(e.getLocalizedMessage(),e); + logger.error(e.getLocalizedMessage(), e); throw new ServletException(e.getLocalizedMessage()); } @@ -131,11 +130,12 @@ public class CodelistMappingUploadServlet extends HttpServlet { } } } catch (FileUploadException e) { - FileUploadMonitor fum=null; + FileUploadMonitor fum = null; try { - fum = SessionUtil.getFileUploadMonitor(request, serviceCredentials); + fum = SessionUtil.getFileUploadMonitor(request, + serviceCredentials); } catch (TDGWTServiceException e1) { - logger.error(e1.getLocalizedMessage(),e1); + logger.error(e1.getLocalizedMessage(), e1); throw new ServletException(e1.getLocalizedMessage()); } fum.setFailed("An error occured elaborating the HTTP request", @@ -144,10 +144,10 @@ public class CodelistMappingUploadServlet extends HttpServlet { codelistMappingFileUploadSession .setFileUploadState(FileUploadState.FAILED); try { - SessionUtil.setCodelistMappingFileUploadSession(request, serviceCredentials, - codelistMappingFileUploadSession); + SessionUtil.setCodelistMappingFileUploadSession(request, + serviceCredentials, codelistMappingFileUploadSession); } catch (Exception e1) { - logger.error(e1.getLocalizedMessage(),e1); + logger.error(e1.getLocalizedMessage(), e1); throw new ServletException(e1.getLocalizedMessage()); } logger.error("Error processing request in upload servlet", e); @@ -157,11 +157,12 @@ public class CodelistMappingUploadServlet extends HttpServlet { } if (uploadItem == null) { - FileUploadMonitor fum=null; + FileUploadMonitor fum = null; try { - fum = SessionUtil.getFileUploadMonitor(request, serviceCredentials); + fum = SessionUtil.getFileUploadMonitor(request, + serviceCredentials); } catch (TDGWTServiceException e1) { - logger.error(e1.getLocalizedMessage(),e1); + logger.error(e1.getLocalizedMessage(), e1); throw new ServletException(e1.getLocalizedMessage()); } fum.setFailed( @@ -172,10 +173,10 @@ public class CodelistMappingUploadServlet extends HttpServlet { codelistMappingFileUploadSession .setFileUploadState(FileUploadState.FAILED); try { - SessionUtil.setCodelistMappingFileUploadSession(request, serviceCredentials, - codelistMappingFileUploadSession); + SessionUtil.setCodelistMappingFileUploadSession(request, + serviceCredentials, codelistMappingFileUploadSession); } catch (Exception e) { - logger.error(e.getLocalizedMessage(),e); + logger.error(e.getLocalizedMessage(), e); throw new ServletException(e.getLocalizedMessage()); } logger.error("Error processing request in upload servlet: No file to upload"); @@ -194,11 +195,12 @@ public class CodelistMappingUploadServlet extends HttpServlet { uploadItem.getInputStream(), uploadItem.getName(), contentType); } catch (Exception e) { - FileUploadMonitor fum=null; + FileUploadMonitor fum = null; try { - fum = SessionUtil.getFileUploadMonitor(request, serviceCredentials); + fum = SessionUtil.getFileUploadMonitor(request, + serviceCredentials); } catch (TDGWTServiceException e1) { - logger.error(e1.getLocalizedMessage(),e1); + logger.error(e1.getLocalizedMessage(), e1); throw new ServletException(e1.getLocalizedMessage()); } fum.setFailed("An error occured elaborating the file", @@ -208,10 +210,10 @@ public class CodelistMappingUploadServlet extends HttpServlet { codelistMappingFileUploadSession .setFileUploadState(FileUploadState.FAILED); try { - SessionUtil.setCodelistMappingFileUploadSession(request, serviceCredentials, - codelistMappingFileUploadSession); + SessionUtil.setCodelistMappingFileUploadSession(request, + serviceCredentials, codelistMappingFileUploadSession); } catch (Exception e1) { - logger.error(e1.getLocalizedMessage(),e1); + logger.error(e1.getLocalizedMessage(), e1); throw new ServletException(e1.getLocalizedMessage()); } logger.error("Error elaborating the stream", e); @@ -223,21 +225,21 @@ public class CodelistMappingUploadServlet extends HttpServlet { uploadItem.delete(); logger.trace("changing state"); - FileUploadMonitor fum=null; + FileUploadMonitor fum = null; try { fum = SessionUtil.getFileUploadMonitor(request, serviceCredentials); } catch (TDGWTServiceException e) { - logger.error(e.getLocalizedMessage(),e); + logger.error(e.getLocalizedMessage(), e); throw new ServletException(e.getLocalizedMessage()); } fum.setState(FileUploadState.COMPLETED); SessionUtil.setFileUploadMonitor(request, serviceCredentials, fum); try { - SessionUtil.setCodelistMappingFileUploadSession(request, serviceCredentials, - codelistMappingFileUploadSession); + SessionUtil.setCodelistMappingFileUploadSession(request, + serviceCredentials, codelistMappingFileUploadSession); } catch (Exception e) { - logger.error(e.getLocalizedMessage(),e); + logger.error(e.getLocalizedMessage(), e); throw new ServletException(e.getLocalizedMessage()); } response.getWriter().write("OK"); diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java index 883d0d8..4cf43c9 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java @@ -143,4 +143,12 @@ public class Constants { public static final String CODELIST_MAPPING_UPLOAD_SERVLET = "CodelistMappingUploadServlet"; + public static final String LOCAL_UPLOAD_SERVLET = "LocalUploadServlet"; + public static final String CSV_IMPORT_FILE_SERVLET = "CSVImportFileServlet"; + public static final String RETRIEVE_CHART_FILE_SERVLET = "RetrieveChartFileServlet"; + public static final String RETRIEVE_FILE_AND_DISCOVER_MIME_TYPE_SERVLET = "RetrieveFileAndDiscoverMimeTypeServlet"; + public static final String TD_RSTUDIO_SERVLET = "TDRStudioServlet"; + public static final String TD_LOGS_SERVLET = "TDLogsServlet"; + + }