Author: wesw
Date: Tue Jun 9 14:13:34 2009
New Revision: 783009
URL: http://svn.apache.org/viewvc?rev=783009&view=rev
Log:
Seems to be working, tested with showcase WW-3100
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/DiskFileItemFactoryWrapper.java
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/EnhancedJakartaMultiPartRequest.java
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml
Modified: struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml?rev=783009&r1=783008&r2=783009&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml (original)
+++ struts/sandbox/trunk/struts2-fileupload-plugin/pom.xml Tue Jun 9 14:13:34
2009
@@ -38,13 +38,11 @@
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2.1</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
<version>2.1.7-SNAPSHOT</version>
- <scope>compile</scope>
</dependency>
<dependency>
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/DiskFileItemFactoryWrapper.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/DiskFileItemFactoryWrapper.java?rev=783009&r1=783008&r2=783009&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/DiskFileItemFactoryWrapper.java
(original)
+++
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/DiskFileItemFactoryWrapper.java
Tue Jun 9 14:13:34 2009
@@ -52,20 +52,16 @@
* @param sizeThreshold
* @param repositoryPath
*/
+ @Inject
public DiskFileItemFactoryWrapper(
- @Inject(FileUploadConstants.SIZE_THRESHOLD)
- String sizeThreshold,
- @Inject(FileUploadConstants.FILE_REPOSITORY_PATH)
- String repositoryPath ) {
+ @Inject(FileUploadConstants.SIZE_THRESHOLD) String sizeThreshold,
+ @Inject(FileUploadConstants.FILE_REPOSITORY_PATH) String
repositoryPath ) {
int threshold ;
try {
threshold = Integer.parseInt(sizeThreshold);
}
catch (NumberFormatException nfe) {
- // how hard is it to specify a valid integer?
- }
- finally {
threshold = 256; // I guess this is a magic number
}
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/EnhancedJakartaMultiPartRequest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/EnhancedJakartaMultiPartRequest.java?rev=783009&r1=783008&r2=783009&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/EnhancedJakartaMultiPartRequest.java
(original)
+++
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/java/org/apache/struts2/fileupload/EnhancedJakartaMultiPartRequest.java
Tue Jun 9 14:13:34 2009
@@ -54,7 +54,7 @@
static final Logger LOG = LoggerFactory.getLogger(MultiPartRequest.class);
protected ProgressListener progressListener;
- protected FileItemFactory fileItemFactory;
+ protected FileItemFactoryWrapper fileItemFactoryWrapper;
protected boolean portletUpload;
/**
@@ -68,11 +68,11 @@
/**
*
- * @param fileItemFactory
+ * @param fileItemFactoryWrapper
*/
@Inject(FileUploadConstants.FILE_ITEM_FACTORY)
- public void setFileItemFactory(FileItemFactory fileItemFactory) {
- this.fileItemFactory = fileItemFactory;
+ public void setFileItemFactory(FileItemFactoryWrapper
fileItemFactoryWrapper) {
+ this.fileItemFactoryWrapper = fileItemFactoryWrapper;
}
/**
@@ -96,10 +96,10 @@
FileUpload upload ;
if (portletUpload) {
- upload = new PortletFileUpload(fileItemFactory);
+ upload = new
PortletFileUpload(fileItemFactoryWrapper.getFileItemFactory());
}
else {
- upload = new ServletFileUpload(fileItemFactory);
+ upload = new
ServletFileUpload(fileItemFactoryWrapper.getFileItemFactory());
}
upload.setSizeMax(maxSize);
Modified:
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml?rev=783009&r1=783008&r2=783009&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml
(original)
+++
struts/sandbox/trunk/struts2-fileupload-plugin/src/main/resources/struts-plugin.xml
Tue Jun 9 14:13:34 2009
@@ -44,6 +44,7 @@
<constant name="struts.fileuploadplugin.listenerupdatefrequency"
value="2048" />
<constant name="struts.fileuploadplugin.isportletupload" value="false"/>
<constant name="struts.fileuploadplugin.timetokeepstatus" value="600" />
+ <constant name="struts.multipart.handler" value="upload-plugin"/>
<package name="uploadStatus" namespace="/upload" extends="struts-default">
<action name="status"
class="org.apache.struts2.fileupload.UploadStatusAction">
