From d3816ad09bd61c111b8b121f0890c61c1243184d Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Mon, 12 Apr 2010 17:12:31 +0000 Subject: [PATCH] ALF-510 : errorOnOverwrite not implemented for overwriting files. - now overwriting a file does result in an error if there is a pre-existing file. - also fixed deployment report to have the stack trace even if there is a deployment report. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19824 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/avm/actions/AVMDeployWebsiteAction.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java b/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java index f2ec2e0c34..c2f156b81a 100644 --- a/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java +++ b/source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java @@ -534,6 +534,7 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase if (report == null) { + // There is no report if (error == null) { writer.putContent(""); @@ -549,7 +550,7 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase } else { - // TODO: revisit this, is it better to stream to a temp file? + // There is a deployment report StringBuilder builder = new StringBuilder(); for (DeploymentEvent event : report) { @@ -558,6 +559,18 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase builder.append(event.getDestination()); builder.append("\r\n"); } + + if(error != null) + { + builder.append("\r\n"); + + // add the full stack trace of the error as the content + StringWriter stack = new StringWriter(); + PrintWriter stackPrint = new PrintWriter(stack); + error.printStackTrace(stackPrint); + + builder.append(stack.toString()); + } writer.putContent(builder.toString()); }