You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2019/06/04 05:17:12 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2051] wicket
and mina versions are updated
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 4643387 [OPENMEETINGS-2051] wicket and mina versions are updated
4643387 is described below
commit 464338710f9cf4590b723451e3af6ad6d32e9432
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Jun 4 12:16:59 2019 +0700
[OPENMEETINGS-2051] wicket and mina versions are updated
---
.../openmeetings/web/admin/AdminBaseForm.java | 5 +-
.../openmeetings/web/admin/backup/BackupPanel.java | 8 ++--
.../openmeetings/web/admin/labels/LangForm.java | 4 +-
.../openmeetings/web/admin/labels/LangPanel.java | 4 +-
.../openmeetings/web/common/OmWebSocketPanel.java | 4 +-
.../web/common/tree/FileTreePanel.java | 53 +++++++++++-----------
.../web/pages/install/InstallWizard.java | 4 +-
.../web/room/OmRedirectTimerBehavior.java | 8 ++--
.../apache/openmeetings/web/room/RoomPanel.java | 4 +-
.../web/room/sidebar/UploadDialog.java | 4 +-
.../web/user/calendar/CalendarPanel.java | 41 +++++++++--------
.../openmeetings/web/user/chat/ChatToolbar.java | 4 +-
.../web/user/profile/EditProfileForm.java | 5 +-
.../openmeetings/web/user/record/VideoInfo.java | 33 +++++++-------
pom.xml | 4 +-
15 files changed, 95 insertions(+), 90 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
index bb14f0e..5491c82 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
@@ -18,11 +18,12 @@
*/
package org.apache.openmeetings.web.admin;
+import java.time.Duration;
+
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.util.time.Duration;
/**
* provides basic functionality to insert, update, remove, refresh record in
@@ -36,7 +37,7 @@ public abstract class AdminBaseForm<T> extends Form<T> {
private static final long serialVersionUID = 1L;
private AdminActionsPanel<T> savePanel;
protected final AjaxFormValidatingBehavior validationBehavior
- = new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND);
+ = new AjaxFormValidatingBehavior("keydown", Duration.ofSeconds(1));
public AdminBaseForm(String id, IModel<T> object) {
super(id, object);
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 02508c6..701e4c1 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
@@ -18,12 +18,13 @@
*/
package org.apache.openmeetings.web.admin.backup;
+import static java.time.Duration.ZERO;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getMaxUploadSize;
-import static org.apache.wicket.util.time.Duration.NONE;
import java.io.File;
import java.nio.file.Path;
import java.text.DecimalFormat;
+import java.time.Duration;
import java.util.Date;
import org.apache.openmeetings.backup.BackupExport;
@@ -48,7 +49,6 @@ import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.resource.FileSystemResource;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.lang.Bytes;
-import org.apache.wicket.util.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -121,7 +121,7 @@ public class BackupPanel extends AdminBasePanel {
@Override
protected ResourceResponse createResourceResponse(Attributes attr, Path path) {
ResourceResponse response = super.createResourceResponse(attr, path);
- response.setCacheDuration(NONE);
+ response.setCacheDuration(ZERO);
return response;
}
}.respond(attributes);
@@ -154,7 +154,7 @@ public class BackupPanel extends AdminBasePanel {
target.add(feedback);
}
});
- add(timer = new AbstractAjaxTimerBehavior(Duration.ONE_SECOND) {
+ add(timer = new AbstractAjaxTimerBehavior(Duration.ofSeconds(1)) {
private static final long serialVersionUID = 1L;
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
index 531fd8e..662a4d4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.admin.labels;
+import java.time.Duration;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.List;
@@ -33,7 +34,6 @@ import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.util.time.Duration;
/**
* Modify the language selection, add/delete language
@@ -84,7 +84,7 @@ public class LangForm extends Form<Void> {
add(languages);
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
- add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
+ add(new AjaxFormValidatingBehavior("keydown", Duration.ofSeconds(1)));
}
static List<Map.Entry<Long, Locale>> getLanguages() {
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 da9fe71..3e1f0db 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
@@ -18,9 +18,9 @@
*/
package org.apache.openmeetings.web.admin.labels;
+import static java.time.Duration.ZERO;
import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
import static org.apache.wicket.request.resource.ContentDisposition.ATTACHMENT;
-import static org.apache.wicket.util.time.Duration.NONE;
import java.io.IOException;
import java.io.InputStream;
@@ -180,7 +180,7 @@ public class LangPanel extends AdminBasePanel {
{
setContentDisposition(ATTACHMENT);
- setCacheDuration(NONE);
+ setCacheDuration(ZERO);
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java
index e869a83..54053ed 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java
@@ -22,6 +22,7 @@ import static org.apache.openmeetings.core.remote.KurentoHandler.KURENTO_TYPE;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import java.io.IOException;
+import java.time.Duration;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.openmeetings.core.remote.KurentoHandler;
@@ -44,7 +45,6 @@ import org.apache.wicket.protocol.ws.api.message.ConnectedMessage;
import org.apache.wicket.protocol.ws.api.message.ErrorMessage;
import org.apache.wicket.protocol.ws.api.message.TextMessage;
import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.wicket.util.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +55,7 @@ public abstract class OmWebSocketPanel extends Panel {
private static final Logger log = LoggerFactory.getLogger(OmWebSocketPanel.class);
public static final String CONNECTED_MSG = "socketConnected";
private final AtomicBoolean connected = new AtomicBoolean();
- private final AbstractAjaxTimerBehavior pingTimer = new AbstractAjaxTimerBehavior(Duration.seconds(30)) {
+ private final AbstractAjaxTimerBehavior pingTimer = new AbstractAjaxTimerBehavior(Duration.ofSeconds(30)) {
private static final long serialVersionUID = 1L;
@Override
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 66582a2..b3ff049 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
@@ -18,14 +18,24 @@
*/
package org.apache.openmeetings.web.common.tree;
-import com.googlecode.wicket.jquery.core.JQueryBehavior;
-import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.jquery.core.ajax.IJQueryAjaxAware;
-import com.googlecode.wicket.jquery.core.ajax.JQueryAjaxBehavior;
-import com.googlecode.wicket.jquery.ui.form.button.AjaxSplitButton;
-import com.googlecode.wicket.jquery.ui.interaction.droppable.Droppable;
-import com.googlecode.wicket.jquery.ui.interaction.droppable.DroppableBehavior;
-import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem;
+import static java.time.Duration.ZERO;
+import static java.util.UUID.randomUUID;
+import static org.apache.commons.text.StringEscapeUtils.escapeEcmaScript;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PDF;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import static org.apache.openmeetings.web.common.BasePanel.EVT_CLICK;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
import org.apache.openmeetings.db.dao.file.FileItemDao;
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
@@ -55,23 +65,14 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.resource.FileSystemResource;
import org.apache.wicket.spring.injection.annot.SpringBean;
-import java.io.File;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import static java.util.UUID.randomUUID;
-import static org.apache.commons.text.StringEscapeUtils.escapeEcmaScript;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PDF;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
-import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import static org.apache.openmeetings.web.common.BasePanel.EVT_CLICK;
-import static org.apache.wicket.util.time.Duration.NONE;
+import com.googlecode.wicket.jquery.core.JQueryBehavior;
+import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.jquery.core.ajax.IJQueryAjaxAware;
+import com.googlecode.wicket.jquery.core.ajax.JQueryAjaxBehavior;
+import com.googlecode.wicket.jquery.ui.form.button.AjaxSplitButton;
+import com.googlecode.wicket.jquery.ui.interaction.droppable.Droppable;
+import com.googlecode.wicket.jquery.ui.interaction.droppable.DroppableBehavior;
+import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem;
public abstract class FileTreePanel extends Panel {
private static final long serialVersionUID = 1L;
@@ -98,7 +99,7 @@ public abstract class FileTreePanel extends Panel {
@Override
protected ResourceResponse createResourceResponse(Attributes attr, Path path) {
ResourceResponse response = super.createResourceResponse(attr, path);
- response.setCacheDuration(NONE);
+ response.setCacheDuration(ZERO);
return response;
}
}.respond(attributes);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
index a77ff8a..5edaf3c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
@@ -32,6 +32,7 @@ import java.net.URI;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -78,7 +79,6 @@ import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.model.StringResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.util.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.orm.jpa.LocalEntityManagerFactoryBean;
@@ -668,7 +668,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
super(paramsStep4);
// Timer //
- container.add(timer = new AbstractAjaxTimerBehavior(Duration.ONE_SECOND) {
+ container.add(timer = new AbstractAjaxTimerBehavior(Duration.ofSeconds(1)) {
private static final long serialVersionUID = 1L;
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/OmRedirectTimerBehavior.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/OmRedirectTimerBehavior.java
index 292dd48..76a198f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/OmRedirectTimerBehavior.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/OmRedirectTimerBehavior.java
@@ -18,10 +18,10 @@
*/
package org.apache.openmeetings.web.room;
-import org.apache.openmeetings.web.app.WebSession;
+import java.time.Duration;
+
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.util.time.Duration;
public abstract class OmRedirectTimerBehavior extends AbstractAjaxTimerBehavior {
private static final long serialVersionUID = 1L;
@@ -30,14 +30,14 @@ public abstract class OmRedirectTimerBehavior extends AbstractAjaxTimerBehavior
private final String labelId;
public OmRedirectTimerBehavior(int delay, String labelId) {
- super(Duration.ONE_SECOND);
+ super(Duration.ofSeconds(1));
clock = System.currentTimeMillis();
this.delay = delay;
this.labelId = labelId;
}
protected static String getTime(int remain) {
- return Duration.seconds(remain).toString(WebSession.get().getLocale());
+ return Duration.ofSeconds(remain).toString();
}
public static String getText(String text, int remain) {
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 4734df8..4796669 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
@@ -18,13 +18,13 @@
*/
package org.apache.openmeetings.web.room;
+import static java.time.Duration.ZERO;
import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getChromeExtensionUrl;
import static org.apache.openmeetings.web.app.WebSession.getDateFormat;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.room.wb.InterviewWbPanel.INTERVIEWWB_JS_REFERENCE;
import static org.apache.openmeetings.web.room.wb.WbPanel.WB_JS_REFERENCE;
-import static org.apache.wicket.util.time.Duration.NONE;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -198,7 +198,7 @@ public class RoomPanel extends BasePanel {
private static final long serialVersionUID = 1L;
{
- setCacheDuration(NONE);
+ setCacheDuration(ZERO);
setFileName("whiteboard.pdf");
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
index c88948c..132676d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
@@ -21,6 +21,7 @@ package org.apache.openmeetings.web.room.sidebar;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getMaxUploadSize;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -58,7 +59,6 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.lang.Bytes;
import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.util.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -107,7 +107,7 @@ public class UploadDialog extends AbstractFormDialog<String> {
@SpringBean
private FileItemLogDao fileLogDao;
- private final AbstractAjaxTimerBehavior timer = new AbstractAjaxTimerBehavior(Duration.ONE_SECOND) {
+ private final AbstractAjaxTimerBehavior timer = new AbstractAjaxTimerBehavior(Duration.ofSeconds(1)) {
private static final long serialVersionUID = 1L;
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
index 9371254..7fb892a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
@@ -18,12 +18,19 @@
*/
package org.apache.openmeetings.web.user.calendar;
-import com.github.openjson.JSONObject;
-import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.jquery.ui.calendar.Calendar;
-import com.googlecode.wicket.jquery.ui.calendar.CalendarView;
-import com.googlecode.wicket.jquery.ui.calendar.EventSource.GoogleCalendar;
-import com.googlecode.wicket.jquery.ui.form.button.Button;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import static org.apache.openmeetings.web.util.CalendarWebHelper.getDate;
+import static org.apache.openmeetings.web.util.CalendarWebHelper.getZoneId;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.http.client.HttpClient;
import org.apache.http.client.protocol.HttpClientContext;
@@ -50,26 +57,20 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.wicket.util.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.time.LocalDateTime;
-import java.time.ZonedDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-
-import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import static org.apache.openmeetings.web.util.CalendarWebHelper.getDate;
-import static org.apache.openmeetings.web.util.CalendarWebHelper.getZoneId;
+import com.github.openjson.JSONObject;
+import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.jquery.ui.calendar.Calendar;
+import com.googlecode.wicket.jquery.ui.calendar.CalendarView;
+import com.googlecode.wicket.jquery.ui.calendar.EventSource.GoogleCalendar;
+import com.googlecode.wicket.jquery.ui.form.button.Button;
public class CalendarPanel extends UserBasePanel {
private static final Logger log = LoggerFactory.getLogger(CalendarPanel.class);
private static final long serialVersionUID = 1L;
- private final AbstractAjaxTimerBehavior refreshTimer = new AbstractAjaxTimerBehavior(Duration.seconds(10)) {
+ private final AbstractAjaxTimerBehavior refreshTimer = new AbstractAjaxTimerBehavior(Duration.ofSeconds(10)) {
private static final long serialVersionUID = 1L;
@Override
@@ -77,7 +78,7 @@ public class CalendarPanel extends UserBasePanel {
refresh(target);
}
};
- private AbstractAjaxTimerBehavior syncTimer = new AbstractAjaxTimerBehavior(Duration.minutes(4)) {
+ private AbstractAjaxTimerBehavior syncTimer = new AbstractAjaxTimerBehavior(Duration.ofMinutes(4)) {
private static final long serialVersionUID = 1L;
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
index 644620e..761c17f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
@@ -19,6 +19,7 @@
package org.apache.openmeetings.web.user.chat;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.time.Duration.ZERO;
import static org.apache.openmeetings.core.util.ChatWebSocketHelper.ID_ALL;
import static org.apache.openmeetings.db.util.AuthLevelUtil.hasAdminLevel;
import static org.apache.openmeetings.web.app.WebSession.getDateFormat;
@@ -26,7 +27,6 @@ import static org.apache.openmeetings.web.app.WebSession.getRights;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.common.BasePanel.EVT_CLICK;
import static org.apache.openmeetings.web.room.RoomPanel.isModerator;
-import static org.apache.wicket.util.time.Duration.NONE;
import java.util.List;
@@ -74,7 +74,7 @@ public class ChatToolbar extends Panel implements IWysiwygToolbar {
private final String quoteReplacement = new StringBuilder().append(QUOTE_CHAR).append(QUOTE_CHAR).toString();
{
- setCacheDuration(NONE);
+ setCacheDuration(ZERO);
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
index 4cdcfc2..7493ecd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
@@ -21,6 +21,8 @@ package org.apache.openmeetings.web.user.profile;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.common.BasePanel.EVT_CLICK;
+import java.time.Duration;
+
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.Application;
@@ -44,7 +46,6 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.util.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -126,7 +127,7 @@ public class EditProfileForm extends Form<User> {
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
- add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
+ add(new AjaxFormValidatingBehavior("keydown", Duration.ofSeconds(1)));
add(new BookmarkablePageLink<>("link", PrivacyPage.class));
}
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 dbc02a6..560d7dc 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
@@ -18,11 +18,17 @@
*/
package org.apache.openmeetings.web.user.record;
-import com.googlecode.wicket.jquery.ui.JQueryIcon;
-import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
-import com.googlecode.wicket.jquery.ui.form.button.AjaxSplitButton;
-import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem;
-import com.googlecode.wicket.jquery.ui.widget.menu.MenuItem;
+import static java.time.Duration.ZERO;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
+import static org.apache.openmeetings.util.OmFileHelper.getRecordingChunk;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
import org.apache.openmeetings.core.converter.IRecordingConverter;
import org.apache.openmeetings.core.converter.InterviewConverter;
import org.apache.openmeetings.core.converter.RecordingConverter;
@@ -46,16 +52,11 @@ import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.resource.FileSystemResource;
import org.apache.wicket.spring.injection.annot.SpringBean;
-import java.io.File;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
-import static org.apache.openmeetings.util.OmFileHelper.getRecordingChunk;
-import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import static org.apache.wicket.util.time.Duration.NONE;
+import com.googlecode.wicket.jquery.ui.JQueryIcon;
+import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
+import com.googlecode.wicket.jquery.ui.form.button.AjaxSplitButton;
+import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem;
+import com.googlecode.wicket.jquery.ui.widget.menu.MenuItem;
public class VideoInfo extends Panel {
private static final long serialVersionUID = 1L;
@@ -92,7 +93,7 @@ public class VideoInfo extends Panel {
@Override
protected ResourceResponse createResourceResponse(Attributes attr, Path path) {
ResourceResponse response = super.createResourceResponse(attr, path);
- response.setCacheDuration(NONE);
+ response.setCacheDuration(ZERO);
return response;
}
}.respond(attributes);
diff --git a/pom.xml b/pom.xml
index ee78753..1a3cf0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,12 +73,12 @@
<forbiddenapis.version>2.6</forbiddenapis.version>
<!-- dependency versions -->
<junit.version>5.4.2</junit.version>
- <wicket.version>9.0.0-M1</wicket.version>
+ <wicket.version>9.0.0-M2</wicket.version>
<wicketju.version>9.0.0-SNAPSHOT</wicketju.version>
<wickets.version>9.0.0-M1</wickets.version>
<red5-client.version>1.1.0</red5-client.version>
<spring.version>5.1.7.RELEASE</spring.version>
- <mina.version>2.1.2</mina.version>
+ <mina.version>2.1.3</mina.version>
<tomcat.version>9.0.20</tomcat.version>
<ical4j.version>3.0.6</ical4j.version>
<cxf.version>3.3.2</cxf.version>