Changeset 6785dcb675da16292270d5924f3de13a142e7dd9

Timestamp:

11/26/06 12:18:55 (2 years ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1164539935 +0100

git-parent:

[fc23677a93852d6b881f0c5a66e563e4fd7408a3]

git-author:

Christopher Jung <bktheg@web.de> 1164539935 +0100

Message:

Support fuer Multipart-Requests eingebaut

Files:

• src/net/driftingsouls/ds2/server/framework/CmdLineRequest.java (modified) (2 diffs)
• src/net/driftingsouls/ds2/server/framework/pipeline/HttpRequest.java (modified) (3 diffs)
• src/net/driftingsouls/ds2/server/framework/pipeline/Request.java (modified) (2 diffs)

src/net/driftingsouls/ds2/server/framework/CmdLineRequest.java

@@ -21 +21 @@
-import java.io.IOException;
-import java.io.InputStream;
+import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.List;
-import java.util.Map;
+
+import org.apache.commons.fileupload.FileItem;
-
-import net.driftingsouls.ds2.server.framework.pipeline.Request;
@@ -116 +120 @@
-        }
-
+        public List<FileItem> getUploadedFiles() {
+                return new ArrayList<FileItem>();
+        }
+
-}

src/net/driftingsouls/ds2/server/framework/pipeline/HttpRequest.java

@@ -21 +21 @@
-import java.io.IOException;
-import java.io.InputStream;
+import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
+
+import net.driftingsouls.ds2.server.framework.Loggable;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.FileUploadBase;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.fileupload.servlet.ServletRequestContext;
-
-/**
@@ -31 +43 @@
- *
- */
-
+,Loggable
-        private HttpServletRequest request = null;
-        private Map<String,String> parameters = new HashMap<String,String>();
+        private boolean isMultipart = false;
+        private ServletRequestContext context = null;
+        private List uploadedFiles = null;
-        
-        public HttpRequest(HttpServletRequest request) {
-                this.request = request;
+                
+                context = new ServletRequestContext(request);
+                isMultipart = FileUploadBase.isMultipartContent(context);
+                if( isMultipart ) {
+                        FileItemFactory factory = new DiskFileItemFactory();
+                        ServletFileUpload upload = new ServletFileUpload(factory);
+
+                        try {
+                                uploadedFiles = upload.parseRequest(context);
+                                for( int i=0; i < uploadedFiles.size(); i++ ) {
+                                        FileItem item = (FileItem)uploadedFiles.get(i);
+                                        if( !item.isFormField() ) {
+                                                continue;
+                                        }
+                                    parameters.put(item.getFieldName(), item.getString());
+                                }
+                        }
+                        catch( FileUploadException e ) {
+                                LOG.error(e);
+                        }
+                }
-        }
-
@@ -110 +146 @@
-                return str;
-        }
+
+        public List<FileItem> getUploadedFiles() {
+                if( !isMultipart ) {
+                        return new ArrayList<FileItem>();
+                }
+                
+                List<FileItem> result = new ArrayList<FileItem>();
+                List items = uploadedFiles;
+                for( int i=0; i < items.size(); i++ ) {
+                        if( items.get(i) instanceof FileItem ) {
+                                FileItem item = (FileItem)items.get(i);
+                                if( item.isFormField() ) {
+                                        continue;
+                                }
+                                result.add((FileItem)items.get(i));
+                        }
+                }
+                        
+                return result;
+        }
-}

src/net/driftingsouls/ds2/server/framework/pipeline/Request.java

@@ -21 +21 @@
-import java.io.IOException;
-import java.io.InputStream;
+import java.util.List;
+
+import org.apache.commons.fileupload.FileItem;
-
-/**
@@ -42 +45 @@
-        public String getRequestURL();
-        public String getUserAgent();
+        public List<FileItem> getUploadedFiles();
-}