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 2022/05/17 03:51:44 UTC
[openmeetings] branch java11-modules updated (72ea7bf85 -> 990c4048e)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
from 72ea7bf85 Code clean-up
add abeef2dfa no jira: build is green under java17
add be84eea96 OPENMEETINGS-2727 Add tooltips to whiteboard tab bar buttons and only show scroll button when there is more then 1 whiteboard to scroll
add 00386e66f OPENMEETINGS-2727 Add default translation to other language files.
add c22ab0ee3 [OPENMEETINGS-2727] new labels are added via PoEditor and imported
add cd98ba989 fix: wrong link (#171)
add baad73cd3 OPENMEETINGS-2725 Update css for user and minimise button
add d8dd490b2 Merge pull request #173 from apache/feature/openmeetings-2725-update-css-user-files-tabs
add 7277a4325 Merge branch 'master' into feature/OPENMEETINGS-2727-add-tooltips-disable-scroll-btns-when-only-1-whiteboard
add baad666a2 Merge pull request #175 from apache/feature/OPENMEETINGS-2727-add-tooltips-disable-scroll-btns-when-only-1-whiteboard
add d8c5f2d05 OPENMEETINGS-2726 Add some border styles to quick poll fixed popup
add 3d1f68645 OPENMEETINGS-2726 Fix css code style
add 68a65f92a OPENMEETINGS-2726 Update to use dynamic bootstrap color to support theming
add acb02309f Merge pull request #174 from apache/feature/OPENMEETINGS-2726-add-styling-for-quick-poll-popup
add 439542e6f OPENMEETINGS-2728 Fix KMS Media Website docu only.
add 0453b439d Merge pull request #177 from apache/feature/OPENMEETINGS-2728-update-kms-docu
add df0a1f7ce [OPENMEETINGS-2728] ApacheCon banner is fixed, link to privacy policy is added
add 2d9554e82 OPENMEETINGS-2727 Update and resync files from POEditor.
add 8c65abca8 OPENMEETINGS-2727 Fix indonesian to _in file.
add 4aac4b363 OPENMEETINGS-2727 Manually update Hebrew file.
add 27472af4b Merge pull request #178 from apache/feature/OPENMEETINGS-2727-update-language-files
add d8605c2f9 [OPENMEETINGS-2675] mysql, mockito, asterisk-java and maven-project-info-reports-plugin
add f678ece82 [OPENMEETINGS-2719] close mark for RTL languages should look better
add 8621bba4b [OPENMEETINGS-2675] tika, postgres, maven-site-plugin and front-end dependencies
add d9a8c24cb [OPENMEETINGS-2703] Sonar should be more happy
add f41a28583 [OPENMEETINGS-2675] wicketstuff
add 3358df553 [OPENMEETINGS-2703] Sonar should be more happy
add d7b916b0c [OPENMEETINGS-2703] couple more Sonar issues
add 74bdefeff [OPENMEETINGS-2675] spring
add cfb7848cf Release preparation: documentation is updated
add 8f499d303 [OPENMEETINGS-2733] query construction is improved
add a4dc5cc8a [OPENMEETINGS-2732] tomcat
new 9bdf00590 Merge branch 'master' into java11-modules
new 990c4048e Build fixed
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 | 18 +-
.../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, 1077 insertions(+), 713 deletions(-)
rename openmeetings-util/src/main/java/org/apache/openmeetings/util/{Version.java => OmVersion.java} (91%)
[openmeetings] 01/02: Merge branch 'master' into java11-modules
Posted by so...@apache.org.
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 <so...@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>
[openmeetings] 02/02: Build fixed
Posted by so...@apache.org.
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 990c4048e71dc227e2d35c36bd962aa8f5165b76
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue May 17 10:51:32 2022 +0700
Build fixed
---
.../src/main/java/org/apache/openmeetings/backup/BackupImport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index 3a149739d..498d672ce 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -501,7 +501,7 @@ public class BackupImport {
}
}
- void cleanup() {
+ public void cleanup() {
ldapMap.clear();
oauthMap.clear();
userMap.clear();