Author: tv
Date: Sun Apr 8 09:51:36 2007
New Revision: 526574
URL: http://svn.apache.org/viewvc?view=rev&rev=526574
Log:
Removed references to deprecated classes for commons-fileupload 1.1
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/TurbineUploadService.java
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/TurbineUploadService.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/TurbineUploadService.java?view=diff&rev=526574&r1=526573&r2=526574
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/TurbineUploadService.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/TurbineUploadService.java
Sun Apr 8 09:51:36 2007
@@ -18,21 +18,18 @@
import java.io.File;
import java.io.UnsupportedEncodingException;
-
import java.util.Iterator;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.configuration.Configuration;
-
-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.turbine.Turbine;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
@@ -68,7 +65,10 @@
private static Log log = LogFactory.getLog(TurbineUploadService.class);
/** A File Upload object for the actual uploading */
- protected DiskFileUpload fileUpload = null;
+ protected ServletFileUpload fileUpload = null;
+
+ /** A File Item Factory object for the actual uploading */
+ protected DiskFileItemFactory itemFactory = null;
/** Auto Upload yes? */
private boolean automatic;
@@ -127,10 +127,11 @@
log.debug("Auto Upload " + automatic);
- fileUpload = new DiskFileUpload();
+ itemFactory = new DiskFileItemFactory();
+ itemFactory.setSizeThreshold(sizeThreshold);
+ itemFactory.setRepository(new File(repoPath));
+ fileUpload = new ServletFileUpload(itemFactory);
fileUpload.setSizeMax(sizeMax);
- fileUpload.setSizeThreshold(sizeThreshold);
- fileUpload.setRepositoryPath(repoPath);
setInit(true);
}
@@ -154,7 +155,7 @@
*/
public int getSizeThreshold()
{
- return fileUpload.getSizeThreshold();
+ return itemFactory.getSizeThreshold();
}
/**
@@ -179,7 +180,7 @@
*/
public String getRepository()
{
- return fileUpload.getRepositoryPath();
+ return itemFactory.getRepository().getAbsolutePath();
}
/**
@@ -218,11 +219,7 @@
try
{
- List fileList = fileUpload
- .parseRequest(req,
- getSizeThreshold(),
- getSizeMax(),
- path);
+ List fileList = fileUpload.parseRequest(req);
if (fileList != null)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
