[jbpm-commits] JBoss JBPM SVN: r5295 - in projects/jsf-console/branches/jsf-console-3.2-soa: console/src/main/java/org/jbpm/web and 2 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2009-07-14 16:06:49 -0400 (Tue, 14 Jul 2009)
New Revision: 5295

Modified:
   projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
   projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/java/org/jbpm/web/ProcessUploadServlet.java
   projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml
   projects/jsf-console/branches/jsf-console-3.2-soa/soa/src/main/webapp/WEB-INF/web.xml
Log:
JBPM-2424: tidy up installer (CODING IN PROGRESS)
remove deprecated code in ProcessUploadServlet
disable load on startup

Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml	2009-07-14 20:05:36 UTC (rev 5294)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml	2009-07-14 20:06:49 UTC (rev 5295)
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>org.jbpm.jbpm3</groupId>
       <artifactId>jsf-console-jbpm4jsf</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
       <exclusions>
         <exclusion>
           <groupId>javax.faces</groupId>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.jbpm.jbpm3</groupId>
       <artifactId>soa-webapp</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
       <type>war</type>
     </dependency>
     <dependency>

Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/java/org/jbpm/web/ProcessUploadServlet.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/java/org/jbpm/web/ProcessUploadServlet.java	2009-07-14 20:05:36 UTC (rev 5294)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/java/org/jbpm/web/ProcessUploadServlet.java	2009-07-14 20:06:49 UTC (rev 5295)
@@ -24,23 +24,24 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.zip.ZipInputStream;
-import org.apache.commons.fileupload.DiskFileUpload;
 import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUpload;
+import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+
 import org.jbpm.JbpmConfiguration;
 import org.jbpm.JbpmContext;
 import org.jbpm.graph.def.ProcessDefinition;
 
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-public class ProcessUploadServlet extends HttpServlet {
+public class ProcessUploadServlet extends javax.servlet.http.HttpServlet {
 
   private static final long serialVersionUID = 1L;
 
@@ -65,14 +66,18 @@
 
   private String handleRequest(HttpServletRequest request) {
     // check if request is multipart content
-    if (!FileUpload.isMultipartContent(request)) {
+    if (!ServletFileUpload.isMultipartContent(request)) {
       log.debug("Not a multipart request");
       return "Not a multipart request";
     }
 
     try {
-      DiskFileUpload fileUpload = new DiskFileUpload();
-      List itemList = fileUpload.parseRequest(request);
+      // Create a factory for disk-based file items
+      FileItemFactory factory = new DiskFileItemFactory();
+      // Create a new file upload handler
+      ServletFileUpload upload = new ServletFileUpload(factory);
+      // Parse the request
+      List itemList= upload.parseRequest(request);
       log.debug("Upload from GPD");
       if (itemList.isEmpty()) {
         log.debug("No process file in the request");

Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml	2009-07-14 20:05:36 UTC (rev 5294)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml	2009-07-14 20:06:49 UTC (rev 5295)
@@ -48,7 +48,6 @@
     </description>
     <servlet-name>GPD Deployer Servlet</servlet-name>
     <servlet-class>org.jbpm.web.ProcessUploadServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
   </servlet>
 
   <servlet-mapping>

Modified: projects/jsf-console/branches/jsf-console-3.2-soa/soa/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/soa/src/main/webapp/WEB-INF/web.xml	2009-07-14 20:05:36 UTC (rev 5294)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/soa/src/main/webapp/WEB-INF/web.xml	2009-07-14 20:06:49 UTC (rev 5295)
@@ -52,7 +52,6 @@
     </description>
     <servlet-name>GPD Deployer Servlet</servlet-name>
     <servlet-class>org.jbpm.web.ProcessUploadServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
   </servlet>
 
   <servlet-mapping>