[jbpm-commits] JBoss JBPM SVN: r6117 - in projects/jsf-console/branches/jsf-console-3.3.1.SP: gpd-deployer/src/main/java/org/jbpm/web and 1 other directory.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-01-22 05:38:03 -0500 (Fri, 22 Jan 2010)
New Revision: 6117

Modified:
   projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java
   projects/jsf-console/branches/jsf-console-3.3.1.SP/pom.xml
Log:
SOA-1586: avoid printing and sending back stack traces after deploying invalid process definition

Modified: projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java	2010-01-21 21:40:24 UTC (rev 6116)
+++ projects/jsf-console/branches/jsf-console-3.3.1.SP/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java	2010-01-22 10:38:03 UTC (rev 6117)
@@ -25,6 +25,7 @@
 import java.io.InputStream;
 import java.io.PrintWriter;
 import java.net.MalformedURLException;
+import java.util.List;
 import java.util.zip.ZipInputStream;
 
 import javax.servlet.ServletException;
@@ -41,6 +42,9 @@
 import org.jbpm.JbpmConfiguration;
 import org.jbpm.JbpmContext;
 import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.jpdl.JpdlException;
+import org.jbpm.jpdl.xml.Problem;
+import org.jbpm.util.IoUtil;
 
 public class ProcessUploadServlet extends javax.servlet.http.HttpServlet {
 
@@ -74,6 +78,15 @@
         ProcessDefinition processDefinition = parseProcessArchive(processStream);
         deployProcessDefinition(processDefinition, response);
       }
+      catch (JpdlException e) {
+        List problems = e.getProblems();
+        StringBuffer message = new StringBuffer();
+        for (int i = 0, n = problems.size(); i < n; i++) {
+          Problem problem = (Problem) problems.get(i);
+          message.append(problem).append(IoUtil.lineSeparator);
+        }
+        response.sendError(HttpServletResponse.SC_BAD_REQUEST, message.toString());
+      }
       finally {
         jbpmContext.close();
       }

Modified: projects/jsf-console/branches/jsf-console-3.3.1.SP/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.3.1.SP/pom.xml	2010-01-21 21:40:24 UTC (rev 6116)
+++ projects/jsf-console/branches/jsf-console-3.3.1.SP/pom.xml	2010-01-22 10:38:03 UTC (rev 6117)
@@ -43,7 +43,7 @@
     <jbpm.version>3.2.8</jbpm.version>
     <jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
     <junit.version>3.8.1</junit.version>
-    <sun.facelets.version>1.1.15.B1</sun.facelets.version>
+    <sun.facelets.version>1.1.15</sun.facelets.version>
   </properties>
 
   <!-- DependencyManagement -->