This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 9bdf00590db6dd1383ec86f910d84034dfcb8a81
Merge: 72ea7bf85 a4dc5cc8a
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Tue May 17 10:08:18 2022 +0700
Merge branch 'master' into java11-modules
CHANGELOG.md | 43 ++++-
README.md | 18 +-
.../core/converter/InterviewConverter.java | 3 +-
.../openmeetings/db/dao/IDataProviderDao.java | 3 +-
.../db/dao/IGroupAdminDataProviderDao.java | 5 +-
.../db/dao/basic/ConfigurationDao.java | 14 +-
.../openmeetings/db/dao/basic/MailMessageDao.java | 29 +--
.../db/dao/calendar/AppointmentDao.java | 3 +-
.../db/dao/calendar/OmCalendarDao.java | 3 +-
.../openmeetings/db/dao/file/BaseFileItemDao.java | 3 +-
.../apache/openmeetings/db/dao/label/LabelDao.java | 2 +-
.../openmeetings/db/dao/room/ExtraMenuDao.java | 51 ++----
.../openmeetings/db/dao/room/InvitationDao.java | 76 ++++----
.../apache/openmeetings/db/dao/room/RoomDao.java | 44 +++--
.../openmeetings/db/dao/server/LdapConfigDao.java | 11 +-
.../openmeetings/db/dao/server/OAuth2Dao.java | 12 +-
.../apache/openmeetings/db/dao/user/GroupDao.java | 43 +++--
.../openmeetings/db/dao/user/GroupUserDao.java | 27 ++-
.../db/dao/user/PrivateMessageDao.java | 3 +-
.../db/dao/user/PrivateMessageFolderDao.java | 3 +-
.../apache/openmeetings/db/dao/user/UserDao.java | 195 ++++++++++----------
.../org/apache/openmeetings/db/dto/basic/Info.java | 8 +-
.../openmeetings/db/dto/room/Whiteboards.java | 14 +-
.../openmeetings/db/entity/file/BaseFileItem.java | 5 +-
.../openmeetings/db/entity/label/OmLanguage.java | 4 +-
.../openmeetings/db/entity/room/ExtraMenu.java | 11 +-
.../openmeetings/db/entity/room/Invitation.java | 8 -
.../openmeetings/db/util/ApplicationHelper.java | 6 +-
.../org/apache/openmeetings/db/util/DaoHelper.java | 204 ++++++++++++++-------
.../apache/openmeetings/backup/BackupImport.java | 20 +-
.../apache/openmeetings/backup/BackupVersion.java | 9 +-
.../openmeetings/backup/converter/WbConverter.java | 6 +-
openmeetings-server/pom.xml | 2 +-
.../src/site/markdown/InstallMediaServer.md | 54 +++++-
.../src/site/resources/css/site.css | 7 +-
openmeetings-server/src/site/resources/js/site.js | 21 ++-
openmeetings-server/src/site/site.xml | 1 +
openmeetings-server/src/site/xdoc/NewsArchive.xml | 107 ++++++++++-
openmeetings-server/src/site/xdoc/downloads.xml | 30 +--
openmeetings-server/src/site/xdoc/index.xml | 62 ++-----
.../service/calendar/caldav/IcalUtils.java | 4 +-
.../mail/template/AbstractTemplatePanel.java | 3 +-
.../util/{Version.java => OmVersion.java} | 8 +-
.../util/crypt/SCryptImplementation.java | 5 +-
.../apache/openmeetings/util/mail/IcalHandler.java | 4 +-
.../org/apache/openmeetings/util/TestVersion.java | 8 +-
openmeetings-web/src/main/front/main/package.json | 2 +-
openmeetings-web/src/main/front/wb/package.json | 6 +-
openmeetings-web/src/main/front/wb/src/wb-area.js | 15 ++
.../openmeetings/web/admin/extra/ExtraForm.java | 2 +-
.../web/admin/groups/GroupUsersPanel.java | 2 +-
.../apache/openmeetings/web/app/Application.java | 14 +-
.../web/app/Application.properties.xml | 3 +
.../web/app/Application_ar.properties.xml | 3 +
.../web/app/Application_bg.properties.xml | 3 +
.../web/app/Application_bn.properties.xml | 3 +
.../web/app/Application_ca.properties.xml | 3 +
.../web/app/Application_cs.properties.xml | 3 +
.../web/app/Application_da.properties.xml | 3 +
.../web/app/Application_de.properties.xml | 11 +-
.../web/app/Application_el.properties.xml | 3 +
.../web/app/Application_es.properties.xml | 3 +
.../web/app/Application_fa.properties.xml | 3 +
.../web/app/Application_fi.properties.xml | 3 +
.../web/app/Application_fr.properties.xml | 3 +
.../web/app/Application_gl.properties.xml | 3 +
.../web/app/Application_hi.properties.xml | 3 +
.../web/app/Application_hu.properties.xml | 3 +
.../web/app/Application_in.properties.xml | 3 +
.../web/app/Application_it.properties.xml | 3 +
.../web/app/Application_iw.properties.xml | 3 +
.../web/app/Application_ja.properties.xml | 3 +
.../web/app/Application_ko.properties.xml | 3 +
.../web/app/Application_ku.properties.xml | 3 +
.../web/app/Application_lo.properties.xml | 3 +
.../web/app/Application_nl.properties.xml | 3 +
.../web/app/Application_pl.properties.xml | 3 +
.../web/app/Application_pt.properties.xml | 3 +
.../web/app/Application_pt_BR.properties.xml | 3 +
.../web/app/Application_ru.properties.xml | 3 +
.../web/app/Application_sk.properties.xml | 3 +
.../web/app/Application_sv.properties.xml | 3 +
.../web/app/Application_ta.properties.xml | 3 +
.../web/app/Application_th.properties.xml | 3 +
.../web/app/Application_tk.properties.xml | 3 +
.../web/app/Application_tr.properties.xml | 3 +
.../web/app/Application_uk.properties.xml | 3 +
.../web/app/Application_ur.properties.xml | 3 +
.../web/app/Application_zh_CN.properties.xml | 3 +
.../web/app/Application_zh_TW.properties.xml | 3 +
.../apache/openmeetings/web/app/ClientManager.java | 22 +--
.../openmeetings/web/common/GeneralUserForm.java | 3 -
.../apache/openmeetings/web/common/MainPanel.java | 14 +-
.../common/confirmation/ConfirmationHelper.java | 2 +
.../web/common/tree/FileTreePanel.java | 6 +
.../openmeetings/web/common/tree/FolderPanel.java | 84 ++++-----
.../openmeetings/web/common/upload/UploadForm.java | 2 +-
.../web/common/upload/UploadResourceReference.java | 2 +-
.../web/data/SearchableDataProvider.java | 10 +-
.../web/data/SearchableGroupAdminDataProvider.java | 4 +-
.../openmeetings/web/pages/BaseNotInitedPage.java | 2 +-
.../web/pages/auth/ForgetPasswordDialog.java | 96 +++++-----
.../pages/install/InstallWizard$InstallStep.html | 2 +-
.../web/pages/install/InstallWizard.java | 4 +-
.../web/pages/install/InstallWizardPage.java | 2 +-
.../web/room/GroupCustomCssResourceReference.java | 20 +-
.../apache/openmeetings/web/room/RoomPanel.java | 18 +-
.../web/room/activities/ActivitiesPanel.java | 4 +-
.../web/room/menu/SipDialerDialog.java | 5 +
.../apache/openmeetings/web/room/wb/WbPanel.html | 6 +-
.../apache/openmeetings/web/room/wb/WbPanel.java | 7 +-
.../apache/openmeetings/web/user/AboutDialog.java | 6 +-
.../web/user/calendar/CalendarPanel.html | 1 -
.../web/user/profile/InvitationsPanel.java | 6 +-
.../web/user/profile/UserSearchPanel.java | 10 +-
.../web/user/record/RecordingsPanel.java | 2 +-
.../src/main/webapp/css/raw-general-rtl.css | 3 +
openmeetings-web/src/main/webapp/css/raw-room.css | 9 +-
.../apache/openmeetings/web/util/TestDateTime.java | 5 +-
.../webservice/CalendarWebService.java | 5 +-
.../openmeetings/webservice/GroupWebService.java | 3 +-
.../openmeetings/webservice/InfoWebService.java | 6 +-
.../openmeetings/webservice/RoomWebService.java | 12 +-
.../webservice/util/AllowOriginProvider.java | 6 +-
pom.xml | 26 +--
src/site/site.xml | 12 +-
126 files changed, 1078 insertions(+), 714 deletions(-)
diff --cc
openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
index dc549ea4f,4d352cdff..486d364f3
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
@@@ -20,9 -20,10 +20,10 @@@ package org.apache.openmeetings.service
import java.util.Locale;
-import org.apache.openmeetings.IApplication;
-import org.apache.openmeetings.IWebSession;
+import org.apache.openmeetings.db.IApplication;
+import org.apache.openmeetings.db.IWebSession;
import org.apache.wicket.AttributeModifier;
+ import org.apache.wicket.Session;
import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.protocol.http.WebSession;
diff --cc
openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
index bf9a4c409,277e0e11d..9f1be414f
---
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
@@@ -19,10 -19,10 +19,10 @@@
package org.apache.openmeetings.web.user.profile;
import static org.apache.openmeetings.db.util.TimezoneUtil.getTimeZone;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
- import java.util.ArrayList;
+ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
diff --cc pom.xml
index db646f52d,5b1496395..4a09b67df
--- a/pom.xml
+++ b/pom.xml
@@@ -114,10 -114,10 +114,10 @@@
<xstream.version>1.4.19</xstream.version>
<api-all.version>2.1.0</api-all.version>
<caldav4j.version>1.0.5</caldav4j.version>
- <tika-parsers.version>2.3.0</tika-parsers.version>
+ <tika-parsers.version>2.4.0</tika-parsers.version>
<commons-text.version>1.9</commons-text.version>
- <slf4j.version>1.7.36</slf4j.version>
- <logback.version>1.2.11</logback.version>
+ <slf4j.version>2.0.0-alpha7</slf4j.version>
+ <logback.version>1.3.0-alpha14</logback.version>
<jetty.version>9.4.46.v20220331</jetty.version>
<license.excludedScopes>test</license.excludedScopes>
<bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
