Author: konstantin.mishin Date: 2010-11-23 14:54:43 -0500 (Tue, 23 Nov 2010) New Revision: 20152 Modified: sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/context/FileUploadPartialViewContextFactory.java sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml Log: RF-9497 Modified: sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/context/FileUploadPartialViewContextFactory.java =================================================================== --- sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/context/FileUploadPartialViewContextFactory.java 2010-11-23 17:02:21 UTC (rev 20151) +++ sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/context/FileUploadPartialViewContextFactory.java 2010-11-23 19:54:43 UTC (rev 20152) @@ -48,7 +48,7 @@ */ public class FileUploadPartialViewContextFactory extends PartialViewContextFactory { - private static final Logger LOGGER = RichfacesLogger.APPLICATION.getLogger(); + private static final Logger LOGGER = RichfacesLogger.CONTEXT.getLogger(); private static final Pattern AMPERSAND = Pattern.compile("&+"); Modified: sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml =================================================================== --- sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml 2010-11-23 17:02:21 UTC (rev 20151) +++ sandbox/trunk/ui/fileupload/ui/src/main/templates/fileupload.template.xml 2010-11-23 19:54:43 UTC (rev 20152) @@ -59,6 +59,10 @@ </span> </div> <div class="rf-fu-lst"/> + <cdk:object name="progressBar" value="#{component.facets['progress']}"/> + <c:if test="#{progressBar.isRendered()}"> + <cdk:call expression="progressBar.encodeAll(facesContext)" /> + </c:if> <iframe name="#{clientId}" class="rf-fu-frm"/> <script type="text/javascript">new RichFaces.ui.FileUpload('#{clientId}');</script> </div>