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/06/17 06:45:52 UTC
[openmeetings] branch java11-modules updated (990c4048e -> 48afe3149)
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 990c4048e Build fixed
add fdc7e9ac0 [OPENMEETINGS-2734] updated to java17
add 2cc6775a6 [OPENMEETINGS-2733] some Sonar issues are addressed
add a942f5ad0 [OPENMEETINGS-2733] some Sonar issues are addressed
add 694d0bb31 [OPENMEETINGS-2733] some Sonar issues are addressed
add ad1762459 [OPENMEETINGS-2733] some Sonar issues are addressed
add 99a0a318e [OPENMEETINGS-2734] start script updated
add 410a30917 [OPENMEETINGS-2733] some Sonar issues are addressed
add f659f1b14 [OPENMEETINGS-2732] fabric.js
add 7fb6ca2e9 [OPENMEETINGS-2733] some Sonar issues are addressed
add eff2d7408 [OPENMEETINGS-2733] some Sonar issues are addressed
add e6adbd152 [OPENMEETINGS-2733] more Sonar issues are fixed
add 35ed7e9ef [OPENMEETINGS-2733] more Sonar issues are fixed
add 1a02d13ab [OPENMEETINGS-2732] eval in MathJax is hacked
add d3918bdb4 [OPENMEETINGS-2520] sonar should be more happy
add 8a9ec2be9 [OPENMEETINGS-2520] sonar should be more happy
add 98939973c [OPENMEETINGS-2520] sonar should be more happy
add 3ab660fab [OPENMEETINGS-2732] postgresql
add 2b088f435 [OPENMEETINGS-2520] sonar should be more happy
add 1fb71af36 [OPENMEETINGS-2739] generate URL is disabled if non-contact is selected
add 4f2ec820b [OPENMEETINGS-2520] sonar should be more happy
add 74b1df819 [OPENMEETINGS-2738] temporary fix
add d42b5dfd0 [OPENMEETINGS-2688] group image can be deleted
add f274e15a6 [OPENMEETINGS-2721] form bootstrapization
add 9f626ccd4 [OPENMEETINGS-2721] multiple forms are modernized
add 9af4d8998 [OPENMEETINGS-2732] mockito
add b6465dcb3 [OPENMEETINGS-2721] minor issue in layout
add 9d60cfd53 [OPENMEETINGS-2626] salutation and birthday are not defaulted
add f71163875 [OPENMEETINGS-2658] Application URL is added to registration template
add c070acc03 [OPENMEETINGS-2627] example for Keycloak is added
add dd3759069 [OPENMEETINGS-2715] minor improvements
add b962e042e [OPENMEETINGS-2732] wicket-jquery-ui, mockito
add 78a78c084 [OPENMEETINGS-2732] maven-surefire-plugin
add ba3a03269 [OPENMEETINGS-2740] testing fix in wicket-core
add 6d7b93320 [OPENMEETINGS-2737] instructions were updated for Asterisk 18, issue in TimerService was fixed
add 2925e9f7c [OPENMEETINGS-2732] tomcat, jettison, postgresql, mssql-driver, oracle-driver, MathJax
add f86ee1202 [OPENMEETINGS-2737] more TimerService fixes, minor JS fixes
add ad6290f69 [OPENMEETINGS-2737] instructions are updated
add 95814692f [OPENMEETINGS-2732] apache-rat-plugin
add 83270cdc9 [OPENMEETINGS-2732] build should be fixed
add b9b09e24c [OPENMEETINGS-2732] wicket-bootstrap, font-awesome, spring, ical4j, h2, swagger
new 48afe3149 Merge branch 'master' into java11-modules
The 1 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 | 14 +-
LICENSE | 118 ++++-----
README.md | 4 +-
.../openmeetings/core/converter/BaseConverter.java | 75 ++----
.../core/converter/InterviewConverter.java | 101 ++++----
.../core/converter/RecordingConverter.java | 4 +-
.../core/converter/VideoConverter.java | 4 +-
.../openmeetings/core/ldap/LdapLoginManager.java | 278 +++++++++++----------
.../apache/openmeetings/core/remote/KStream.java | 7 +-
.../openmeetings/core/remote/KurentoHandler.java | 161 ++++++------
.../openmeetings/core/remote/StreamProcessor.java | 61 +++--
.../apache/openmeetings/core/sip/SipManager.java | 4 +-
.../openmeetings/core/sip/SipStackProcessor.java | 3 +-
.../core/util/ChatWebSocketHelper.java | 17 +-
.../openmeetings/core/util/WebSocketHelper.java | 27 +-
.../openmeetings/core/util/ws/WsMessageAll.java | 11 +-
.../core/util/ws/WsMessageRoomMsg.java | 12 +-
.../openmeetings/core/remote/BaseMockedTest.java | 16 +-
.../core/remote/TestNotConnectedMocked.java | 31 ++-
.../core/remote/TestRoomFlowMocked.java | 10 +
.../core/remote/TestSetupFlowMocked.java | 12 +
.../java/org/apache/openmeetings/gui/TestGui.java | 30 ---
.../openmeetings/rdc/TestReadKeyCodesNumber.java | 49 ----
.../db/dao/basic/ConfigurationDao.java | 56 ++---
.../openmeetings/db/dao/file/FileItemDao.java | 11 +-
.../apache/openmeetings/db/dao/label/LabelDao.java | 14 +-
.../openmeetings/db/dao/record/RecordingDao.java | 2 +-
.../apache/openmeetings/db/dao/user/UserDao.java | 19 +-
.../apache/openmeetings/db/dto/user/OAuthUser.java | 6 +-
.../openmeetings/db/entity/basic/Client.java | 6 +-
.../openmeetings/db/entity/basic/MailMessage.java | 2 +-
.../openmeetings/db/entity/file/BaseFileItem.java | 3 +-
.../openmeetings/db/entity/room/Invitation.java | 17 +-
.../apache/openmeetings/db/entity/room/Room.java | 25 --
.../apache/openmeetings/db/entity/user/User.java | 27 +-
.../apache/openmeetings/db/mapper/RoomMapper.java | 3 +-
.../apache/openmeetings/backup/BackupExport.java | 13 +-
.../apache/openmeetings/backup/BackupImport.java | 68 ++---
.../openmeetings/backup/converter/WbConverter.java | 16 +-
.../java/org/apache/openmeetings/cli/Admin.java | 10 +-
.../cli/ConnectionPropertiesPatcher.java | 4 +-
.../apache/openmeetings/cli/OmHelpFormatter.java | 8 +-
.../installation/ImportInitvalues.java | 18 ++
openmeetings-server/pom.xml | 2 +-
.../src/main/assembly/scripts/admin.sh | 2 +-
.../src/main/assembly/scripts/network_test.sh | 8 +-
.../src/main/assembly/scripts/openmeetings.service | 2 +-
.../src/site/markdown/AsteriskIntegration.md | 58 ++++-
.../src/site/markdown/InstallMediaServer.md | 8 +-
.../src/site/stylesheets/errorvalues.xsd | 6 +-
.../src/site/xdoc/BuildInstructions.xml | 4 +-
openmeetings-server/src/site/xdoc/ReleaseGuide.xml | 2 +-
.../src/site/xdoc/RestAPISample.xml | 6 +-
openmeetings-server/src/site/xdoc/WebsiteGuide.xml | 2 +-
.../src/site/xdoc/commercial-support.xml | 2 +-
openmeetings-server/src/site/xdoc/installation.xml | 4 +-
.../calendar/caldav/AppointmentManager.java | 21 +-
.../service/calendar/caldav/IcalUtils.java | 21 +-
.../mail/template/RegisterUserTemplate.html | 1 +
.../mail/template/RegisterUserTemplate.java | 4 +
.../service/room/InvitationManager.java | 3 +-
openmeetings-util/src/main/java/module-info.java | 3 +-
.../openmeetings/util/OpenmeetingsVariables.java | 1 +
.../org/apache/openmeetings/util/XmlExport.java | 54 ++--
.../apache/openmeetings/util/mail/IcalHandler.java | 23 +-
openmeetings-web/src/main/front/wb/package.json | 7 +-
openmeetings-web/src/main/front/wb/src/wb.js | 13 +-
.../openmeetings/web/admin/backup/BackupPanel.html | 64 ++---
.../openmeetings/web/admin/backup/BackupPanel.java | 35 +--
.../web/admin/configurations/ConfigsPanel.html | 62 +++--
.../web/admin/connection/ConnectionsPanel.java | 9 +-
.../openmeetings/web/admin/extra/ExtraPanel.html | 28 ++-
.../openmeetings/web/admin/groups/GroupsPanel.html | 102 +++++---
.../web/admin/labels/AddLanguageDialog.html | 12 +-
.../openmeetings/web/admin/labels/LangPanel.html | 18 +-
.../openmeetings/web/admin/ldaps/LdapsPanel.html | 56 +++--
.../openmeetings/web/admin/oauth/OAuthForm.java | 5 +-
.../openmeetings/web/admin/oauth/OAuthPanel.html | 108 +++++---
.../openmeetings/web/admin/rooms/RoomForm.java | 5 +-
.../openmeetings/web/admin/rooms/RoomsPanel.html | 165 ++++++------
.../openmeetings/web/admin/users/UserForm.html | 49 ++--
.../openmeetings/web/admin/users/UserForm.java | 4 +-
.../apache/openmeetings/web/app/Application.java | 37 ++-
...roperties.xml => Application_he.properties.xml} | 0
...roperties.xml => Application_id.properties.xml} | 0
.../apache/openmeetings/web/app/ClientManager.java | 3 +-
.../apache/openmeetings/web/app/TimerService.java | 5 +
.../apache/openmeetings/web/common/Captcha.html | 4 +-
...omunityUserForm.html => CommunityUserForm.html} | 21 +-
...omunityUserForm.java => CommunityUserForm.java} | 8 +-
.../openmeetings/web/common/GeneralUserForm.html | 118 ++++++---
.../openmeetings/web/common/InvitationForm.html | 78 +++---
.../openmeetings/web/common/InvitationForm.java | 7 +-
.../apache/openmeetings/web/common/MainPanel.java | 6 +-
.../apache/openmeetings/web/common/NameDialog.html | 7 +-
.../apache/openmeetings/web/common/NameDialog.java | 6 +-
.../web/common/PagingNavigatorPanel.html | 2 +-
.../web/common/UploadableImagePanel.html | 1 +
.../web/common/UploadableImagePanel.java | 56 +++--
.../common/datetime/AbstractOmDateTimePicker.java | 8 +-
.../openmeetings/web/common/menu/OmMenuItem.java | 3 +-
.../web/common/tree/FileTreePanel.java | 6 +-
.../openmeetings/web/common/tree/FolderPanel.java | 83 +++---
.../web/common/tree/OmTreeProvider.java | 3 +-
.../web/common/upload/UploadResourceReference.java | 7 +-
.../apache/openmeetings/web/pages/BasePage.java | 2 +-
.../web/pages/auth/ForgetPasswordDialog.java | 24 +-
.../web/pages/auth/RegisterDialog.java | 50 ++--
.../web/pages/auth/ResetPasswordDialog.java | 11 +-
.../openmeetings/web/pages/auth/SignInDialog.html | 8 +-
.../openmeetings/web/pages/auth/SignInDialog.java | 4 +-
.../openmeetings/web/pages/auth/SignInPage.java | 11 +-
.../web/pages/install/InstallWizard$DbStep.html | 2 +-
.../pages/install/InstallWizard$ParamsStep1.html | 2 +-
.../pages/install/InstallWizard$ParamsStep2.html | 2 +-
.../web/pages/install/InstallWizard.java | 11 +-
.../openmeetings/web/room/NicknameDialog.html | 24 +-
.../apache/openmeetings/web/room/RoomPanel.html | 28 +--
.../apache/openmeetings/web/room/RoomPanel.java | 39 +--
.../openmeetings/web/room/VideoSettings.html | 6 +-
.../web/room/activities/ActivitiesPanel.java | 93 +++----
.../openmeetings/web/room/activities/Activity.java | 22 +-
.../openmeetings/web/room/menu/ActionsSubMenu.java | 6 +-
.../openmeetings/web/room/menu/ExtrasSubMenu.java | 3 +-
.../web/room/menu/RoomInvitationForm.html | 14 +-
.../web/room/menu/RoomInvitationForm.java | 18 +-
.../web/room/menu/SipDialerDialog.html | 2 +-
.../web/room/menu/SipDialerDialog.java | 2 +-
.../web/room/poll/CreatePollDialog.html | 18 +-
.../web/room/poll/PollResultsDialog.html | 14 +-
.../web/room/poll/PollResultsDialog.java | 25 +-
.../openmeetings/web/room/poll/VoteDialog.html | 14 +-
.../openmeetings/web/room/poll/VoteDialog.java | 5 +-
.../web/room/sidebar/RoomUploadForm.html | 7 +-
.../web/room/sidebar/RoomUploadForm.java | 9 +-
.../web/room/sidebar/UploadDialog.java | 3 +-
.../openmeetings/web/room/wb/UndoObject.java | 6 +-
.../apache/openmeetings/web/room/wb/WbPanel.java | 22 +-
.../web/room/wb/WbWebSocketHelper.java | 18 +-
.../openmeetings/web/user/MessageDialog.html | 4 +-
.../web/user/calendar/AppointmentDialog.html | 102 +++++---
.../web/user/calendar/AppointmentDialog.java | 16 +-
.../web/user/calendar/CalendarDialog.html | 36 +--
.../web/user/calendar/CalendarDialog.java | 72 +++---
.../web/user/profile/ChangePasswordDialog.html | 12 +-
.../web/user/profile/ChangePasswordDialog.java | 3 +-
.../web/user/profile/EditProfileForm.html | 8 +-
.../web/user/profile/EditProfileForm.java | 4 +-
.../web/user/profile/MessagesContactsPanel.html | 8 +-
.../web/user/profile/MessagesContactsPanel.java | 7 +-
.../web/user/profile/UserSearchPanel.html | 6 +-
.../web/user/profile/UserSearchPanel.java | 9 +-
.../web/user/profile/WidgetsPanel.html | 2 +-
.../web/user/record/RecordingInvitationForm.html | 6 +-
.../web/user/record/RecordingsPanel.java | 7 +-
.../openmeetings/web/user/record/VideoInfo.java | 3 +-
.../web/user/rooms/RoomEnterBehavior.java | 2 +-
.../openmeetings/web/user/rooms/RoomsPanel.java | 3 +-
.../web/user/rooms/RoomsTabbedPanel.java | 3 +-
.../openmeetings/web/util/OmUrlFragment.java | 93 +++----
.../src/main/webapp/WEB-INF/classes/hazelcast.xml | 2 +-
openmeetings-web/src/main/webapp/WEB-INF/web.xml | 2 +-
.../src/main/webapp/css/raw-general.css | 21 +-
openmeetings-web/src/main/webapp/css/raw-tree.css | 6 +-
.../src/main/webapp/data/conf/om_ldap.cfg | 12 +-
.../src/main/webapp/images/arcArrow.svg | 6 +-
.../src/main/webapp/images/profile.svg | 6 +-
.../src/main/webapp/languages/languages.xml | 4 +-
.../calendar/TestDatabaseStructureAppointment.java | 58 ++---
.../TestDatabaseStructureGetUserStart.java | 37 ---
.../TestDatabaseStructureMeetingMember.java | 30 ---
.../org/apache/openmeetings/cmdline/TestAdmin.java | 9 +-
.../apache/openmeetings/user/TestUserGroup.java | 6 +-
.../org/apache/openmeetings/web/TestMainAreas.java | 73 +++---
.../openmeetings/web/app/TestApplication.java | 3 +-
.../web/test/AbstractWicketTesterTest.java | 2 +-
.../openmeetings/web/test/backup/TestExport.java | 10 +-
.../web/test/backup/TestImportConfig.java | 2 +
.../web/test/backup/TestImportRoom.java | 10 +-
.../web/test/backup/TestImportUser.java | 11 +-
.../webservice/AbstractWebServiceTest.java | 2 +-
.../openmeetings/webservice/TestGroupService.java | 3 +-
.../apache/openmeetings/backup/config/configs.xml | 2 +-
.../openmeetings/backup/group/organizations.xml | 6 +-
.../openmeetings/backup/ldap/ldapconfigs.xml | 6 +-
.../apache/openmeetings/backup/menu/extraMenus.xml | 6 -
.../backup/{room => roomgrp}/rooms.xml | 5 +-
.../{room => roomgrp}/rooms_organisation.xml | 0
.../openmeetings/backup/user/ldap/ldapconfigs.xml | 6 +-
.../backup/{group => user}/organizations.xml | 12 +-
.../org/apache/openmeetings/backup/user/users.xml | 6 +
.../apache/openmeetings/backup/version/version.xml | 6 +-
.../webservice/CalendarWebService.java | 13 +-
.../openmeetings/webservice/ErrorWebService.java | 9 +-
.../openmeetings/webservice/RoomWebService.java | 39 +--
.../openmeetings/webservice/UserWebService.java | 30 +--
.../schema/AppointmentDTOListWrapper.java | 224 +++++++++--------
.../webservice/schema/AppointmentDTOWrapper.java | 219 ++++++++--------
.../schema/FileExplorerObjectWrapper.java | 71 +++---
.../webservice/schema/FileItemDTOListWrapper.java | 29 +--
.../webservice/schema/FileItemDTOWrapper.java | 25 +-
.../webservice/schema/GroupDTOListWrapper.java | 25 +-
.../webservice/schema/HealthWrapper.java | 19 +-
.../webservice/schema/InfoWrapper.java | 19 +-
.../webservice/schema/RecordingDTOListWrapper.java | 35 +--
.../webservice/schema/RoomDTOListWrapper.java | 157 ++++++------
.../webservice/schema/RoomDTOWrapper.java | 41 +--
.../webservice/schema/ServiceResultWrapper.java | 13 +-
.../webservice/schema/UserDTOListWrapper.java | 131 +++++-----
.../webservice/schema/UserDTOWrapper.java | 49 ++--
.../webservice/schema/UserSearchResultWrapper.java | 105 ++++----
.../util/AppointmentListMessageBodyWriter.java | 3 +-
pom.xml | 54 ++--
213 files changed, 2839 insertions(+), 2597 deletions(-)
delete mode 100644 openmeetings-core/src/test/java/org/apache/openmeetings/gui/TestGui.java
delete mode 100644 openmeetings-core/src/test/java/org/apache/openmeetings/rdc/TestReadKeyCodesNumber.java
rename openmeetings-web/src/main/java/org/apache/openmeetings/web/app/{Application_iw.properties.xml => Application_he.properties.xml} (100%)
rename openmeetings-web/src/main/java/org/apache/openmeetings/web/app/{Application_in.properties.xml => Application_id.properties.xml} (100%)
rename openmeetings-web/src/main/java/org/apache/openmeetings/web/common/{ComunityUserForm.html => CommunityUserForm.html} (66%)
rename openmeetings-web/src/main/java/org/apache/openmeetings/web/common/{ComunityUserForm.java => CommunityUserForm.java} (91%)
delete mode 100644 openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java
delete mode 100644 openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java
copy openmeetings-web/src/test/resources/org/apache/openmeetings/backup/{room => roomgrp}/rooms.xml (95%)
rename openmeetings-web/src/test/resources/org/apache/openmeetings/backup/{room => roomgrp}/rooms_organisation.xml (100%)
copy openmeetings-web/src/test/resources/org/apache/openmeetings/backup/{group => user}/organizations.xml (83%)
[openmeetings] 01/01: 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 48afe31499bb7f78472da1e828f88b32be775b12
Merge: 990c4048e b9b09e24c
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Jun 17 13:45:39 2022 +0700
Merge branch 'master' into java11-modules
CHANGELOG.md | 14 +-
LICENSE | 118 ++++-----
README.md | 4 +-
.../openmeetings/core/converter/BaseConverter.java | 75 ++----
.../core/converter/InterviewConverter.java | 101 ++++----
.../core/converter/RecordingConverter.java | 4 +-
.../core/converter/VideoConverter.java | 4 +-
.../openmeetings/core/ldap/LdapLoginManager.java | 278 +++++++++++----------
.../apache/openmeetings/core/remote/KStream.java | 7 +-
.../openmeetings/core/remote/KurentoHandler.java | 161 ++++++------
.../openmeetings/core/remote/StreamProcessor.java | 61 +++--
.../apache/openmeetings/core/sip/SipManager.java | 4 +-
.../openmeetings/core/sip/SipStackProcessor.java | 3 +-
.../core/util/ChatWebSocketHelper.java | 17 +-
.../openmeetings/core/util/WebSocketHelper.java | 27 +-
.../openmeetings/core/util/ws/WsMessageAll.java | 11 +-
.../core/util/ws/WsMessageRoomMsg.java | 12 +-
.../openmeetings/core/remote/BaseMockedTest.java | 16 +-
.../core/remote/TestNotConnectedMocked.java | 31 ++-
.../core/remote/TestRoomFlowMocked.java | 10 +
.../core/remote/TestSetupFlowMocked.java | 12 +
.../java/org/apache/openmeetings/gui/TestGui.java | 30 ---
.../openmeetings/rdc/TestReadKeyCodesNumber.java | 49 ----
.../db/dao/basic/ConfigurationDao.java | 56 ++---
.../openmeetings/db/dao/file/FileItemDao.java | 11 +-
.../apache/openmeetings/db/dao/label/LabelDao.java | 14 +-
.../openmeetings/db/dao/record/RecordingDao.java | 2 +-
.../apache/openmeetings/db/dao/user/UserDao.java | 19 +-
.../apache/openmeetings/db/dto/user/OAuthUser.java | 6 +-
.../openmeetings/db/entity/basic/Client.java | 6 +-
.../openmeetings/db/entity/basic/MailMessage.java | 2 +-
.../openmeetings/db/entity/file/BaseFileItem.java | 3 +-
.../openmeetings/db/entity/room/Invitation.java | 17 +-
.../apache/openmeetings/db/entity/room/Room.java | 25 --
.../apache/openmeetings/db/entity/user/User.java | 27 +-
.../apache/openmeetings/db/mapper/RoomMapper.java | 3 +-
.../apache/openmeetings/backup/BackupExport.java | 13 +-
.../apache/openmeetings/backup/BackupImport.java | 68 ++---
.../openmeetings/backup/converter/WbConverter.java | 16 +-
.../java/org/apache/openmeetings/cli/Admin.java | 10 +-
.../cli/ConnectionPropertiesPatcher.java | 4 +-
.../apache/openmeetings/cli/OmHelpFormatter.java | 8 +-
.../installation/ImportInitvalues.java | 18 ++
openmeetings-server/pom.xml | 2 +-
.../src/main/assembly/scripts/admin.sh | 2 +-
.../src/main/assembly/scripts/network_test.sh | 8 +-
.../src/main/assembly/scripts/openmeetings.service | 2 +-
.../src/site/markdown/AsteriskIntegration.md | 58 ++++-
.../src/site/markdown/InstallMediaServer.md | 8 +-
.../src/site/stylesheets/errorvalues.xsd | 6 +-
.../src/site/xdoc/BuildInstructions.xml | 4 +-
openmeetings-server/src/site/xdoc/ReleaseGuide.xml | 2 +-
.../src/site/xdoc/RestAPISample.xml | 6 +-
openmeetings-server/src/site/xdoc/WebsiteGuide.xml | 2 +-
.../src/site/xdoc/commercial-support.xml | 2 +-
openmeetings-server/src/site/xdoc/installation.xml | 4 +-
.../calendar/caldav/AppointmentManager.java | 21 +-
.../service/calendar/caldav/IcalUtils.java | 21 +-
.../mail/template/RegisterUserTemplate.html | 1 +
.../mail/template/RegisterUserTemplate.java | 4 +
.../service/room/InvitationManager.java | 3 +-
openmeetings-util/src/main/java/module-info.java | 3 +-
.../openmeetings/util/OpenmeetingsVariables.java | 1 +
.../org/apache/openmeetings/util/XmlExport.java | 54 ++--
.../apache/openmeetings/util/mail/IcalHandler.java | 23 +-
openmeetings-web/src/main/front/wb/package.json | 7 +-
openmeetings-web/src/main/front/wb/src/wb.js | 13 +-
.../openmeetings/web/admin/backup/BackupPanel.html | 64 ++---
.../openmeetings/web/admin/backup/BackupPanel.java | 35 +--
.../web/admin/configurations/ConfigsPanel.html | 62 +++--
.../web/admin/connection/ConnectionsPanel.java | 9 +-
.../openmeetings/web/admin/extra/ExtraPanel.html | 28 ++-
.../openmeetings/web/admin/groups/GroupsPanel.html | 102 +++++---
.../web/admin/labels/AddLanguageDialog.html | 12 +-
.../openmeetings/web/admin/labels/LangPanel.html | 18 +-
.../openmeetings/web/admin/ldaps/LdapsPanel.html | 56 +++--
.../openmeetings/web/admin/oauth/OAuthForm.java | 5 +-
.../openmeetings/web/admin/oauth/OAuthPanel.html | 108 +++++---
.../openmeetings/web/admin/rooms/RoomForm.java | 5 +-
.../openmeetings/web/admin/rooms/RoomsPanel.html | 165 ++++++------
.../openmeetings/web/admin/users/UserForm.html | 49 ++--
.../openmeetings/web/admin/users/UserForm.java | 4 +-
.../apache/openmeetings/web/app/Application.java | 37 ++-
...roperties.xml => Application_he.properties.xml} | 0
...roperties.xml => Application_id.properties.xml} | 0
.../apache/openmeetings/web/app/ClientManager.java | 3 +-
.../apache/openmeetings/web/app/TimerService.java | 5 +
.../apache/openmeetings/web/common/Captcha.html | 4 +-
...omunityUserForm.html => CommunityUserForm.html} | 21 +-
...omunityUserForm.java => CommunityUserForm.java} | 8 +-
.../openmeetings/web/common/GeneralUserForm.html | 118 ++++++---
.../openmeetings/web/common/InvitationForm.html | 78 +++---
.../openmeetings/web/common/InvitationForm.java | 7 +-
.../apache/openmeetings/web/common/MainPanel.java | 6 +-
.../apache/openmeetings/web/common/NameDialog.html | 7 +-
.../apache/openmeetings/web/common/NameDialog.java | 6 +-
.../web/common/PagingNavigatorPanel.html | 2 +-
.../web/common/UploadableImagePanel.html | 1 +
.../web/common/UploadableImagePanel.java | 56 +++--
.../common/datetime/AbstractOmDateTimePicker.java | 8 +-
.../openmeetings/web/common/menu/OmMenuItem.java | 3 +-
.../web/common/tree/FileTreePanel.java | 6 +-
.../openmeetings/web/common/tree/FolderPanel.java | 83 +++---
.../web/common/tree/OmTreeProvider.java | 3 +-
.../web/common/upload/UploadResourceReference.java | 7 +-
.../apache/openmeetings/web/pages/BasePage.java | 2 +-
.../web/pages/auth/ForgetPasswordDialog.java | 24 +-
.../web/pages/auth/RegisterDialog.java | 50 ++--
.../web/pages/auth/ResetPasswordDialog.java | 11 +-
.../openmeetings/web/pages/auth/SignInDialog.html | 8 +-
.../openmeetings/web/pages/auth/SignInDialog.java | 4 +-
.../openmeetings/web/pages/auth/SignInPage.java | 11 +-
.../web/pages/install/InstallWizard$DbStep.html | 2 +-
.../pages/install/InstallWizard$ParamsStep1.html | 2 +-
.../pages/install/InstallWizard$ParamsStep2.html | 2 +-
.../web/pages/install/InstallWizard.java | 11 +-
.../openmeetings/web/room/NicknameDialog.html | 24 +-
.../apache/openmeetings/web/room/RoomPanel.html | 28 +--
.../apache/openmeetings/web/room/RoomPanel.java | 39 +--
.../openmeetings/web/room/VideoSettings.html | 6 +-
.../web/room/activities/ActivitiesPanel.java | 93 +++----
.../openmeetings/web/room/activities/Activity.java | 22 +-
.../openmeetings/web/room/menu/ActionsSubMenu.java | 6 +-
.../openmeetings/web/room/menu/ExtrasSubMenu.java | 3 +-
.../web/room/menu/RoomInvitationForm.html | 14 +-
.../web/room/menu/RoomInvitationForm.java | 18 +-
.../web/room/menu/SipDialerDialog.html | 2 +-
.../web/room/menu/SipDialerDialog.java | 2 +-
.../web/room/poll/CreatePollDialog.html | 18 +-
.../web/room/poll/PollResultsDialog.html | 14 +-
.../web/room/poll/PollResultsDialog.java | 25 +-
.../openmeetings/web/room/poll/VoteDialog.html | 14 +-
.../openmeetings/web/room/poll/VoteDialog.java | 5 +-
.../web/room/sidebar/RoomUploadForm.html | 7 +-
.../web/room/sidebar/RoomUploadForm.java | 9 +-
.../web/room/sidebar/UploadDialog.java | 3 +-
.../openmeetings/web/room/wb/UndoObject.java | 6 +-
.../apache/openmeetings/web/room/wb/WbPanel.java | 22 +-
.../web/room/wb/WbWebSocketHelper.java | 18 +-
.../openmeetings/web/user/MessageDialog.html | 4 +-
.../web/user/calendar/AppointmentDialog.html | 102 +++++---
.../web/user/calendar/AppointmentDialog.java | 16 +-
.../web/user/calendar/CalendarDialog.html | 36 +--
.../web/user/calendar/CalendarDialog.java | 72 +++---
.../web/user/profile/ChangePasswordDialog.html | 12 +-
.../web/user/profile/ChangePasswordDialog.java | 3 +-
.../web/user/profile/EditProfileForm.html | 8 +-
.../web/user/profile/EditProfileForm.java | 4 +-
.../web/user/profile/MessagesContactsPanel.html | 8 +-
.../web/user/profile/MessagesContactsPanel.java | 7 +-
.../web/user/profile/UserSearchPanel.html | 6 +-
.../web/user/profile/UserSearchPanel.java | 9 +-
.../web/user/profile/WidgetsPanel.html | 2 +-
.../web/user/record/RecordingInvitationForm.html | 6 +-
.../web/user/record/RecordingsPanel.java | 7 +-
.../openmeetings/web/user/record/VideoInfo.java | 3 +-
.../web/user/rooms/RoomEnterBehavior.java | 2 +-
.../openmeetings/web/user/rooms/RoomsPanel.java | 3 +-
.../web/user/rooms/RoomsTabbedPanel.java | 3 +-
.../openmeetings/web/util/OmUrlFragment.java | 93 +++----
.../src/main/webapp/WEB-INF/classes/hazelcast.xml | 2 +-
openmeetings-web/src/main/webapp/WEB-INF/web.xml | 2 +-
.../src/main/webapp/css/raw-general.css | 21 +-
openmeetings-web/src/main/webapp/css/raw-tree.css | 6 +-
.../src/main/webapp/data/conf/om_ldap.cfg | 12 +-
.../src/main/webapp/images/arcArrow.svg | 6 +-
.../src/main/webapp/images/profile.svg | 6 +-
.../src/main/webapp/languages/languages.xml | 4 +-
.../calendar/TestDatabaseStructureAppointment.java | 58 ++---
.../TestDatabaseStructureGetUserStart.java | 37 ---
.../TestDatabaseStructureMeetingMember.java | 30 ---
.../org/apache/openmeetings/cmdline/TestAdmin.java | 9 +-
.../apache/openmeetings/user/TestUserGroup.java | 6 +-
.../org/apache/openmeetings/web/TestMainAreas.java | 73 +++---
.../openmeetings/web/app/TestApplication.java | 3 +-
.../web/test/AbstractWicketTesterTest.java | 2 +-
.../openmeetings/web/test/backup/TestExport.java | 10 +-
.../web/test/backup/TestImportConfig.java | 2 +
.../web/test/backup/TestImportRoom.java | 10 +-
.../web/test/backup/TestImportUser.java | 11 +-
.../webservice/AbstractWebServiceTest.java | 2 +-
.../openmeetings/webservice/TestGroupService.java | 3 +-
.../apache/openmeetings/backup/config/configs.xml | 2 +-
.../openmeetings/backup/group/organizations.xml | 6 +-
.../openmeetings/backup/ldap/ldapconfigs.xml | 6 +-
.../apache/openmeetings/backup/menu/extraMenus.xml | 6 -
.../apache/openmeetings/backup/roomgrp/rooms.xml | 71 ++++++
.../{room => roomgrp}/rooms_organisation.xml | 0
.../openmeetings/backup/user/ldap/ldapconfigs.xml | 6 +-
.../backup/{group => user}/organizations.xml | 12 +-
.../org/apache/openmeetings/backup/user/users.xml | 6 +
.../apache/openmeetings/backup/version/version.xml | 6 +-
.../webservice/CalendarWebService.java | 13 +-
.../openmeetings/webservice/ErrorWebService.java | 9 +-
.../openmeetings/webservice/RoomWebService.java | 39 +--
.../openmeetings/webservice/UserWebService.java | 30 +--
.../schema/AppointmentDTOListWrapper.java | 224 +++++++++--------
.../webservice/schema/AppointmentDTOWrapper.java | 219 ++++++++--------
.../schema/FileExplorerObjectWrapper.java | 71 +++---
.../webservice/schema/FileItemDTOListWrapper.java | 29 +--
.../webservice/schema/FileItemDTOWrapper.java | 25 +-
.../webservice/schema/GroupDTOListWrapper.java | 25 +-
.../webservice/schema/HealthWrapper.java | 19 +-
.../webservice/schema/InfoWrapper.java | 19 +-
.../webservice/schema/RecordingDTOListWrapper.java | 35 +--
.../webservice/schema/RoomDTOListWrapper.java | 157 ++++++------
.../webservice/schema/RoomDTOWrapper.java | 41 +--
.../webservice/schema/ServiceResultWrapper.java | 13 +-
.../webservice/schema/UserDTOListWrapper.java | 131 +++++-----
.../webservice/schema/UserDTOWrapper.java | 49 ++--
.../webservice/schema/UserSearchResultWrapper.java | 105 ++++----
.../util/AppointmentListMessageBodyWriter.java | 3 +-
pom.xml | 54 ++--
213 files changed, 2907 insertions(+), 2595 deletions(-)
diff --cc openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java
index 9d06f7fee,422905684..a7cf0c2e5
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java
@@@ -25,8 -25,10 +25,10 @@@ import static org.mockito.ArgumentMatch
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
+ import static org.mockito.Mockito.times;
+ import static org.mockito.Mockito.verify;
-import org.apache.openmeetings.IApplication;
+import org.apache.openmeetings.db.IApplication;
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.UserDao;
diff --cc openmeetings-util/src/main/java/module-info.java
index 2a5c01364,000000000..9ff784672
mode 100644,000000..100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@@ -1,48 -1,0 +1,49 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module org.apache.openmeetings.util {
+ exports org.apache.openmeetings.util;
+ exports org.apache.openmeetings.util.crypt;
+ exports org.apache.openmeetings.util.mail;
+ exports org.apache.openmeetings.util.process;
+ exports org.apache.openmeetings.util.ws;
+ exports org.apache.openmeetings.util.logging;
+
+ requires transitive org.apache.wicket.util;
+ requires transitive org.apache.wicket.core;
+ requires transitive org.apache.wicket.extensions;
+
+ requires transitive org.apache.commons.codec;
+ requires transitive org.apache.commons.lang3;
+ requires transitive org.apache.tika.core;
+
+ requires transitive jakarta.activation;
+
+ requires transitive com.github.openjson;
+ requires transitive org.slf4j;
+ requires transitive org.bouncycastle.provider;
+ requires transitive org.mnode.ical4j.core;
+ requires transitive spring.context;
+ requires transitive ch.qos.logback.classic;
+ requires transitive ch.qos.logback.core;
+ requires transitive dom4j;
+ requires javax.servlet.api;
- requires simpleclient.servlet;
+ requires org.aspectj.tools;
++ requires simpleclient; //io.prometheus
++ requires simpleclient.servlet; //io.prometheus
+}
diff --cc openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 916731391,728d717c1..510f05eb4
--- 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
@@@ -46,6 -46,8 +46,7 @@@ import java.util.stream.Stream
import javax.websocket.WebSocketContainer;
-import org.apache.openmeetings.IApplication;
+ import org.apache.openmeetings.core.remote.KStream;
import org.apache.openmeetings.core.sip.SipManager;
import org.apache.openmeetings.core.util.ChatWebSocketHelper;
import org.apache.openmeetings.core.util.WebSocketHelper;
@@@ -131,6 -133,6 +132,7 @@@ import org.apache.wicket.settings.Excep
import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.validation.validator.UrlValidator;
++import org.eclipse.equinox.app.IApplication;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --cc openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
index 4d30e875c,85a615328..9b51276e7
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
@@@ -18,52 -18,42 +18,42 @@@
*/
package org.apache.openmeetings.calendar;
- import java.text.SimpleDateFormat;
- import java.util.Calendar;
+ import static org.junit.jupiter.api.Assertions.assertEquals;
+
+ import java.time.LocalDate;
+ import java.time.LocalDateTime;
import java.util.Date;
- import java.util.Iterator;
import java.util.List;
+ import java.util.TimeZone;
-import org.apache.openmeetings.AbstractOmServerTest;
import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.web.test.AbstractOmServerTest;
+ import org.apache.openmeetings.util.CalendarHelper;
import org.junit.jupiter.api.Test;
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
class TestDatabaseStructureAppointment extends AbstractOmServerTest {
- private static final Logger log = LoggerFactory.getLogger(TestDatabaseStructureAppointment.class);
+ private static String getTzId() {
+ return TimeZone.getDefault().getID();
+ }
- @Test
- void testAddingGroup() {
- try {
- Calendar cal = Calendar.getInstance();
- cal.set(2008, 9, 2);
- cal.get(Calendar.DAY_OF_MONTH);
- cal.getTime();
+ private static Date getDate(int hour, int minute) {
+ return CalendarHelper.getDate(LocalDateTime.of(2008, 8, 17, 12, 28), getTzId());
+ }
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- Date date = format.parse("2008-17-08");
- Date date2 = format.parse("2008-18-08");
+ private void createAppointment(int startHour, int startMinute, int endHour, int endMinute) {
+ Appointment a = getAppointment(getDate(startHour, startMinute), getDate(endHour, endMinute));
+ appointmentDao.update(a, a.getOwner().getId());
+ }
- List<Appointment> listAppoints = appointmentDao.getInRange(1L, date, date2);
- // List<Appointment> listAppoints = appointmentDao.searchAppointmentsByName("%");
- // appointmentDao.getNextAppointmentById(1L);
- // appointmentDao.addAppointment("mezo", 1L, "Pforzheim", "zweiter", Calendar.getInstance().getTime(),
- // date, null, true, null, null, 1L,1L);
- // appointmentDao.addAppointment("testap", "erster Test",Calendar.getInstance().getTime(),
- // Calendar.getInstance().getTime(), true, false, false, false, new Long(1), 1L);
- log.debug("Anzahl: " + listAppoints.size());
+ @Test
+ void testAddingGroup() throws Exception {
+ Date date = CalendarHelper.getDate(LocalDate.of(2008, 8, 17), getTzId());
+ Date date2 = CalendarHelper.getDate(LocalDate.of(2008, 8, 18), getTzId());
- for (Appointment appoints : listAppoints) {
- log.debug("Termin: " + appoints.getTitle() + " startDate: " + appoints.getStart() + " endDate: " + appoints.getEnd());
- log.debug("MeetingMembers: " + appoints.getMeetingMembers().size());
- }
+ createAppointment(12, 28, 23, 15);
+ createAppointment(1, 1, 3, 52);
- for (Iterator<Appointment> iter = listAppoints.iterator(); iter.hasNext();) {
- log.debug("" + iter.next());
- }
- } catch (Exception err) {
- log.error("[testAddingGroup]", err);
- }
+ List<Appointment> listAppoints = appointmentDao.getInRange(1L, date, date2);
+ assertEquals(2, listAppoints.size(), "Exactly 2 appointments should retrieved");
}
}
diff --cc openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestApplication.java
index 5cefeb9b1,23c477889..ea02187b7
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestApplication.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestApplication.java
@@@ -27,10 -27,9 +27,9 @@@ import static org.junit.jupiter.api.Ass
import java.util.List;
import java.util.Locale;
import java.util.Map.Entry;
- import java.util.stream.Collectors;
-import org.apache.openmeetings.AbstractOmServerTest;
import org.apache.openmeetings.db.dao.label.LabelDao;
+import org.apache.openmeetings.web.test.AbstractOmServerTest;
import org.junit.jupiter.api.Test;
class TestApplication extends AbstractOmServerTest {
diff --cc openmeetings-web/src/test/java/org/apache/openmeetings/web/test/backup/TestExport.java
index 3f50db919,6a22356d3..ae48e6149
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/test/backup/TestExport.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/test/backup/TestExport.java
@@@ -25,7 -26,10 +26,9 @@@ import static org.junit.jupiter.api.Ass
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.IOException;
import java.io.StringWriter;
+ import java.io.Writer;
+ import java.nio.file.Paths;
import java.time.LocalDate;
import javax.xml.bind.JAXBContext;
@@@ -37,8 -41,7 +40,7 @@@ import org.apache.openmeetings.db.entit
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.User;
-import org.junit.jupiter.api.Assertions;
+import org.apache.openmeetings.web.test.AbstractOmServerTest;
- import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@@ -61,9 -68,15 +65,9 @@@ class TestExport extends AbstractOmServ
JAXBContext jc = JAXBContext.newInstance(eClazz);
Marshaller marshaller = jc.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
- marshaller.setProperty(CharacterEscapeHandler.class.getName(), new CharacterEscapeHandler() {
- @Override
- public void escape(char[] ac, int i, int j, boolean flag, Writer writer) throws IOException {
- writer.write(ac, i, j);
- }
- });
StringWriter writer = new StringWriter();
marshaller.marshal(u, writer);
-- Assertions.assertNotNull(writer.getBuffer());
++ assertNotNull(writer.getBuffer());
}
@Test
diff --cc openmeetings-web/src/test/java/org/apache/openmeetings/web/test/backup/TestImportConfig.java
index 527d3f41c,cedb67562..84ea5769f
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/test/backup/TestImportConfig.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/test/backup/TestImportConfig.java
@@@ -22,7 -23,7 +22,8 @@@ import static org.apache.openmeetings.u
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_OAUTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_SOAP;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REPLY_TO_ORGANIZER;
+ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_SERVER;
+import static org.apache.openmeetings.web.test.backup.TestImport.BACKUP_ROOT;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
diff --cc openmeetings-web/src/test/java/org/apache/openmeetings/web/test/backup/TestImportRoom.java
index 2b2104d1e,3561ebda6..955148a83
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/test/backup/TestImportRoom.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/test/backup/TestImportRoom.java
@@@ -16,10 -16,11 +16,11 @@@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.backup;
+package org.apache.openmeetings.web.test.backup;
-import static org.apache.openmeetings.backup.TestImport.BACKUP_ROOT;
+import static org.apache.openmeetings.web.test.backup.TestImport.BACKUP_ROOT;
import static org.junit.jupiter.api.Assertions.assertEquals;
+ import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.File;