You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by tv...@apache.org on 2007/04/08 18:50:09 UTC
svn commit: r526573 -
/jakarta/turbine/fulcrum/trunk/upload/src/java/org/apache/fulcrum/upload/DefaultUploadService.java
Author: tv
Date: Sun Apr 8 09:50:06 2007
New Revision: 526573
URL: http://svn.apache.org/viewvc?view=rev&rev=526573
Log:
Removed references to deprecated classes for commons-fileupload 1.1
Modified:
jakarta/turbine/fulcrum/trunk/upload/src/java/org/apache/fulcrum/upload/DefaultUploadService.java
Modified: jakarta/turbine/fulcrum/trunk/upload/src/java/org/apache/fulcrum/upload/DefaultUploadService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/upload/src/java/org/apache/fulcrum/upload/DefaultUploadService.java?view=diff&rev=526573&r1=526572&r2=526573
==============================================================================
--- jakarta/turbine/fulcrum/trunk/upload/src/java/org/apache/fulcrum/upload/DefaultUploadService.java (original)
+++ jakarta/turbine/fulcrum/trunk/upload/src/java/org/apache/fulcrum/upload/DefaultUploadService.java Sun Apr 8 09:50:06 2007
@@ -31,8 +31,9 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.commons.fileupload.DiskFileUpload;
import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
/**
* <p> This class is an implementation of {@link UploadService}.
@@ -59,12 +60,14 @@
extends AbstractLogEnabled
implements UploadService, Initializable, Configurable, Contextualizable
{
- private DiskFileUpload fileUpload;
+ /** A File Item Factory object for the actual uploading */
+ private DiskFileItemFactory itemFactory;
private int sizeThreshold;
private int sizeMax;
private String repositoryPath;
+
/**
* The application root
*/
@@ -75,7 +78,7 @@
*/
public long getSizeMax()
{
- return fileUpload.getSizeMax();
+ return sizeMax;
}
/**
@@ -83,7 +86,7 @@
*/
public long getSizeThreshold()
{
- return fileUpload.getSizeThreshold();
+ return itemFactory.getSizeThreshold();
}
/**
@@ -92,7 +95,7 @@
*/
public String getRepository()
{
- return fileUpload.getRepositoryPath();
+ return itemFactory.getRepository().getAbsolutePath();
}
/**
@@ -109,7 +112,9 @@
{
try
{
- return fileUpload.parseRequest(req, sizeThreshold, sizeMax, path);
+ ServletFileUpload fileUpload = new ServletFileUpload(itemFactory);
+ fileUpload.setSizeMax(sizeMax);
+ return fileUpload.parseRequest(req);
}
catch (FileUploadException e)
{
@@ -134,7 +139,10 @@
{
try
{
- return fileUpload.parseRequest(req, sizeThreshold, sizeMax, path);
+ DiskFileItemFactory localItemFactory = new DiskFileItemFactory(sizeThreshold, new File(path));
+ ServletFileUpload fileUpload = new ServletFileUpload(localItemFactory);
+ fileUpload.setSizeMax(sizeMax);
+ return fileUpload.parseRequest(req);
}
catch (FileUploadException e)
{
@@ -199,11 +207,7 @@
getLogger().debug(
"Upload Service: REPOSITORY_KEY => " + repositoryPath);
- fileUpload = new DiskFileUpload();
-
- fileUpload.setSizeMax(sizeMax);
- fileUpload.setSizeThreshold(sizeThreshold);
- fileUpload.setRepositoryPath(repositoryPath);
+ itemFactory = new DiskFileItemFactory(sizeThreshold, new File(repositoryPath));
}
public void contextualize(Context context) throws ContextException
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org