jvanzyl 01/06/24 21:55:52
Modified: src/java/org/apache/turbine/services/upload
BaseUploadService.java TurbineUpload.java
TurbineUploadService.java UploadService.java
Log:
- service has been decoupled from turbine.
Revision Changes Path
1.4 +3 -3
jakarta-turbine/src/java/org/apache/turbine/services/upload/BaseUploadService.java
Index: BaseUploadService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/BaseUploadService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseUploadService.java 2001/06/14 14:44:55 1.3
+++ BaseUploadService.java 2001/06/25 04:55:46 1.4
@@ -54,6 +54,7 @@
* <http://www.apache.org/>.
*/
+import java.util.ArrayList;
import javax.servlet.http.HttpServletRequest;
import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
@@ -67,7 +68,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @version $Id: BaseUploadService.java,v 1.3 2001/06/14 14:44:55 jvanzyl Exp $
+ * @version $Id: BaseUploadService.java,v 1.4 2001/06/25 04:55:46 jvanzyl Exp $
*/
public abstract class BaseUploadService
extends BaseService
@@ -111,8 +112,7 @@
* @exception TurbineException If there are problems reading/parsing
* the request or storing files.
*/
- public abstract void parseRequest( HttpServletRequest req,
- ParameterParser params,
+ public abstract ArrayList parseRequest( HttpServletRequest req,
String path )
throws TurbineException;
1.13 +6 -9
jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUpload.java
Index: TurbineUpload.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUpload.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TurbineUpload.java 2001/05/21 05:25:01 1.12
+++ TurbineUpload.java 2001/06/25 04:55:47 1.13
@@ -54,6 +54,7 @@
* <http://www.apache.org/>.
*/
+import java.util.ArrayList;
import java.util.Properties;
import javax.servlet.http.HttpServletRequest;
import org.apache.turbine.services.InstantiationException;
@@ -73,7 +74,7 @@
* the service's properties and default values for them.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: TurbineUpload.java,v 1.12 2001/05/21 05:25:01 dlr Exp $
+ * @version $Id: TurbineUpload.java,v 1.13 2001/06/25 04:55:47 jvanzyl Exp $
*/
public abstract class TurbineUpload
{
@@ -170,12 +171,10 @@
* @exception TurbineException If there are problems reading/parsing
* the request or storing files.
*/
- public static void parseRequest( HttpServletRequest req,
- ParameterParser params )
+ public static ArrayList parseRequest( HttpServletRequest req )
throws TurbineException
{
- UploadService upload = getService();
- upload.parseRequest(req, params, upload.getRepository());
+ return getService().parseRequest(req, getService().getRepository());
}
/**
@@ -192,12 +191,10 @@
* @exception TurbineException If there are problems reading/parsing
* the request or storing files.
*/
- public static void parseRequest( HttpServletRequest req,
- ParameterParser params,
+ public static ArrayList parseRequest( HttpServletRequest req,
String path )
throws TurbineException
{
- UploadService upload = getService();
- upload.parseRequest(req, params, path);
+ return getService().parseRequest(req, path);
}
}
1.18 +22 -15
jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUploadService.java
Index: TurbineUploadService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUploadService.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TurbineUploadService.java 2001/06/14 14:44:56 1.17
+++ TurbineUploadService.java 2001/06/25 04:55:48 1.18
@@ -58,6 +58,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Map;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Properties;
import javax.servlet.ServletContext;
@@ -65,11 +66,8 @@
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import org.apache.turbine.services.BaseService;
-import org.apache.turbine.util.ParameterParser;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.util.ValueParser;
-import org.apache.turbine.util.upload.FileItem;
-import org.apache.turbine.util.upload.MultipartStream;
/**
* <p> This class is an implementation of {@link UploadService}.
@@ -89,7 +87,8 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: TurbineUploadService.java,v 1.17 2001/06/14 14:44:56 jvanzyl Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
+ * @version $Id: TurbineUploadService.java,v 1.18 2001/06/25 04:55:48 jvanzyl Exp $
*/
public class TurbineUploadService
extends BaseUploadService
@@ -105,11 +104,11 @@
* @exception TurbineException If there are problems reading/parsing
* the request or storing files.
*/
- public void parseRequest( HttpServletRequest req,
- ParameterParser params,
- String path )
+ public ArrayList parseRequest( HttpServletRequest req,
+ String path )
throws TurbineException
{
+ ArrayList items = new ArrayList();
String contentType = req.getHeader(CONTENT_TYPE);
if(!contentType.startsWith(MULTIPART_FORM_DATA))
@@ -173,7 +172,9 @@
{
os.close();
}
- params.append(getFieldName(headers), item);
+ //params.append(getFieldName(headers), item);
+ item.setFieldName(getFieldName(headers));
+ items.add(item);
}
else
{
@@ -201,7 +202,9 @@
{
os.close();
}
- params.append(getFieldName(headers), item);
+ //params.append(getFieldName(headers), item);
+ item.setFieldName(getFieldName(headers));
+ items.add(item);
}
else
{
@@ -217,8 +220,10 @@
{
os.close();
}
- params.append(getFieldName(headers),
- new String(item.get()));
+ //params.append(getFieldName(headers),
+ // new String(item.get()));
+ item.setFieldName(getFieldName(headers));
+ items.add(item);
}
}
}
@@ -236,6 +241,8 @@
"Processing of " + MULTIPART_FORM_DATA +
" request failed", e);
}
+
+ return items;
}
/**
@@ -299,10 +306,10 @@
Map headers,
int requestSize )
{
- return FileItem.newInstance(path,
- getFileName(headers),
- getHeader(headers, CONTENT_TYPE),
- requestSize);
+ return DefaultFileItem.newInstance(path,
+ getFileName(headers),
+ getHeader(headers, CONTENT_TYPE),
+ requestSize);
}
/**
1.13 +5 -5
jakarta-turbine/src/java/org/apache/turbine/services/upload/UploadService.java
Index: UploadService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/UploadService.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- UploadService.java 2001/06/14 14:44:56 1.12
+++ UploadService.java 2001/06/25 04:55:49 1.13
@@ -54,6 +54,7 @@
* <http://www.apache.org/>.
*/
+import java.util.ArrayList;
import javax.servlet.http.HttpServletRequest;
import org.apache.turbine.services.Service;
import org.apache.turbine.util.ParameterParser;
@@ -68,7 +69,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: UploadService.java,v 1.12 2001/06/14 14:44:56 jvanzyl Exp $
+ * @version $Id: UploadService.java,v 1.13 2001/06/25 04:55:49 jvanzyl Exp $
*/
public interface UploadService
extends Service
@@ -195,10 +196,9 @@
* @exception IOException, if there are problems reading/parsing
* the request or storing files.
*/
- public void parseRequest( HttpServletRequest req,
- ParameterParser params,
- String path )
- throws TurbineException;
+ public ArrayList parseRequest( HttpServletRequest req, String path )
+
+throws TurbineException;
/**
* <p> Retrieves the value of <code>size.max</code> property of the
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
