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 3892f8e [OPENMEETINGS-1716] master is moved to wicket9 and java11
3892f8e is described below
commit 3892f8e15b8e35843e60f1019dc58c969b2969eb
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Mon Apr 22 17:51:10 2019 +0700
[OPENMEETINGS-1716] master is moved to wicket9 and java11
---
openmeetings-core/pom.xml | 6 ++++++
openmeetings-server/src/site/xdoc/BuildInstructions.xml | 2 +-
openmeetings-server/src/site/xdoc/ReleaseGuide.xml | 2 +-
openmeetings-server/src/site/xdoc/WebsiteGuide.xml | 2 +-
openmeetings-server/src/site/xdoc/installation.xml | 2 +-
.../apache/openmeetings/util/crypt/SCryptImplementation.java | 2 +-
.../java/org/apache/openmeetings/web/admin/AdminBaseForm.java | 2 +-
.../openmeetings/web/admin/configurations/ConfigForm.java | 2 +-
.../openmeetings/web/admin/configurations/ConfigsPanel.java | 2 +-
.../openmeetings/web/admin/connection/ConnectionsPanel.java | 4 ++--
.../org/apache/openmeetings/web/admin/email/EmailPanel.java | 2 +-
.../apache/openmeetings/web/admin/groups/GroupUsersPanel.java | 2 +-
.../org/apache/openmeetings/web/admin/groups/GroupsPanel.java | 2 +-
.../org/apache/openmeetings/web/admin/labels/LangPanel.java | 4 ++--
.../org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java | 2 +-
.../org/apache/openmeetings/web/admin/oauth/OAuthForm.java | 2 +-
.../org/apache/openmeetings/web/admin/oauth/OAuthPanel.java | 2 +-
.../java/org/apache/openmeetings/web/admin/rooms/RoomForm.java | 4 ++--
.../org/apache/openmeetings/web/admin/rooms/RoomsPanel.java | 2 +-
.../org/apache/openmeetings/web/admin/users/UsersPanel.java | 2 +-
.../main/java/org/apache/openmeetings/web/app/Application.java | 8 +++-----
.../openmeetings/web/common/tree/ConvertingErrorsDialog.java | 2 +-
.../org/apache/openmeetings/web/common/tree/FileTreePanel.java | 2 +-
.../org/apache/openmeetings/web/common/tree/FolderPanel.java | 2 +-
.../openmeetings/web/pages/auth/ForgetPasswordDialog.java | 2 +-
.../org/apache/openmeetings/web/pages/auth/SignInDialog.java | 2 +-
.../apache/openmeetings/web/pages/install/InstallWizard.java | 2 +-
.../main/java/org/apache/openmeetings/web/room/RoomPanel.java | 2 +-
.../org/apache/openmeetings/web/room/sidebar/RoomSidebar.java | 2 +-
.../main/java/org/apache/openmeetings/web/room/wb/WbPanel.java | 2 +-
.../apache/openmeetings/web/user/calendar/CalendarPanel.java | 2 +-
.../openmeetings/web/user/profile/ChangePasswordDialog.java | 2 +-
.../apache/openmeetings/web/user/profile/EditProfileForm.java | 2 +-
.../apache/openmeetings/web/user/profile/InvitationsPanel.java | 2 +-
.../openmeetings/web/user/profile/MessagesContactsPanel.java | 10 +++++-----
.../apache/openmeetings/web/user/profile/UserSearchPanel.java | 4 ++--
.../org/apache/openmeetings/web/user/profile/WidgetsPanel.java | 2 +-
.../org/apache/openmeetings/web/user/rooms/RoomListPanel.java | 2 +-
.../org/apache/openmeetings/web/user/rooms/RoomsPanel.java | 2 +-
.../apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java | 4 ++--
pom.xml | 8 ++++----
41 files changed, 60 insertions(+), 56 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 2263c6b..6fa2ddb 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -79,6 +79,12 @@
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
<version>${api-all.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions.xml
b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
index 4aa9213..a96a73b 100644
--- a/openmeetings-server/src/site/xdoc/BuildInstructions.xml
+++ b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
@@ -32,7 +32,7 @@
<div>
<p>To build a binary release of OpenMeetings
you need: </p>
<ul>
- <li>Oracle JDK8</li>
+ <li>Oracle JDK11</li>
<li>Apache Maven (minimum) 3.5.0</li>
<li>Git</li>
</ul>
diff --git a/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
b/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
index 01da710..92ba70d 100644
--- a/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
+++ b/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
@@ -26,7 +26,7 @@
<div>
<p>To build a binary release of
OpenMeetings you need: </p>
<ul>
- <li>Sun JDK8</li>
+ <li>JDK11</li>
<li>Apache Maven 3.5.0</li>
<li>Git Command line client</li>
<li>A text editor</li>
diff --git a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
index 2204eeb..9f0cb77 100644
--- a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
+++ b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
@@ -24,7 +24,7 @@
<subsection name="Required tools">
<div>
<ul>
- <li>JDK8</li>
+ <li>JDK11</li>
<li>Apache Maven (3.5.0 or
later)</li>
</ul>
</div>
diff --git a/openmeetings-server/src/site/xdoc/installation.xml
b/openmeetings-server/src/site/xdoc/installation.xml
index 116e1d1..239e2c7 100644
--- a/openmeetings-server/src/site/xdoc/installation.xml
+++ b/openmeetings-server/src/site/xdoc/installation.xml
@@ -38,7 +38,7 @@
</li>
<li class="step download os">
<div><a
href="downloads.html" rel="nofollow">Download latest .zip (.tar.gz)</a></div>
- <div class="small">Java
8 required</div>
+ <div class="small">Java
11 required</div>
</li>
<li class="step unpack">
<div>Unpack + run
bin/startup.bat (.sh)</div>
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java
index c30bfa5..b0465a6 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
public class SCryptImplementation implements ICrypt {
private static final Logger log =
LoggerFactory.getLogger(SCryptImplementation.class);
- private static final ThreadLocal<SecureRandom> rnd = new
ThreadLocal<SecureRandom>() {
+ private static final ThreadLocal<SecureRandom> rnd = new
ThreadLocal<>() {
@Override
protected SecureRandom initialValue() {
SecureRandom sr;
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 03fb0fc..bb14f0e 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
@@ -41,7 +41,7 @@ public abstract class AdminBaseForm<T> extends Form<T> {
public AdminBaseForm(String id, IModel<T> object) {
super(id, object);
- savePanel = new AdminActionsPanel<T>("buttons", this) {
+ savePanel = new AdminActionsPanel<>("buttons", this) {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
index 761ae59..0eac1cf 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
@@ -66,7 +66,7 @@ public class ConfigForm extends AdminBaseForm<Configuration> {
setOutputMarkupId(true);
this.listContainer = listContainer;
valueS = new TextArea<>("valueS");
- valueN = new TextField<Long>("valueN") {
+ valueN = new TextField<>("valueN") {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
index 359f042..21744f3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
@@ -52,7 +52,7 @@ public class ConfigsPanel extends AdminBasePanel {
@Override
protected void onInitialize() {
- SearchableDataView<Configuration> dataView = new
SearchableDataView<Configuration>("configList"
+ SearchableDataView<Configuration> dataView = new
SearchableDataView<>("configList"
, new
SearchableDataProvider<>(ConfigurationDao.class)) {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
index 95e49f1..a5cc37c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
@@ -58,7 +58,7 @@ public class ConnectionsPanel extends AdminBasePanel {
public ConnectionsPanel(String id) {
super(id);
- SearchableDataProvider<Client> sdp = new
SearchableDataProvider<Client>(null) {
+ SearchableDataProvider<Client> sdp = new
SearchableDataProvider<>(null) {
private static final long serialVersionUID = 1L;
private List<Client> list() {
@@ -80,7 +80,7 @@ public class ConnectionsPanel extends AdminBasePanel {
};
final WebMarkupContainer container = new
WebMarkupContainer("container");
final WebMarkupContainer details = new
WebMarkupContainer("details");
- SearchableDataView<Client> dataView = new
SearchableDataView<Client>("clientList", sdp) {
+ SearchableDataView<Client> dataView = new
SearchableDataView<>("clientList", sdp) {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
index 7752e80..caf3373 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
@@ -42,7 +42,7 @@ public class EmailPanel extends AdminBasePanel {
public EmailPanel(String id) {
super(id);
- SearchableDataView<MailMessage> dataView = new
SearchableDataView<MailMessage>("email",
+ SearchableDataView<MailMessage> dataView = new
SearchableDataView<>("email",
new
SearchableDataProvider<>(MailMessageDao.class))
{
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
index c73e920..708ad90 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
@@ -53,7 +53,7 @@ public class GroupUsersPanel extends Panel {
this.groupId = groupId;
setOutputMarkupId(true);
- SearchableDataView<GroupUser> dataView = new
SearchableDataView<GroupUser>("userList", new GroupUserDataProvider()) {
+ SearchableDataView<GroupUser> dataView = new
SearchableDataView<>("userList", new GroupUserDataProvider()) {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
index a9ca9d3..d4ae1c7 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
@@ -58,7 +58,7 @@ public class GroupsPanel extends AdminBasePanel {
add(form);
//List view
- SearchableDataView<Group> dataView = new
SearchableDataView<Group>("groupList", new
SearchableGroupAdminDataProvider<>(GroupDao.class)) {
+ SearchableDataView<Group> dataView = new
SearchableDataView<>("groupList", new
SearchableGroupAdminDataProvider<>(GroupDao.class)) {
private static final long serialVersionUID = 1L;
@Override
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 9f2c8f9..da9fe71 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
@@ -96,9 +96,9 @@ public class LangPanel extends AdminBasePanel {
form.setNewVisible(true);
add(form);
- final SearchableDataView<StringLabel> dataView = new
SearchableDataView<StringLabel>(
+ final SearchableDataView<StringLabel> dataView = new
SearchableDataView<>(
"langList"
- , new
SearchableDataProvider<StringLabel>(LabelDao.class) {
+ , new SearchableDataProvider<>(LabelDao.class) {
private static final long
serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
index 2140e9f..a6d0db7 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
@@ -52,7 +52,7 @@ public class LdapsPanel extends AdminBasePanel {
@Override
protected void onInitialize() {
- SearchableDataView<LdapConfig> dataView = new
SearchableDataView<LdapConfig>("ldapList"
+ SearchableDataView<LdapConfig> dataView = new
SearchableDataView<>("ldapList"
, new
SearchableDataProvider<>(LdapConfigDao.class)) {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
index 96c72f5..67e64ac 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
@@ -60,7 +60,7 @@ public class OAuthForm extends AdminBaseForm<OAuthServer> {
private WebMarkupContainer listContainer;
private final WebMarkupContainer attrsContainer = new
WebMarkupContainer("attrsContainer");
private TextField<String> redirectUriText;
- private final ListView<Map.Entry<String, String>> mappingView = new
ListView<Map.Entry<String, String>>("mapping", new ListModel<>(new
ArrayList<>())) {
+ private final ListView<Map.Entry<String, String>> mappingView = new
ListView<>("mapping", new ListModel<>(new ArrayList<>())) {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
index 6116fdb..3ffff79 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
@@ -46,7 +46,7 @@ public class OAuthPanel extends AdminBasePanel {
@Override
protected void onInitialize() {
- SearchableDataView<OAuthServer> dataView = new
SearchableDataView<OAuthServer>("oauthServersList",
+ SearchableDataView<OAuthServer> dataView = new
SearchableDataView<>("oauthServersList",
new SearchableDataProvider<>(OAuth2Dao.class))
{
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
index 706a20a..d3d3444 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
@@ -92,7 +92,7 @@ public class RoomForm extends AdminBaseForm<Room> {
private final WebMarkupContainer moderatorContainer = new
WebMarkupContainer("moderatorContainer");
private final WebMarkupContainer filesContainer = new
WebMarkupContainer("filesContainer");
private final WebMarkupContainer clientsContainer = new
WebMarkupContainer("clientsContainer");
- private final ListView<Client> clients = new
ListView<Client>("clients", new ArrayList<>()) {
+ private final ListView<Client> clients = new ListView<>("clients", new
ArrayList<>()) {
private static final long serialVersionUID = 1L;
@Override
@@ -348,7 +348,7 @@ public class RoomForm extends AdminBaseForm<Room> {
return fileDao.get(ids);
}
}).setLabel(new ResourceModel("245")))
- .add(new TextField<Long>("wbidx", wbIdx) {
+ .add(new TextField<>("wbidx", wbIdx) {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
index 4928bd1..8212c04 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
@@ -47,7 +47,7 @@ public class RoomsPanel extends AdminBasePanel {
public RoomsPanel(String id) {
super(id);
- SearchableDataView<Room> dataView = new
SearchableDataView<Room>("roomList", new
SearchableGroupAdminDataProvider<>(RoomDao.class)) {
+ SearchableDataView<Room> dataView = new
SearchableDataView<>("roomList", new
SearchableGroupAdminDataProvider<>(RoomDao.class)) {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
index 156b196..10f2620 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
@@ -56,7 +56,7 @@ public class UsersPanel extends AdminBasePanel {
public UsersPanel(String id) {
super(id);
- final SearchableDataView<User> dataView = new
SearchableDataView<User>("userList", new
SearchableGroupAdminDataProvider<>(UserDao.class)) {
+ final SearchableDataView<User> dataView = new
SearchableDataView<>("userList", new
SearchableGroupAdminDataProvider<>(UserDao.class)) {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 744e9d2..2ff5374 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -33,7 +33,6 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.setWicketApplic
import static org.apache.openmeetings.web.pages.HashPage.INVITATION_HASH;
import static
org.apache.openmeetings.web.user.rooms.RoomEnterBehavior.getRoomUrlFragment;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
-import static org.apache.wicket.resource.JQueryResourceReference.getV3;
import static
org.wicketstuff.dashboard.DashboardContextInitializer.DASHBOARD_CONTEXT_KEY;
import java.io.File;
@@ -107,7 +106,7 @@ import
org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler
import org.apache.wicket.core.request.handler.ListenerRequestHandler;
import org.apache.wicket.core.request.mapper.MountedMapper;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.pageStore.IDataStore;
+import org.apache.wicket.pageStore.IPageStore;
import
org.apache.wicket.protocol.ws.WebSocketAwareCsrfPreventionRequestCycleListener;
import org.apache.wicket.protocol.ws.api.WebSocketResponse;
import org.apache.wicket.request.IRequestHandler;
@@ -225,15 +224,14 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
});
setPageManagerProvider(new DefaultPageManagerProvider(this) {
@Override
- protected IDataStore newDataStore() {
- return new HazelcastDataStore(hazelcast);
+ protected IPageStore newAsynchronousStore(IPageStore
pageStore) {
+ return new HazelcastDataStore(getName(),
hazelcast);
}
});
//Add custom resource loader at the beginning, so it will be
checked first in the
//chain of Resource Loaders, if not found it will search in
Wicket's internal
//Resource Loader for a the property key
getResourceSettings().getStringResourceLoaders().add(0, new
LabelResourceLoader());
- getJavaScriptLibrarySettings().setJQueryReference(getV3());
getRequestCycleListeners().add(new
WebSocketAwareCsrfPreventionRequestCycleListener() {
@Override
public void onEndRequest(RequestCycle cycle) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
index 7b5f33f..cb2c68b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
@@ -44,7 +44,7 @@ public class ConvertingErrorsDialog extends
AbstractDialog<BaseFileItem> {
private static final long serialVersionUID = 1L;
private final WebMarkupContainer container = new
WebMarkupContainer("container");
private final Label message = new Label("message",
Model.of((String)null));
- private final ListView<FileItemLog> logView = new
ListView<FileItemLog>("row") {
+ private final ListView<FileItemLog> logView = new ListView<>("row") {
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 70a8992..bc66efe 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
@@ -153,7 +153,7 @@ public abstract class FileTreePanel extends Panel {
protected void onInitialize() {
super.onInitialize();
download.setDefaultModelObject(newDownloadMenuList());
- Droppable<BaseFileItem> trashToolbar = new
Droppable<BaseFileItem>("trash-toolbar") {
+ Droppable<BaseFileItem> trashToolbar = new
Droppable<>("trash-toolbar") {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
index 74c28a9..fcb269c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
@@ -98,7 +98,7 @@ public class FolderPanel extends Panel implements
IDraggableListener, IDroppable
.set("containment",
Options.asString(treePanel.getContainment()))
, this));
}
- Component name = f.getId() == null || !editable ? new
Label("name", f.getName()) : new AjaxEditableLabel<String>("name",
Model.of(f.getName())) {
+ Component name = f.getId() == null || !editable ? new
Label("name", f.getName()) : new AjaxEditableLabel<>("name",
Model.of(f.getName())) {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
index f718352..fae568a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
@@ -72,7 +72,7 @@ public class ForgetPasswordDialog extends
AbstractFormDialog<String> {
private final RadioGroup<Type> rg = new RadioGroup<>("type",
Model.of(Type.email));
private final Label label = new Label("label", Model.of(""));
private final Captcha captcha = new Captcha("captcha");
- private Form<String> form = new Form<String>("form") {
+ private Form<String> form = new Form<>("form") {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index 7a1c740..f880d7a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -276,7 +276,7 @@ public class SignInDialog extends NonClosableDialog<String>
{
}
});
add(new WebMarkupContainer("oauthContainer").add(
- new ListView<OAuthServer>("oauthList",
oauthDao.getActive()) {
+ new ListView<>("oauthList",
oauthDao.getActive()) {
private static final long
serialVersionUID = 1L;
@Override
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 51ce544..a77ff8a 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
@@ -203,7 +203,7 @@ public class InstallWizard extends
AbstractWizard<InstallationConfig> {
private final RequiredTextField<String> dbname = new
RequiredTextField<>("dbname", Model.of(""));
private final RequiredTextField<String> user = new
RequiredTextField<>("login");
private final TextField<String> pass = new
TextField<>("password");
- private final Form<ConnectionProperties> form = new
Form<ConnectionProperties>("form", new CompoundPropertyModel<>(getProps(null)))
{
+ private final Form<ConnectionProperties> form = new
Form<>("form", new CompoundPropertyModel<>(getProps(null))) {
private static final long serialVersionUID = 1L;
private final DropDownChoice<DbType> db = new
DropDownChoice<>("dbType", Arrays.asList(DbType.values()), new
ChoiceRenderer<DbType>() {
private static final long serialVersionUID = 1L;
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 d054561..f1abfa3 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
@@ -269,7 +269,7 @@ public class RoomPanel extends BasePanel {
if (interview) {
room.add(new WebMarkupContainer("wb-area").add(wb));
} else {
- Droppable<BaseFileItem> wbArea = new
Droppable<BaseFileItem>("wb-area") {
+ Droppable<BaseFileItem> wbArea = new
Droppable<>("wb-area") {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 04095e0..b137cb5 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -90,7 +90,7 @@ public class RoomSidebar extends Panel {
private Client kickedClient;
private VideoSettings settings = new VideoSettings("settings");
private ActivitiesPanel activities;
- private final ListView<Client> users = new ListView<Client>("user", new
LoadableDetachableModel<List<Client>>() {
+ private final ListView<Client> users = new ListView<>("user", new
LoadableDetachableModel<List<Client>>() {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index 4b2ba2f..2695ab7 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -147,7 +147,7 @@ public class WbPanel extends AbstractWbPanel {
if (rp.getRoom().isHidden(RoomElement.Whiteboard)) {
setVisible(false);
} else {
- add(new ListView<String>("clipart"
+ add(new ListView<>("clipart"
,
Arrays.asList(OmFileHelper.getPublicClipartsDir().list())
.stream()
.sorted()
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 bb2e7f2..7284552 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
@@ -261,7 +261,7 @@ public class CalendarPanel extends UserBasePanel {
add(calendarDialog);
calendarListContainer.setOutputMarkupId(true);
- calendarListContainer.add(new ListView<OmCalendar>("items", new
LoadableDetachableModel<List<OmCalendar>>() {
+ calendarListContainer.add(new ListView<>("items", new
LoadableDetachableModel<List<OmCalendar>>() {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
index d551295..6c100f5 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
@@ -49,7 +49,7 @@ public class ChangePasswordDialog extends
AbstractFormDialog<String> {
private final PasswordTextField pass = new PasswordTextField("pass",
Model.of((String)null));
private final PasswordTextField pass2 = new PasswordTextField("pass2",
Model.of((String)null));
private StrongPasswordValidator passValidator;
- private final Form<String> form = new Form<String>("form") {
+ private final Form<String> form = new Form<>("form") {
private static final long serialVersionUID = 1L;
@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 ed94fc5..4cdcfc2 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
@@ -75,7 +75,7 @@ public class EditProfileForm extends Form<User> {
super.onInitialize();
add(passwd.setLabel(new
ResourceModel("current.password")).setRequired(true).setVisible(checkPassword));
- add(actions = new FormActionsPanel<User>("buttons", this) {
+ add(actions = new FormActionsPanel<>("buttons", this) {
private static final long serialVersionUID = 1L;
private void refreshUser() {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.java
index bbedfd8..27a405c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.java
@@ -52,7 +52,7 @@ public class InvitationsPanel extends UserBasePanel {
super(id);
setOutputMarkupId(true);
- SearchableDataView<Invitation> dataView = new
SearchableDataView<Invitation>("invitations",
+ SearchableDataView<Invitation> dataView = new
SearchableDataView<>("invitations",
new InvitationProvider())
{
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
index eec37c9..835d01a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
@@ -213,7 +213,7 @@ public class MessagesContactsPanel extends UserBasePanel {
addFolder.open(target);
}
}).add(new JQueryBehavior(".email.newdir", "button")));
- add(folders.add(new ListView<PrivateMessageFolder>("folder",
foldersModel) {
+ add(folders.add(new ListView<>("folder", foldersModel) {
private static final long serialVersionUID = 1L;
@Override
@@ -247,7 +247,7 @@ public class MessagesContactsPanel extends UserBasePanel {
}
}).setOutputMarkupId(true));
- SearchableDataProvider<PrivateMessage> sdp = new
SearchableDataProvider<PrivateMessage>(PrivateMessageDao.class) {
+ SearchableDataProvider<PrivateMessage> sdp = new
SearchableDataProvider<>(PrivateMessageDao.class) {
private static final long serialVersionUID = 1L;
@Override
@@ -270,7 +270,7 @@ public class MessagesContactsPanel extends UserBasePanel {
return getDao().count(getUserId(),
selectedFolderModel.getObject(), search);
}
};
- final SearchableDataView<PrivateMessage> dv = new
SearchableDataView<PrivateMessage>("messages", sdp) {
+ final SearchableDataView<PrivateMessage> dv = new
SearchableDataView<>("messages", sdp) {
private static final long serialVersionUID = 1L;
@Override
@@ -436,7 +436,7 @@ public class MessagesContactsPanel extends UserBasePanel {
add(container.add(dv).setOutputMarkupId(true));
add(selectedMessage.add(roomContainer.setVisible(false)).setOutputMarkupId(true));
- IDataProvider<UserContact> dp = new
IDataProvider<UserContact>() {
+ IDataProvider<UserContact> dp = new IDataProvider<>() {
private static final long serialVersionUID = 1L;
@Override
@@ -454,7 +454,7 @@ public class MessagesContactsPanel extends UserBasePanel {
return Model.of(object);
}
};
- final DataView<UserContact> dw = new
DataView<UserContact>("users", dp) {
+ final DataView<UserContact> dw = new DataView<>("users", dp) {
private static final long serialVersionUID = 1L;
private String getName(UserContact uc) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
index 12255df..1e1f1d2 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
@@ -89,7 +89,7 @@ public class UserSearchPanel extends UserBasePanel {
});
}
});
- IDataProvider<User> dp = new IDataProvider<User>() {
+ IDataProvider<User> dp = new IDataProvider<>() {
private static final long serialVersionUID = 1L;
@Override
@@ -109,7 +109,7 @@ public class UserSearchPanel extends UserBasePanel {
}
};
- final DataView<User> dw = new DataView<User>("users", dp) {
+ final DataView<User> dw = new DataView<>("users", dp) {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
index 0d6c26f..592ce37 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
@@ -72,7 +72,7 @@ public class WidgetsPanel extends Panel {
continue;
}
}
- add(new ListView<WidgetDescriptor>("widgets", widgets) {
+ add(new ListView<>("widgets", widgets) {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
index e9ad044..1e256be 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
@@ -54,7 +54,7 @@ public class RoomListPanel extends Panel {
public RoomListPanel(String id, List<Room> rooms, final String label) {
super(id);
setOutputMarkupId(true);
- add(list = new ListView<Room>("list", rooms) {
+ add(list = new ListView<>("list", rooms) {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
index 612f7d5..240fbcf 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
@@ -62,7 +62,7 @@ public class RoomsPanel extends UserPanel {
public RoomsPanel(String id, List<Room> rooms) {
super(id);
this.rooms = rooms;
- clients = new ListView<Client>("clients", clientsInRoom){
+ clients = new ListView<>("clients", clientsInRoom){
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
index 86011ca..c09fe0f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
@@ -52,7 +52,7 @@ public class RoomsTabbedPanel extends UserPanel {
protected void onInitialize() {
super.onInitialize();
User u = userDao.get(getUserId());
- add(new ListView<GroupUser>("orgTabs", u.getGroupUsers()) {
+ add(new ListView<>("orgTabs", u.getGroupUsers()) {
private static final long serialVersionUID = 1L;
@Override
@@ -63,7 +63,7 @@ public class RoomsTabbedPanel extends UserPanel {
.add(AttributeModifier.replace("href",
"#org" + org.getId())));
}
});
- add(new ListView<GroupUser>("orgRooms", u.getGroupUsers()) {
+ add(new ListView<>("orgRooms", u.getGroupUsers()) {
private static final long serialVersionUID = 1L;
@Override
diff --git a/pom.xml b/pom.xml
index 0af9039..a673970 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<wicket.configuration>DEPLOYMENT</wicket.configuration>
<om.quick.build>false</om.quick.build>
<db>derby</db>
- <jdk.version>1.8</jdk.version>
+ <jdk.version>11</jdk.version>
<!-- plugin versions -->
<maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
<maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
@@ -73,9 +73,9 @@
<forbiddenapis.version>2.6</forbiddenapis.version>
<!-- dependency versions -->
<junit.version>5.4.2</junit.version>
- <wicket.version>8.5.0-SNAPSHOT</wicket.version>
- <wicketju.version>8.3.0</wicketju.version>
- <wickets.version>8.4.0</wickets.version>
+ <wicket.version>9.0.0-M1</wicket.version>
+ <wicketju.version>9.0.0-SNAPSHOT</wicketju.version>
+ <wickets.version>9.0.0-M1</wickets.version>
<red5-client.version>1.0.10</red5-client.version>
<spring.version>5.1.6.RELEASE</spring.version>
<mina.version>2.1.1</mina.version>
