[richfaces-svn-commits] JBoss Rich Faces SVN: r16833 - in branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf: webapp and 1 other directory.
Author: konstantin.mishin
Date: 2010-04-28 14:23:52 -0400 (Wed, 28 Apr 2010)
New Revision: 16833
Modified:
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/request/FileParam.java
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
Log:
RFPL-548
Modified:
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/request/FileParam.java
===================================================================
---
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/request/FileParam.java 2010-04-28
18:15:37 UTC (rev 16832)
+++
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/request/FileParam.java 2010-04-28
18:23:52 UTC (rev 16833)
@@ -81,10 +81,14 @@
return fileSize;
}
- public File createTempFile() {
+ public File createTempFile(String tempFilesDirectory) {
try {
+ File dir = null;
+ if (tempFilesDirectory != null) {
+ dir = new File(tempFilesDirectory);
+ }
tempFile = File.createTempFile(new UID().toString().replace(
- ":", "-"), ".upload");
+ ":", "-"), ".upload", dir);
fOut = new FileOutputStream(tempFile);
} catch (IOException ex) {
if (fOut != null) {
Modified:
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java
===================================================================
---
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java 2010-04-28
18:15:37 UTC (rev 16832)
+++
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java 2010-04-28
18:23:52 UTC (rev 16833)
@@ -69,6 +69,8 @@
private boolean createTempFiles;
+ private String tempFilesDirectory;
+
private String uid;
private String encoding = null;
@@ -106,10 +108,11 @@
private boolean shouldStop = false;
private boolean canceled;
- public MultipartRequest(HttpServletRequest request,
- boolean createTempFiles, int maxRequestSize, String uid) {
+ public MultipartRequest(HttpServletRequest request, boolean createTempFiles,
+ String tempFilesDirectory, int maxRequestSize, String uid) {
super(request);
this.createTempFiles = createTempFiles;
+ this.tempFilesDirectory = tempFilesDirectory;
this.uid = uid;
String contentLength = request.getHeader("Content-Length");
@@ -227,7 +230,7 @@
this.keys.add(paramName);
if (createTempFiles) {
- fp.createTempFile();
+ fp.createTempFile(tempFilesDirectory);
}
fp.setContentType(headers.get(PARAM_CONTENT_TYPE));
fp.setFilename(decodeFileName(headers.get(PARAM_FILENAME)));
Modified:
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
===================================================================
---
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2010-04-28
18:15:37 UTC (rev 16832)
+++
branches/enterprise/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2010-04-28
18:23:52 UTC (rev 16833)
@@ -126,6 +126,8 @@
*/
private boolean createTempFiles = false;
+ private String tempFilesDirectory;
+
/**
* The maximum size of a file upload request. 0 means no limit.
*/
@@ -179,6 +181,9 @@
} else {
this.createTempFiles = true;
}
+
+ this.tempFilesDirectory =
filterConfig.getInitParameter("tempFilesDirectory");
+
param = filterConfig.getInitParameter("maxRequestSize");
if (param != null) {
this.maxRequestSize = Integer.parseInt(param);
@@ -323,7 +328,7 @@
if (uid != null) {
if (isMultipartRequest(httpRequest)) {
- MultipartRequest multipartRequest = new MultipartRequest(httpRequest,
createTempFiles, maxRequestSize, uid);
+ MultipartRequest multipartRequest = new MultipartRequest(httpRequest,
createTempFiles, tempFilesDirectory, maxRequestSize, uid);
Object oldAttributeValue =
httpRequest.getAttribute(FileUploadConstants.FILE_UPLOAD_REQUEST_ATTRIBUTE_NAME);
httpRequest.setAttribute(FileUploadConstants.FILE_UPLOAD_REQUEST_ATTRIBUTE_NAME,
multipartRequest);