svn commit: r1789067 - /openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java

[solomax]

Author: solomax
Date: Tue Mar 28 08:58:26 2017
New Revision: 1789067

URL: http://svn.apache.org/viewvc?rev=1789067&view=rev
Log:
[OPENMEETINGS-980] first try to use internal wicket AjaxDownload

Modified:
    
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java?rev=1789067&r1=1789066&r2=1789067&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
 Tue Mar 28 08:58:26 2017
@@ -22,6 +22,7 @@ import static org.apache.openmeetings.ut
 import static org.apache.openmeetings.web.app.Application.getBean;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.text.DecimalFormat;
 import java.util.Date;
 
@@ -33,11 +34,11 @@ import org.apache.openmeetings.util.Cale
 import org.apache.openmeetings.util.OmFileHelper;
 import org.apache.openmeetings.web.admin.AdminPanel;
 import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.util.AjaxDownload;
 import org.apache.openmeetings.web.util.upload.BootstrapFileUploadBehavior;
 import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
+import org.apache.wicket.extensions.ajax.AjaxDownload;
 import 
org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.CheckBox;
@@ -45,8 +46,8 @@ import org.apache.wicket.markup.html.for
 import org.apache.wicket.markup.html.form.upload.FileUpload;
 import org.apache.wicket.markup.html.form.upload.FileUploadField;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.resource.FileSystemResource;
 import org.apache.wicket.util.lang.Bytes;
-import org.apache.wicket.util.resource.FileResourceStream;
 import org.apache.wicket.util.time.Duration;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -106,7 +107,14 @@ public class BackupPanel extends AdminPa
                        setMaxSize(Bytes.bytes(maxBytes));
 
                        // Add a component to download a file without page 
refresh
-                       final AjaxDownload download = new AjaxDownload();
+                       final AjaxDownload download = new AjaxDownload(new 
FileSystemResource() {
+                               private static final long serialVersionUID = 1L;
+
+                               @Override
+                               protected ResourceResponse 
createResourceResponse(Path path) {
+                                       return 
super.createResourceResponse(backupFile.toPath());
+                               }
+                       });
                        add(download);
                        // add an download button
                        add(new AjaxButton("download", this) {
@@ -166,8 +174,6 @@ public class BackupPanel extends AdminPa
                                        timer.stop(target);
                                        
target.add(progressBar.setVisible(false));
 
-                                       
download.setFileName(backupFile.getName());
-                                       download.setResourceStream(new 
FileResourceStream(backupFile));
                                        download.initiate(target);
                                }
                        
}).setVisible(false).setOutputMarkupPlaceholderTag(true));