You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/06/14 16:44:56 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/upload BaseUploadService.java FileHandlerUploadService.java OReillyUploadService.java TurbineUploadService.java UploadService.java
jvanzyl 01/06/14 07:44:56
Modified: src/java/org/apache/turbine/services/upload
BaseUploadService.java
FileHandlerUploadService.java
OReillyUploadService.java TurbineUploadService.java
UploadService.java
Log:
- updating service as per notes.
Revision Changes Path
1.3 +24 -42 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseUploadService.java 2001/05/19 21:44:08 1.2
+++ BaseUploadService.java 2001/06/14 14:44:55 1.3
@@ -55,8 +55,8 @@
*/
import javax.servlet.http.HttpServletRequest;
-import org.apache.turbine.services.TurbineBaseService;
-import org.apache.turbine.services.servlet.TurbineServlet;
+import org.apache.turbine.services.BaseService;
+import org.apache.turbine.services.InitializationException;
import org.apache.turbine.util.ParameterParser;
import org.apache.turbine.util.TurbineException;
@@ -67,10 +67,10 @@
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: BaseUploadService.java,v 1.2 2001/05/19 21:44:08 jon Exp $
+ * @version $Id: BaseUploadService.java,v 1.3 2001/06/14 14:44:55 jvanzyl Exp $
*/
public abstract class BaseUploadService
- extends TurbineBaseService
+ extends BaseService
implements UploadService
{
/**
@@ -85,20 +85,18 @@
* This method processes the repository path, to make it relative to the
* web application root, if neccessary
*/
- public void init()
+ public void init() throws InitializationException
{
- String path = getProperties()
- .getProperty(UploadService.REPOSITORY_KEY,
- UploadService.REPOSITORY_DEFAULT.toString());
- if(!path.startsWith("/"))
- {
- String realPath = TurbineServlet.getRealPath(path);
- if(realPath != null)
- {
- path = realPath;
- }
- }
- getProperties().setProperty(UploadService.REPOSITORY_KEY, path);
+ String path = getConfiguration().getString(
+ UploadService.REPOSITORY_KEY,
+ UploadService.REPOSITORY_DEFAULT);
+
+ path = getRealPath(path);
+ getConfiguration().setProperty(UploadService.REPOSITORY_KEY, path);
+
+ getCategory().debug(
+ "Upload Service: REPOSITORY_KEY => " + path);
+
setInit(true);
}
@@ -126,17 +124,9 @@
*/
public int getSizeMax()
{
- String sizeMax = getProperties()
- .getProperty(UploadService.SIZE_MAX_KEY,
- UploadService.SIZE_MAX_DEFAULT.toString());
- try
- {
- return Integer.parseInt(sizeMax);
- }
- catch(NumberFormatException e)
- {
- return UploadService.SIZE_MAX_DEFAULT.intValue();
- }
+ return getConfiguration().getInt(
+ UploadService.SIZE_MAX_KEY,
+ UploadService.SIZE_MAX_DEFAULT);
}
/**
@@ -147,17 +137,9 @@
*/
public int getSizeThreshold()
{
- String sizeThreshold = getProperties()
- .getProperty(UploadService.SIZE_THRESHOLD_KEY,
- UploadService.SIZE_THRESHOLD_DEFAULT.toString());
- try
- {
- return Integer.parseInt(sizeThreshold);
- }
- catch(NumberFormatException e)
- {
- return UploadService.SIZE_THRESHOLD_DEFAULT.intValue();
- }
+ return getConfiguration().getInt(
+ UploadService.SIZE_THRESHOLD_KEY,
+ UploadService.SIZE_THRESHOLD_DEFAULT);
}
/**
@@ -168,8 +150,8 @@
*/
public String getRepository()
{
- return getProperties()
- .getProperty(UploadService.REPOSITORY_KEY,
- UploadService.REPOSITORY_DEFAULT.toString());
+ return getConfiguration().getString(
+ UploadService.REPOSITORY_KEY,
+ UploadService.REPOSITORY_DEFAULT);
}
}
1.12 +1 -2 jakarta-turbine/src/java/org/apache/turbine/services/upload/FileHandlerUploadService.java
Index: FileHandlerUploadService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/FileHandlerUploadService.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FileHandlerUploadService.java 2001/05/21 21:52:38 1.11
+++ FileHandlerUploadService.java 2001/06/14 14:44:55 1.12
@@ -55,7 +55,6 @@
*/
import javax.servlet.http.HttpServletRequest;
-import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.util.ParameterParser;
import org.apache.turbine.util.TurbineException;
@@ -70,7 +69,7 @@
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: FileHandlerUploadService.java,v 1.11 2001/05/21 21:52:38 dlr Exp $
+ * @version $Id: FileHandlerUploadService.java,v 1.12 2001/06/14 14:44:55 jvanzyl Exp $
* @deprecated Use TurbineUploadService instead.
*/
public class FileHandlerUploadService
1.9 +1 -2 jakarta-turbine/src/java/org/apache/turbine/services/upload/OReillyUploadService.java
Index: OReillyUploadService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/OReillyUploadService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- OReillyUploadService.java 2001/05/18 18:25:56 1.8
+++ OReillyUploadService.java 2001/06/14 14:44:55 1.9
@@ -59,7 +59,6 @@
import java.util.Enumeration;
import java.util.Vector;
import javax.servlet.http.HttpServletRequest;
-import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.util.ParameterParser;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.util.ValueParser;
@@ -73,7 +72,7 @@
* {@link TurbineUploadService} in new applications.
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: OReillyUploadService.java,v 1.8 2001/05/18 18:25:56 dlr Exp $
+ * @version $Id: OReillyUploadService.java,v 1.9 2001/06/14 14:44:55 jvanzyl Exp $
* @deprecated use TurbineUploadService
*/
public class OReillyUploadService
1.17 +9 -5 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TurbineUploadService.java 2001/05/18 20:15:55 1.16
+++ TurbineUploadService.java 2001/06/14 14:44:56 1.17
@@ -65,7 +65,6 @@
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import org.apache.turbine.services.BaseService;
-import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.util.ParameterParser;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.util.ValueParser;
@@ -90,7 +89,7 @@
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: TurbineUploadService.java,v 1.16 2001/05/18 20:15:55 dlr Exp $
+ * @version $Id: TurbineUploadService.java,v 1.17 2001/06/14 14:44:56 jvanzyl Exp $
*/
public class TurbineUploadService
extends BaseUploadService
@@ -112,17 +111,20 @@
throws TurbineException
{
String contentType = req.getHeader(CONTENT_TYPE);
+
if(!contentType.startsWith(MULTIPART_FORM_DATA))
{
throw new TurbineException("the request doesn't contain a " +
MULTIPART_FORM_DATA + " stream");
}
int requestSize = req.getContentLength();
+
if(requestSize == -1)
{
throw new TurbineException("the request was rejected because " +
"it's size is unknown");
}
+
if(requestSize > TurbineUpload.getSizeMax())
{
throw new TurbineException("the request was rejected because " +
@@ -132,7 +134,8 @@
try
{
byte[] boundary = contentType.substring(
- contentType.indexOf("boundary=")+9).getBytes();
+ contentType.indexOf("boundary=")+9).getBytes();
+
InputStream input = (InputStream)req.getInputStream();
MultipartStream multi = new MultipartStream(input, boundary);
@@ -229,8 +232,9 @@
}
catch(IOException e)
{
- throw new TurbineException("Processing of " + MULTIPART_FORM_DATA
- + " request failed", e);
+ throw new TurbineException(
+ "Processing of " + MULTIPART_FORM_DATA +
+ " request failed", e);
}
}
1.12 +5 -3 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- UploadService.java 2001/05/18 20:03:33 1.11
+++ UploadService.java 2001/06/14 14:44:56 1.12
@@ -68,7 +68,7 @@
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: UploadService.java,v 1.11 2001/05/18 20:03:33 dlr Exp $
+ * @version $Id: UploadService.java,v 1.12 2001/06/14 14:44:56 jvanzyl Exp $
*/
public interface UploadService
extends Service
@@ -166,7 +166,8 @@
* value, and use an action + no auto upload to enforce limits.
*
*/
- public static final Integer SIZE_MAX_DEFAULT = new Integer(1048576);
+ //public static final Integer SIZE_MAX_DEFAULT = new Integer(1048576);
+ public static final int SIZE_MAX_DEFAULT = 1048576;
/**
* The key in UploadService properties in
@@ -180,7 +181,8 @@
* request that will have it's components stored temporarily in
* memory, instead of disk.
*/
- public static final Integer SIZE_THRESHOLD_DEFAULT = new Integer(10240);
+ //public static final Integer SIZE_THRESHOLD_DEFAULT = new Integer(10240);
+ public static final int SIZE_THRESHOLD_DEFAULT = 10240;
/**
* <p> This method performs parsing the request, and storing the
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org