From 0b36679c46743cff1c24a192ba23c80b6fbce517 Mon Sep 17 00:00:00 2001 From: nilspreusker Date: Mon, 25 Oct 2010 15:02:52 +0000 Subject: [PATCH] added visualization of transformation errors to content-get --- .../src/main/webapp/css/activiti-app.css | 2 +- .../org/activiti/rest/api/cycle/ContentGet.java | 13 ++++++++++--- .../rest/api/cycle/ContentRepresentationGet.java | 1 - 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/modules/activiti-webapp-cycle/src/main/webapp/css/activiti-app.css b/modules/activiti-webapp-cycle/src/main/webapp/css/activiti-app.css index 3a783f1968..986e068047 100644 --- a/modules/activiti-webapp-cycle/src/main/webapp/css/activiti-app.css +++ b/modules/activiti-webapp-cycle/src/main/webapp/css/activiti-app.css @@ -9,4 +9,4 @@ h1 { color: #007dc3; } -/* STRUCTURE */ \ No newline at end of file +/* STRUCTURE */ diff --git a/modules/activiti-webapp-rest/src/main/java/org/activiti/rest/api/cycle/ContentGet.java b/modules/activiti-webapp-rest/src/main/java/org/activiti/rest/api/cycle/ContentGet.java index 4101d76595..7536acf43d 100644 --- a/modules/activiti-webapp-rest/src/main/java/org/activiti/rest/api/cycle/ContentGet.java +++ b/modules/activiti-webapp-rest/src/main/java/org/activiti/rest/api/cycle/ContentGet.java @@ -12,7 +12,9 @@ */ package org.activiti.rest.api.cycle; +import java.io.ByteArrayInputStream; import java.io.IOException; +import java.io.InputStream; import java.util.Date; import javax.servlet.http.HttpSession; @@ -22,11 +24,11 @@ import org.activiti.cycle.CycleDefaultMimeType; import org.activiti.cycle.CycleService; import org.activiti.cycle.RepositoryArtifact; import org.activiti.cycle.impl.CycleServiceImpl; +import org.activiti.cycle.impl.transform.TransformationException; import org.activiti.rest.util.ActivitiRequest; import org.activiti.rest.util.ActivitiStreamingWebScript; import org.springframework.extensions.webscripts.WebScriptResponse; - /** * * @author Nils Preusker (nils.preusker@camunda.com) @@ -83,9 +85,14 @@ public class ContentGet extends ActivitiStreamingWebScript { } } + InputStream content; + try { + content = this.cycleService.getContent(artifact.getConnectorId(), artifact.getNodeId(), contentRepresentation.getId()).asInputStream(); + } catch (TransformationException e) { + content = new ByteArrayInputStream(e.getRenderContent().getBytes()); + } + streamResponse(res, content, new Date(0), // TODO: what is a good way to determine the etag? Using a fake one... - streamResponse(res, this.cycleService.getContent(artifact.getConnectorId(), artifact.getNodeId(), contentRepresentation.getId()).asInputStream(), new Date( - 0), "W/\"647-1281077702000\"", attach, attachmentFileName, contentType); } diff --git a/modules/activiti-webapp-rest/src/main/java/org/activiti/rest/api/cycle/ContentRepresentationGet.java b/modules/activiti-webapp-rest/src/main/java/org/activiti/rest/api/cycle/ContentRepresentationGet.java index 6136e9c4ba..3058360dc5 100644 --- a/modules/activiti-webapp-rest/src/main/java/org/activiti/rest/api/cycle/ContentRepresentationGet.java +++ b/modules/activiti-webapp-rest/src/main/java/org/activiti/rest/api/cycle/ContentRepresentationGet.java @@ -86,7 +86,6 @@ public class ContentRepresentationGet extends ActivitiWebScript { // Show errors that occur during transformations as HTML in the UI model.put("renderInfo", RenderInfo.HTML); model.put("contentRepresentationId", representationId); - model.put("content", e.getRenderContent()); model.put("contentType", CycleDefaultMimeType.HTML.getContentType()); } catch (Exception ex) { log.log(Level.WARNING, "Exception while loading content representation", ex); -- GitLab