svn commit: r564043 - in /xml/xindice/trunk: ./ java/src/org/apache/xindice/webadmin/viewer/components/ legal/ lib/

Author: vgritsenko
Date: Wed Aug  8 16:11:58 2007
New Revision: 564043

URL: http://svn.apache.org/viewvc?view=rev&rev=564043
Log:
      <action dev="VG" type="update">
        Update commons-fileupload to version 1.2. Added (required by upload)
        commons-io 1.3.2.
      </action>


Added:
    xml/xindice/trunk/legal/commons-fileupload.LICENSE
      - copied unchanged from r564034, xml/xindice/trunk/legal/commons-logging.LICENSE
    xml/xindice/trunk/legal/commons-io.LICENSE
      - copied unchanged from r564034, xml/xindice/trunk/legal/commons-logging.LICENSE
    xml/xindice/trunk/lib/commons-fileupload-1.2.jar   (with props)
    xml/xindice/trunk/lib/commons-io-1.3.2.jar   (with props)
Removed:
    xml/xindice/trunk/lib/commons-fileupload.jar
Modified:
    xml/xindice/trunk/java/src/org/apache/xindice/webadmin/viewer/components/MetadataCollectionViewer.java
    xml/xindice/trunk/java/src/org/apache/xindice/webadmin/viewer/components/MetadataResourceViewer.java
    xml/xindice/trunk/java/src/org/apache/xindice/webadmin/viewer/components/UploadCollectionViewer.java
    xml/xindice/trunk/status.xml

Modified: xml/xindice/trunk/java/src/org/apache/xindice/webadmin/viewer/components/MetadataCollectionViewer.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/webadmin/viewer/components/MetadataCollectionViewer.java?view=diff&rev=564043&r1=564042&r2=564043
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/webadmin/viewer/components/MetadataCollectionViewer.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/webadmin/viewer/components/MetadataCollectionViewer.java Wed Aug  8 16:11:58 2007
@@ -19,20 +19,10 @@
 
 package org.apache.xindice.webadmin.viewer.components;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.fileupload.DiskFileUpload;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.xindice.core.Collection;
@@ -45,9 +35,19 @@
 import org.apache.xindice.xml.Xml2HtmlWriter;
 import org.apache.xindice.xml.dom.DOMParser;
 import org.apache.xindice.xml.dom.DocumentImpl;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Iterator;
+
 /**
  * Xindice Html Viewer for Collection Metadata.
  *
@@ -136,36 +136,26 @@
             byte[] content = new byte[0];
             try {
                 //	Create a new file upload handler
-                DiskFileUpload upload = new DiskFileUpload();
+                ServletFileUpload upload = new ServletFileUpload();
                 // Set upload parameters
                 upload.setSizeMax(-1);
+                upload.setFileItemFactory(new DiskFileItemFactory());
 
-                try {
-                    File tmpdir = new File(System.getProperty("java.io.tmpdir"));
-                    upload.setRepositoryPath(tmpdir.getCanonicalPath());
-                } catch (IOException e1) {
-                    log.error(e1);
-                }
-                List items = upload.parseRequest(req);
                 // Process the uploaded fields
-                Iterator iter = items.iterator();
-                while (iter.hasNext()) {
-                    FileItem item = (FileItem) iter.next();
+                Iterator i = upload.parseRequest(req).iterator();
+                while (i.hasNext()) {
+                    FileItem item = (FileItem) i.next();
                     if (!item.isFormField()) {
-                        FileItem uploadFile = null;
-                        if (item.getFieldName().equals("customfile") && uploadFile == null) {
-                            uploadFile = item;
-                            content = uploadFile.get();
-                        } else {
-                            item.delete();
+                        if (item.getFieldName().equals("customfile")) {
+                            content = item.get();
                         }
-                    } else {
-                        item.delete();
                     }
+                    item.delete();
                 }
             } catch (FileUploadException e) {
                 log.error(e);
             }
+
             if (content.length > 0) {
                 Document customDoc;
                 try {

Modified: xml/xindice/trunk/java/src/org/apache/xindice/webadmin/viewer/components/MetadataResourceViewer.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/webadmin/viewer/components/MetadataResourceViewer.java?view=diff&rev=564043&r1=564042&r2=564043
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/webadmin/viewer/components/MetadataResourceViewer.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/webadmin/viewer/components/MetadataResourceViewer.java Wed Aug  8 16:11:58 2007
@@ -19,34 +19,34 @@
 
 package org.apache.xindice.webadmin.viewer.components;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.fileupload.DiskFileUpload;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.xindice.core.Collection;
 import org.apache.xindice.core.DBException;
 import org.apache.xindice.core.meta.MetaData;
 import org.apache.xindice.util.XindiceException;
-import org.apache.xindice.webadmin.viewer.HtmlViewerComponent;
 import org.apache.xindice.webadmin.viewer.HtmlResourceViewer;
+import org.apache.xindice.webadmin.viewer.HtmlViewerComponent;
 import org.apache.xindice.xml.TextWriter;
 import org.apache.xindice.xml.Xml2HtmlWriter;
 import org.apache.xindice.xml.dom.DOMParser;
 import org.apache.xindice.xml.dom.DocumentImpl;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+import java.util.Iterator;
+
 /**
  * Xindice Html Viewer for Resource Metadata.
  *
@@ -95,36 +95,26 @@
             byte[] content = new byte[0];
             try {
                 //	Create a new file upload handler
-                DiskFileUpload upload = new DiskFileUpload();
+                ServletFileUpload upload = new ServletFileUpload();
                 // Set upload parameters
                 upload.setSizeMax(-1);
+                upload.setFileItemFactory(new DiskFileItemFactory());
 
-                try {
-                    File tmpdir = new File(System.getProperty("java.io.tmpdir"));
-                    upload.setRepositoryPath(tmpdir.getCanonicalPath());
-                } catch (IOException e1) {
-                    log.error(e1);
-                }
-                List items = upload.parseRequest(req);
                 // Process the uploaded fields
-                Iterator iter = items.iterator();
-                while (iter.hasNext()) {
-                    FileItem item = (FileItem) iter.next();
+                Iterator i = upload.parseRequest(req).iterator();
+                while (i.hasNext()) {
+                    FileItem item = (FileItem) i.next();
                     if (!item.isFormField()) {
-                        FileItem uploadFile = null;
-                        if (item.getFieldName().equals("customfile") && uploadFile == null) {
-                            uploadFile = item;
-                            content = uploadFile.get();
-                        } else {
-                            item.delete();
+                        if (item.getFieldName().equals("customfile")) {
+                            content = item.get();
                         }
-                    } else {
-                        item.delete();
                     }
+                    item.delete();
                 }
             } catch (FileUploadException e) {
                 log.error(e);
             }
+            
             if (content.length > 0) {
                 Document customDoc;
                 try {

Modified: xml/xindice/trunk/java/src/org/apache/xindice/webadmin/viewer/components/UploadCollectionViewer.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/webadmin/viewer/components/UploadCollectionViewer.java?view=diff&rev=564043&r1=564042&r2=564043
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/webadmin/viewer/components/UploadCollectionViewer.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/webadmin/viewer/components/UploadCollectionViewer.java Wed Aug  8 16:11:58 2007
@@ -19,19 +19,10 @@
 
 package org.apache.xindice.webadmin.viewer.components;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.fileupload.DiskFileUpload;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.xindice.core.Collection;
@@ -41,8 +32,17 @@
 import org.apache.xindice.webadmin.viewer.HtmlCollectionViewer;
 import org.apache.xindice.webadmin.viewer.HtmlViewerComponent;
 import org.apache.xindice.xml.dom.DOMParser;
+
 import org.w3c.dom.Document;
 
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+import java.util.Iterator;
+
 /**
  * Xindice Html Viewer for uploading documents to this collection.
  *
@@ -68,16 +68,11 @@
         if (!method.equalsIgnoreCase("POST")) {
             output.print(UPLOAD_FORM);
         } else {
-            // Create a new file upload handler
-            DiskFileUpload upload = new DiskFileUpload();
+            //	Create a new file upload handler
+            ServletFileUpload upload = new ServletFileUpload();
             // Set upload parameters
             upload.setSizeMax(-1);
-            try {
-                File tmpdir = new File(System.getProperty("java.io.tmpdir"));
-                upload.setRepositoryPath(tmpdir.getCanonicalPath());
-            } catch (IOException e) {
-                log.error(e);
-            }
+            upload.setFileItemFactory(new DiskFileItemFactory());
 
             Form form;
             try {
@@ -103,21 +98,16 @@
         finishViewer(output);
     }
 
-    private Form parseUpload(HttpServletRequest req, DiskFileUpload upload) throws FileUploadException {
-        List items = upload.parseRequest(req);
+    private Form parseUpload(HttpServletRequest req, ServletFileUpload upload) throws FileUploadException {
         Form form = new Form();
 
         // Process the uploaded fields
-        Iterator iter = items.iterator();
-        while (iter.hasNext()) {
-            FileItem item = (FileItem) iter.next();
-
+        Iterator i = upload.parseRequest(req).iterator();
+        while (i.hasNext()) {
+            FileItem item = (FileItem) i.next();
             if (!item.isFormField()) {
                 if (item.getFieldName().equals("file")) {
                     form.content = item.get();
-                    item.delete();
-                } else {
-                    item.delete();
                 }
             } else {
                 if (item.getFieldName().equals("overwrite")) {
@@ -126,10 +116,9 @@
                     form.type = item.getString().charAt(0);
                 } else if (item.getFieldName().equals("name")) {
                     form.name = item.getString();
-                } else {
-                    item.delete();
                 }
             }
+            item.delete();
         }
 
         return form;

Added: xml/xindice/trunk/lib/commons-fileupload-1.2.jar
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/lib/commons-fileupload-1.2.jar?view=auto&rev=564043
==============================================================================
Binary file - no diff available.

Propchange: xml/xindice/trunk/lib/commons-fileupload-1.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: xml/xindice/trunk/lib/commons-io-1.3.2.jar
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/lib/commons-io-1.3.2.jar?view=auto&rev=564043
==============================================================================
Binary file - no diff available.

Propchange: xml/xindice/trunk/lib/commons-io-1.3.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: xml/xindice/trunk/status.xml
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/status.xml?view=diff&rev=564043&r1=564042&r2=564043
==============================================================================
--- xml/xindice/trunk/status.xml (original)
+++ xml/xindice/trunk/status.xml Wed Aug  8 16:11:58 2007
@@ -113,6 +113,10 @@
 
   <changes>
     <release version="1.2" date="unreleased">
+      <action dev="VG" type="update">
+        Update commons-fileupload to version 1.2. Added (required by upload)
+        commons-io 1.3.2.
+      </action>
       <action dev="VG" type="remove">
         Remove 'Ugly Browser', replaced by WebAdmin.
       </action>