svn commit: r1037737 - in /myfaces/tobago/branches/tobago-1.0.x: extension/fileupload/src/main/java/org/apache/myfaces/tobago/fileupload/ theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/

[lo...@apache.org]

Author: lofwyr
Date: Mon Nov 22 14:41:44 2010
New Revision: 1037737

URL: http://svn.apache.org/viewvc?rev=1037737&view=rev
Log:
TOBAGO-946: FileUpload: Breach uploadMaxFileSize should be have error severity.

Modified:
    myfaces/tobago/branches/tobago-1.0.x/extension/fileupload/src/main/java/org/apache/myfaces/tobago/fileupload/FileUploadFacesContextFactoryImpl.java
    myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java

Modified: myfaces/tobago/branches/tobago-1.0.x/extension/fileupload/src/main/java/org/apache/myfaces/tobago/fileupload/FileUploadFacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/extension/fileupload/src/main/java/org/apache/myfaces/tobago/fileupload/FileUploadFacesContextFactoryImpl.java?rev=1037737&r1=1037736&r2=1037737&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/extension/fileupload/src/main/java/org/apache/myfaces/tobago/fileupload/FileUploadFacesContextFactoryImpl.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/extension/fileupload/src/main/java/org/apache/myfaces/tobago/fileupload/FileUploadFacesContextFactoryImpl.java Mon Nov 22 14:41:44 2010
@@ -17,19 +17,19 @@ package org.apache.myfaces.tobago.fileup
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.webapp.TobagoMultipartFormdataRequest;
-import org.apache.myfaces.tobago.util.JndiUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.tobago.util.JndiUtils;
+import org.apache.myfaces.tobago.webapp.TobagoMultipartFormdataRequest;
 
-import javax.faces.context.FacesContextFactory;
-import javax.faces.context.FacesContext;
-import javax.faces.lifecycle.Lifecycle;
 import javax.faces.FacesException;
 import javax.faces.application.FacesMessage;
-import javax.servlet.http.HttpServletRequest;
+import javax.faces.context.FacesContext;
+import javax.faces.context.FacesContextFactory;
+import javax.faces.lifecycle.Lifecycle;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 
 /**
@@ -130,7 +130,7 @@ public class FileUploadFacesContextFacto
           LOG.error("", e);
           FacesContext facesContext = facesContextFactory.getFacesContext(context, request, response, lifecycle);
           // TODO  better Message i18n Message?
-          FacesMessage facesMessage = new FacesMessage(e.getCause().getMessage());
+          FacesMessage facesMessage = new FacesMessage(FacesMessage.SEVERITY_ERROR, e.getCause().getMessage(), null);
           facesContext.addMessage(null, facesMessage);
           facesContext.renderResponse();
           return facesContext;

Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java?rev=1037737&r1=1037736&r2=1037737&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java Mon Nov 22 14:41:44 2010
@@ -25,8 +25,6 @@ package org.apache.myfaces.tobago.render
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_DISABLED;
-import static org.apache.myfaces.tobago.TobagoConstants.FACET_LABEL;
 import org.apache.myfaces.tobago.component.ComponentUtil;
 import org.apache.myfaces.tobago.component.UIFileInput;
 import org.apache.myfaces.tobago.context.ClientProperties;
@@ -44,6 +42,9 @@ import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 import java.io.IOException;
 
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_DISABLED;
+import static org.apache.myfaces.tobago.TobagoConstants.FACET_LABEL;
+
 public class FileRenderer extends InputRendererBase {
 
   private static final Log LOG = LogFactory.getLog(FileRenderer.class);
@@ -92,7 +93,7 @@ public class FileRenderer extends InputR
     if (request == null) {
       // should not be possible, because of the check in UIPage
       LOG.error("Can't process multipart/form-data without TobagoRequest. "
-          + "Please check the web.xml and define a TobagoMultipartFormdataFilter. "
+          + "Please use the tobago-fileupload.jar or check the web.xml and define a TobagoMultipartFormdataFilter. "
           + "See documentation for <tc:file>");
     } else {