Author: solomax
Date: Wed Oct 17 05:49:20 2012
New Revision: 1399103
URL: http://svn.apache.org/viewvc?rev=1399103&view=rev
Log:
Error in backup is fixed.
Wicket: backup download is fixed
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java?rev=1399103&r1=1399102&r2=1399103&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java
Wed Oct 17 05:49:20 2012
@@ -126,7 +126,7 @@ public class Users implements Serializab
@Basic(fetch = FetchType.LAZY)
@Column(name = "password")
@LoadFetchGroup("backupexport")
- @Element(name = "pass", data = true)
+ @Element(name = "pass", data = true, required = false)
private String password;
@Column(name = "regdate")
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html?rev=1399103&r1=1399102&r2=1399103&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html
Wed Oct 17 05:49:20 2012
@@ -38,15 +38,15 @@
<span wicket:id="progress">[[upload progressbar]]</span>
<br/>
<!-- Perform Download -->
- <input type="submit" value="System Import"
wicket:id="ajax-backup-upload-button" />
+ <input type="submit" value="System Import"
wicket:id="upload" />
<!-- Perform Upload -->
- <input type="submit" value="System Backup"
wicket:id="ajax-backup-download-button" />
+ <input type="submit"
wicket:ommessage="value:1066" wicket:id="download" />
<br/>
<!-- Max upload size -->
<wicket:ommessage key="1491" />
<br/>
<!-- Backup CLI import information -->
- <wicket:ommessage key="1505" />
+ <wicket:ommessage key="1505" style="white-space: pre;"/>
<br/>
</fieldset>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java?rev=1399103&r1=1399102&r2=1399103&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java
Wed Oct 17 05:49:20 2012
@@ -31,7 +31,6 @@ import org.apache.openmeetings.utils.OmF
import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.components.admin.AdminPanel;
-import org.apache.openmeetings.web.util.AjaxDownload;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import
org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar;
@@ -41,6 +40,8 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.upload.FileUploadField;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.request.handler.resource.ResourceStreamRequestHandler;
+import org.apache.wicket.request.resource.ContentDisposition;
import org.apache.wicket.util.lang.Bytes;
import org.apache.wicket.util.resource.FileResourceStream;
import org.red5.logging.Red5LoggerFactory;
@@ -93,12 +94,8 @@ public class BackupPanel extends AdminPa
setMaxSize(Bytes.bytes(ImportHelper.getMaxUploadSize(Application
.getBean(ConfigurationDaoImpl.class))));
- // Add a component to download a file without page
refresh
- final AjaxDownload download = new AjaxDownload();
- add(download);
-
// add an download button
- add(new AjaxButton("ajax-backup-download-button", this)
{
+ add(new AjaxButton("download", this) {
private static final long serialVersionUID =
839803820502260006L;
@Override
@@ -110,8 +107,7 @@ public class BackupPanel extends AdminPa
+
CalendarPatterns.getTimeForStreamId(new Date());
File backup_dir = new File(working_dir,
dateString);
- String requestedFile = dateString +
".zip";
- File backupFile = new File(backup_dir,
requestedFile);
+ File backupFile = new File(backup_dir,
dateString + ".zip");
try {
Application.getBean(BackupExport.class).performExport(
@@ -120,12 +116,11 @@ public class BackupPanel extends AdminPa
includeFilesInBackup.getConvertedInput()
.booleanValue());
-
download.setFileName(backupFile.getName());
- download.setResourceStream(new
FileResourceStream(
- new
org.apache.wicket.util.file.File(backupFile)));
-
- download.initiate(target);
-
+ ResourceStreamRequestHandler
handler
+ = new
ResourceStreamRequestHandler(new FileResourceStream(backupFile),
backupFile.getName());
+
handler.setContentDisposition(ContentDisposition.ATTACHMENT);
+
+
getRequestCycle().scheduleRequestHandlerAfterCurrent(handler);
} catch (Exception e) {
log.error("Exception on panel
backup download ", e);
uploadFeedback.error(e);
@@ -144,7 +139,7 @@ public class BackupPanel extends AdminPa
});
// add an upload button
- add(new AjaxButton("ajax-backup-upload-button", this) {
+ add(new AjaxButton("upload", this) {
private static final long serialVersionUID =
839803820502260006L;
@Override
