Repository: openmeetings Updated Branches: refs/heads/master f8f2799cb -> 9634f6ad2
[OPENMEETINGS-980] wicket is switched to the latest SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/9634f6ad Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/9634f6ad Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/9634f6ad Branch: refs/heads/master Commit: 9634f6ad29e8c5fb19b4b6a6a4efbccc0f0f4de8 Parents: f8f2799 Author: Maxim Solodovnik <[email protected]> Authored: Sun Sep 10 20:28:46 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sun Sep 10 20:28:46 2017 +0700 ---------------------------------------------------------------------- .../org/apache/openmeetings/web/admin/backup/BackupPanel.java | 4 ++-- .../org/apache/openmeetings/web/admin/labels/LangPanel.java | 4 ++-- .../org/apache/openmeetings/web/common/tree/FileTreePanel.java | 4 ++-- .../main/java/org/apache/openmeetings/web/room/RoomPanel.java | 4 ++-- .../apache/openmeetings/web/room/menu/StartSharingButton.java | 6 +++--- .../web/user/record/RecordingResourceReference.java | 4 ---- .../org/apache/openmeetings/web/user/record/VideoInfo.java | 4 ++-- pom.xml | 2 +- 8 files changed, 14 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9634f6ad/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java index 25ba67c..1a569ab 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java @@ -39,7 +39,7 @@ 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.AjaxDownloadBehavior; 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; @@ -108,7 +108,7 @@ public class BackupPanel extends AdminPanel { setMaxSize(Bytes.bytes(maxBytes)); // Add a component to download a file without page refresh - final AjaxDownload download = new AjaxDownload(new IResource() { + final AjaxDownloadBehavior download = new AjaxDownloadBehavior(new IResource() { private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9634f6ad/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java index a8ce7a5..d72f6e5 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java @@ -44,7 +44,7 @@ import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior; import org.apache.wicket.ajax.markup.html.AjaxLink; -import org.apache.wicket.extensions.ajax.AjaxDownload; +import org.apache.wicket.extensions.ajax.AjaxDownloadBehavior; import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; @@ -175,7 +175,7 @@ public class LangPanel extends AdminPanel { }); // Add a component to download a file without page refresh - final AjaxDownload download = new AjaxDownload(new ResourceStreamResource() { + final AjaxDownloadBehavior download = new AjaxDownloadBehavior(new ResourceStreamResource() { private static final long serialVersionUID = 1L; { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9634f6ad/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java index 2368f4c..95f71c8 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java @@ -50,7 +50,7 @@ import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.CallbackParameter; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; -import org.apache.wicket.extensions.ajax.AjaxDownload; +import org.apache.wicket.extensions.ajax.AjaxDownloadBehavior; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -86,7 +86,7 @@ public abstract class FileTreePanel extends Panel { private FileItem lastSelected = null; private Map<String, FileItem> selected = new HashMap<>(); File dwnldFile; - final AjaxDownload downloader = new AjaxDownload(new IResource() { + final AjaxDownloadBehavior downloader = new AjaxDownloadBehavior(new IResource() { private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9634f6ad/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java index 3735608..e98f77a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java @@ -80,7 +80,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.event.IEvent; -import org.apache.wicket.extensions.ajax.AjaxDownload; +import org.apache.wicket.extensions.ajax.AjaxDownloadBehavior; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; @@ -169,7 +169,7 @@ public class RoomPanel extends BasePanel { private String sharingUser = null; private String recordingUser = null; private byte[] pdfWb; - private final AjaxDownload download = new AjaxDownload(new ResourceStreamResource() { + private final AjaxDownloadBehavior download = new AjaxDownloadBehavior(new ResourceStreamResource() { private static final long serialVersionUID = 1L; { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9634f6ad/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java index 4d50549..aa17904 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java @@ -45,7 +45,7 @@ import org.apache.openmeetings.web.common.OmButton; import org.apache.openmeetings.web.room.VideoSettings; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.behavior.AttributeAppender; -import org.apache.wicket.extensions.ajax.AjaxDownload; +import org.apache.wicket.extensions.ajax.AjaxDownloadBehavior; import org.apache.wicket.request.resource.ResourceStreamResource; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; @@ -59,7 +59,7 @@ public class StartSharingButton extends OmButton { private static final Logger log = Red5LoggerFactory.getLogger(StartSharingButton.class, webAppRootKey); private static final String CDATA_BEGIN = "<![CDATA["; private static final String CDATA_END = "]]>"; - private final AjaxDownload download; + private final AjaxDownloadBehavior download; private final String uid; private String app = ""; @@ -69,7 +69,7 @@ public class StartSharingButton extends OmButton { setOutputMarkupPlaceholderTag(true); setVisible(false); add(new AttributeAppender("title", Application.getString("1480"))); - add(download = new AjaxDownload(new ResourceStreamResource() { + add(download = new AjaxDownloadBehavior(new ResourceStreamResource() { private static final long serialVersionUID = 1L; { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9634f6ad/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java index c68ee6d..63b7882 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java @@ -18,13 +18,11 @@ */ package org.apache.openmeetings.web.user.record; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.Application.getOnlineClient; import static org.apache.openmeetings.web.app.WebSession.getExternalType; import static org.apache.openmeetings.web.app.WebSession.getRecordingId; import static org.apache.openmeetings.web.app.WebSession.getUserId; -import static org.red5.logging.Red5LoggerFactory.getLogger; import java.util.Map.Entry; @@ -44,11 +42,9 @@ import org.apache.openmeetings.web.util.FileItemResourceReference; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.resource.IResource.Attributes; import org.apache.wicket.util.string.StringValue; -import org.slf4j.Logger; public abstract class RecordingResourceReference extends FileItemResourceReference<Recording> { private static final long serialVersionUID = 1L; - private static final Logger log = getLogger(RecordingResourceReference.class, webAppRootKey); public RecordingResourceReference(String name) { super(name); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9634f6ad/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java index 76fd174..0891d5f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java @@ -41,7 +41,7 @@ import org.apache.openmeetings.db.entity.record.RecordingMetaData; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.web.common.InvitationDialog; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.extensions.ajax.AjaxDownload; +import org.apache.wicket.extensions.ajax.AjaxDownloadBehavior; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.panel.Panel; @@ -80,7 +80,7 @@ public class VideoInfo extends Panel { }.start(); } }; - private final AjaxDownload download = new AjaxDownload(new IResource() { + private final AjaxDownloadBehavior download = new AjaxDownloadBehavior(new IResource() { private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9634f6ad/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4de1a3c..898aa3c 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ <maven.javadoc.version>2.10.3</maven.javadoc.version> <maven.surefire.version>2.20</maven.surefire.version> <maven-site.version>3.3</maven-site.version> - <wicket.version>8.0.0-M7</wicket.version> + <wicket.version>8.0.0-SNAPSHOT</wicket.version> <wicketju.version>8.0.0-M7</wicketju.version> <wickets.version>8.0.0-M7</wickets.version> <red5-server.version>1.0.10-M4</red5-server.version>
