From 618ea103e8e222a14406ea88a213db5811b43365 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 16 Jul 2015 09:19:16 +0000 Subject: [PATCH] updated loggers git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@117273 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 2 +- .../client/{view/windows => uploader}/DialogUpload.java | 6 +++++- .../user/workspace/server/LocalUploadServlet.java | 9 +++++++-- .../portlets/user/workspace/server/UploadServlet.java | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) rename src/main/java/org/gcube/portlets/user/workspace/client/{view/windows => uploader}/DialogUpload.java (96%) diff --git a/pom.xml b/pom.xml index d118a12..69381a7 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ org.gcube.dvos usermanagement-core - provided + compile diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogUpload.java b/src/main/java/org/gcube/portlets/user/workspace/client/uploader/DialogUpload.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogUpload.java rename to src/main/java/org/gcube/portlets/user/workspace/client/uploader/DialogUpload.java index 829f846..e7e4a32 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogUpload.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/uploader/DialogUpload.java @@ -1,10 +1,14 @@ -package org.gcube.portlets.user.workspace.client.view.windows; +package org.gcube.portlets.user.workspace.client.uploader; import org.gcube.portlets.user.workspace.client.AppControllerExplorer; import org.gcube.portlets.user.workspace.client.ConstantsExplorer; import org.gcube.portlets.user.workspace.client.event.CompletedFileUploadEvent; import org.gcube.portlets.user.workspace.client.model.FileModel; +import org.gcube.portlets.user.workspace.client.view.windows.InfoDisplayMessage; +import org.gcube.portlets.user.workspace.client.view.windows.MessageBoxAlert; +import org.gcube.portlets.user.workspace.client.view.windows.MessageBoxConfirm; +import org.gcube.portlets.user.workspace.client.view.windows.MessageBoxWait; import org.gcube.portlets.user.workspace.shared.HandlerResultMessage; import com.extjs.gxt.ui.client.Style.HorizontalAlignment; diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/LocalUploadServlet.java b/src/main/java/org/gcube/portlets/user/workspace/server/LocalUploadServlet.java index 11767c8..364c4c5 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/LocalUploadServlet.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/LocalUploadServlet.java @@ -145,7 +145,7 @@ public class LocalUploadServlet extends HttpServlet { InputStream fileUploadIS = null; try { - logger.trace("Upload servlet parameters: [uploadItem: "+absolutePathFile +", destinationId: "+destinationId +", uploadType: "+uploadType+", isOverwrite: "+isOverwrite+"]"); + logger.info("Upload servlet parameters: [uploadItem: "+absolutePathFile +", destinationId: "+destinationId +", uploadType: "+uploadType+", isOverwrite: "+isOverwrite+"]"); if(absolutePathFile==null || absolutePathFile.isEmpty()) throw new FileUploadException("Absolute path is null or empty"); @@ -327,9 +327,14 @@ public class LocalUploadServlet extends HttpServlet { logger.trace("before calling createExternalFile - itemName is: "+itemName); logger.trace("before calling createExternalFile - contentType is: "+contentType); createdItem = WorkspaceUtil.createExternalFile(destinationFolder, itemName, "", contentType, uploadItem); + if(createdItem!=null) + logger.info("Item "+createdItem.getName() + "uploaded correctly"); } - else + else{ createdItem = overwriteItem(wa, itemName, uploadItem, destinationFolder); //CASE OVERWRITE + if(createdItem!=null) + logger.info("Overwrite item "+createdItem.getName() + "uploaded correctly"); + } if(createdItem!=null){ notifyUploadInSharedFolder(httpSession,wa,createdItem.getId(),destinationFolder.getId(), isOverwrite); diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/UploadServlet.java b/src/main/java/org/gcube/portlets/user/workspace/server/UploadServlet.java index 050fa8f..2854d80 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/UploadServlet.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/UploadServlet.java @@ -135,7 +135,7 @@ public class UploadServlet extends HttpServlet { } - logger.trace("Upload servlet parameters: [uploadItem: "+uploadItem +", destinationId: "+destinationId +", uploadType: "+uploadType+", isOverwrite: "+isOverwrite+"]"); + logger.info("Upload servlet parameters: [uploadItem: "+uploadItem +", destinationId: "+destinationId +", uploadType: "+uploadType+", isOverwrite: "+isOverwrite+"]"); } catch (FileUploadException e) { logger.error("Error processing request in upload servlet", e); sendError(response, "Internal error: Error during request processing");