balld 01/06/11 20:40:51
Modified: src/org/apache/cocoon/environment/http RequestWrapper22.java
RequestWrapper23.java
src/org/apache/cocoon/servlet CocoonServlet.java
Log:
brought into compliance with latest maybeupload api, added some fixed parameters to
CocoonServlet. should parameterize from cocoon.xconf though...
Revision Changes Path
1.2 +2 -3
xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper22.java
Index: RequestWrapper22.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper22.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestWrapper22.java 2001/05/09 20:49:46 1.1
+++ RequestWrapper22.java 2001/06/12 03:40:51 1.2
@@ -28,9 +28,8 @@
public class RequestWrapper extends MaybeUploadRequestWrapper {
- public RequestWrapper(HttpServletRequest httpservletrequest, File file, boolean
flag, boolean flag1)
- throws Exception {
- super(httpservletrequest, file, flag, flag1);
+ public RequestWrapper(HttpServletRequest httpservletrequest, boolean
saveUploadedFilesToDisk, File workDir, boolean allowOverwrite, boolean silentlyRename,
int maxBytes) throws Exception {
+ super(httpservletrequest, saveUploadedFilesToDisk, workDir, allowOverwrite,
silentlyRename, maxBytes);
}
}
1.2 +2 -3
xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper23.java
Index: RequestWrapper23.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper23.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestWrapper23.java 2001/05/09 20:49:46 1.1
+++ RequestWrapper23.java 2001/06/12 03:40:51 1.2
@@ -28,9 +28,8 @@
public class RequestWrapper extends MaybeUploadRequestWrapper implements
HttpServletRequest {
- public RequestWrapper(HttpServletRequest httpservletrequest, File file, boolean
flag, boolean flag1)
- throws Exception {
- super(httpservletrequest, file, flag, flag1);
+ public RequestWrapper(HttpServletRequest httpservletrequest, boolean
saveUploadedFilesToDisk, File workDir, boolean allowOverwrite, boolean silentlyRename,
int max) throws Exception {
+ super(httpservletrequest, saveUploadedFilesToDisk, workDir, allowOverwrite,
silentlyRename, max);
}
public java.util.Map getParameterMap() {
1.15 +6 -2 xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CocoonServlet.java 2001/06/08 14:33:35 1.14
+++ CocoonServlet.java 2001/06/12 03:40:51 1.15
@@ -58,7 +58,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.14 $ $Date: 2001/06/08 14:33:35 $
+ * @version CVS $Revision: 1.15 $ $Date: 2001/06/12 03:40:51 $
*/
public class CocoonServlet extends HttpServlet {
@@ -78,6 +78,8 @@
private static final boolean ALLOW_OVERWRITE = false;
private static final boolean SILENTLY_RENAME = true;
+ private static final boolean SAVE_UPLOADED_FILES_TO_DISK = true;
+ private static final int MAX_UPLOAD_SIZE = 10000000; // 10Mb
private File uploadDir;
private File workDir;
@@ -373,9 +375,11 @@
if (contentType.startsWith("multipart/form-data")) {
try {
req = new RequestWrapper(request,
+ CocoonServlet.SAVE_UPLOADED_FILES_TO_DISK,
this.uploadDir,
CocoonServlet.ALLOW_OVERWRITE,
- CocoonServlet.SILENTLY_RENAME);
+ CocoonServlet.SILENTLY_RENAME,
+ CocoonServlet.MAX_UPLOAD_SIZE);
} catch (Exception e) {
log.warn("Could not create RequestWrapper", e);
req = request;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
