Re: svn commit: r599022 - in /myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces: custom/fileupload/ webapp/filter/
can you add the license headers? :-) On Nov 28, 2007 4:14 PM, [EMAIL PROTECTED] wrote: Author: mmarinschek Date: Wed Nov 28 07:14:17 2007 New Revision: 599022 URL: http://svn.apache.org/viewvc?rev=599022view=rev Log: fix for https://issues.apache.org/jira/browse/TOMAHAWK-6 (TOMAHAWK-6): Thanks to Alexander Jesse for helping me fixing this and testing the fix Added: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/DiskStorageStrategy.java myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/StorageStrategy.java Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/UploadedFile.java myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/UploadedFileDefaultFileImpl.java myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/UploadedFileDefaultMemoryImpl.java myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/MultipartRequestWrapper.java Added: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/DiskStorageStrategy.java URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/DiskStorageStrategy.java?rev=599022view=auto == --- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/DiskStorageStrategy.java (added) +++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/DiskStorageStrategy.java Wed Nov 28 07:14:17 2007 @@ -0,0 +1,9 @@ +package org.apache.myfaces.custom.fileupload; + +import java.io.File; + +public abstract class DiskStorageStrategy extends StorageStrategy { + + public abstract File getTempFile(); + +} Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java?rev=599022r1=599021r2=599022view=diff == --- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java (original) +++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java Wed Nov 28 07:14:17 2007 @@ -31,6 +31,7 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import javax.faces.FacesException; import javax.faces.context.ResponseWriter; import javax.faces.context.ExternalContext; import javax.faces.convert.ConverterException; @@ -126,7 +127,7 @@ ((HtmlInputFileUpload)uiComponent).setSubmittedValue(upFile); ((HtmlInputFileUpload)uiComponent).setValid(true); }catch(IOException ioe){ -log.error(ioe); +throw new FacesException(Exception while processing file upload for file-input : + uiComponent.getClientId(facesContext),ioe); } } return; @@ -165,7 +166,7 @@ ((HtmlInputFileUpload)uiComponent).setSubmittedValue(upFile); ((HtmlInputFileUpload)uiComponent).setValid(true); }catch(IOException ioe){ -log.error(ioe); + throw new FacesException(Exception while processing file upload for file-input : + uiComponent.getClientId(facesContext),ioe); } } } Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java?rev=599022r1=599021r2=599022view=diff == --- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java (original) +++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java Wed Nov 28 07:14:17 2007 @@ -20,8 +20,10 @@ import org.apache.myfaces.component.UserRoleAware; import org.apache.myfaces.component.UserRoleUtils; +import org.apache.myfaces.shared_tomahawk.util.MessageUtils; import org.apache.myfaces.shared_tomahawk.util._ComponentUtils; +import javax.faces.application.FacesMessage; import
Re: svn commit: r599022 - in /myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces: custom/fileupload/ webapp/filter/
sure, done - sorry. regards, Martin On 11/28/07, Matthias Wessendorf [EMAIL PROTECTED] wrote: can you add the license headers? :-) On Nov 28, 2007 4:14 PM, [EMAIL PROTECTED] wrote: Author: mmarinschek Date: Wed Nov 28 07:14:17 2007 New Revision: 599022 URL: http://svn.apache.org/viewvc?rev=599022view=rev Log: fix for https://issues.apache.org/jira/browse/TOMAHAWK-6 (TOMAHAWK-6): Thanks to Alexander Jesse for helping me fixing this and testing the fix Added: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/DiskStorageStrategy.java myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/StorageStrategy.java Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/UploadedFile.java myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/UploadedFileDefaultFileImpl.java myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/UploadedFileDefaultMemoryImpl.java myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/MultipartRequestWrapper.java Added: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/DiskStorageStrategy.java URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/DiskStorageStrategy.java?rev=599022view=auto == --- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/DiskStorageStrategy.java (added) +++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/DiskStorageStrategy.java Wed Nov 28 07:14:17 2007 @@ -0,0 +1,9 @@ +package org.apache.myfaces.custom.fileupload; + +import java.io.File; + +public abstract class DiskStorageStrategy extends StorageStrategy { + + public abstract File getTempFile(); + +} Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java?rev=599022r1=599021r2=599022view=diff == --- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java (original) +++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlFileUploadRenderer.java Wed Nov 28 07:14:17 2007 @@ -31,6 +31,7 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import javax.faces.FacesException; import javax.faces.context.ResponseWriter; import javax.faces.context.ExternalContext; import javax.faces.convert.ConverterException; @@ -126,7 +127,7 @@ ((HtmlInputFileUpload)uiComponent).setSubmittedValue(upFile); ((HtmlInputFileUpload)uiComponent).setValid(true); }catch(IOException ioe){ -log.error(ioe); +throw new FacesException(Exception while processing file upload for file-input : + uiComponent.getClientId(facesContext),ioe); } } return; @@ -165,7 +166,7 @@ ((HtmlInputFileUpload)uiComponent).setSubmittedValue(upFile); ((HtmlInputFileUpload)uiComponent).setValid(true); }catch(IOException ioe){ -log.error(ioe); + throw new FacesException(Exception while processing file upload for file-input : + uiComponent.getClientId(facesContext),ioe); } } } Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java?rev=599022r1=599021r2=599022view=diff == --- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java (original) +++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java Wed Nov 28 07:14:17 2007 @@ -20,8 +20,10 @@ import org.apache.myfaces.component.UserRoleAware; import org.apache.myfaces.component.UserRoleUtils; +import org.apache.myfaces.shared_tomahawk.util.MessageUtils; import org.apache.myfaces.shared_tomahawk.util._ComponentUtils; +import