gCubeSystem
/
workspace-tree-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Francesco Mangiacrapa 2015-07-16 09:19:16 +00:00
parent 56dc022713
commit 618ea103e8
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -98,7 +98,7 @@
<dependency> <dependency>
<groupId>org.gcube.dvos</groupId> <groupId>org.gcube.dvos</groupId>
<artifactId>usermanagement-core</artifactId> <artifactId>usermanagement-core</artifactId>
<scope>provided</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

6
src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogUpload.java → src/main/java/org/gcube/portlets/user/workspace/client/uploader/DialogUpload.java
View File

@ -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.AppControllerExplorer;
import org.gcube.portlets.user.workspace.client.ConstantsExplorer; import org.gcube.portlets.user.workspace.client.ConstantsExplorer;
import org.gcube.portlets.user.workspace.client.event.CompletedFileUploadEvent; 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.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 org.gcube.portlets.user.workspace.shared.HandlerResultMessage;
import com.extjs.gxt.ui.client.Style.HorizontalAlignment; import com.extjs.gxt.ui.client.Style.HorizontalAlignment;

9
src/main/java/org/gcube/portlets/user/workspace/server/LocalUploadServlet.java
View File

@ -145,7 +145,7 @@ public class LocalUploadServlet extends HttpServlet {
InputStream fileUploadIS = null; InputStream fileUploadIS = null;
try { 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()) if(absolutePathFile==null || absolutePathFile.isEmpty())
throw new FileUploadException("Absolute path is null or empty"); 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 - itemName is: "+itemName);
logger.trace("before calling createExternalFile - contentType is: "+contentType); logger.trace("before calling createExternalFile - contentType is: "+contentType);
createdItem = WorkspaceUtil.createExternalFile(destinationFolder, itemName, "", contentType, uploadItem); 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 createdItem = overwriteItem(wa, itemName, uploadItem, destinationFolder); //CASE OVERWRITE
if(createdItem!=null)
logger.info("Overwrite item "+createdItem.getName() + "uploaded correctly");
}
if(createdItem!=null){ if(createdItem!=null){
notifyUploadInSharedFolder(httpSession,wa,createdItem.getId(),destinationFolder.getId(), isOverwrite); notifyUploadInSharedFolder(httpSession,wa,createdItem.getId(),destinationFolder.getId(), isOverwrite);

2
src/main/java/org/gcube/portlets/user/workspace/server/UploadServlet.java
View File

@ -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) { } catch (FileUploadException e) {
logger.error("Error processing request in upload servlet", e); logger.error("Error processing request in upload servlet", e);
sendError(response, "Internal error: Error during request processing"); sendError(response, "Internal error: Error during request processing");