[Openutils-svn] SF.net SVN: openutils:[1599] trunk

[<fg...@us...>]

Revision: 1599
          http://openutils.svn.sourceforge.net/openutils/?rev=1599&view=rev
Author:   fgiust
Date:     2010-01-04 12:09:03 +0000 (Mon, 04 Jan 2010)

Log Message:
-----------
updated for spring 3.0

Modified Paths:
--------------
    trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/MagnoliaMultipartResolver.java
    trunk/openutils-spring/pom.xml

Modified: trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/MagnoliaMultipartResolver.java
===================================================================
--- trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/MagnoliaMultipartResolver.java	2010-01-03 18:15:56 UTC (rev 1598)
+++ trunk/openutils-mgnlspring/src/main/java/it/openutils/mgnlspring/MagnoliaMultipartResolver.java	2010-01-04 12:09:03 UTC (rev 1599)
@@ -23,7 +23,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.Map;
 
 import javax.servlet.ServletContext;
@@ -36,6 +36,8 @@
 import org.apache.commons.fileupload.servlet.ServletRequestContext;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.context.ServletContextAware;
 import org.springframework.web.multipart.MultipartException;
 import org.springframework.web.multipart.MultipartFile;
@@ -112,12 +114,14 @@
         MultipartForm form = (MultipartForm) request.getAttribute("multipartform");
 
         Map<String, Document> documents = form.getDocuments();
-        Map<String, MultipartFile> files = new HashMap<String, MultipartFile>();
+        MultiValueMap<String, MultipartFile> files = new LinkedMultiValueMap<String, MultipartFile>();
 
         for (String key : documents.keySet())
         {
             Document doc = documents.get(key);
-            files.put(key, new DocWrapperMultipartFile(doc));
+            ArrayList<MultipartFile> filelist = new ArrayList<MultipartFile>();
+            filelist.add(new DocWrapperMultipartFile(doc));
+            files.put(key, filelist);
         }
 
         Map<String, String[]> singleParamters = form.getParameters();

Modified: trunk/openutils-spring/pom.xml
===================================================================
--- trunk/openutils-spring/pom.xml	2010-01-03 18:15:56 UTC (rev 1598)
+++ trunk/openutils-spring/pom.xml	2010-01-04 12:09:03 UTC (rev 1599)
@@ -48,6 +48,18 @@
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>${spring.version}</version>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
       <groupId>net.sf.json-lib</groupId>
       <artifactId>json-lib</artifactId>
       <version>1.1</version>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.