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%)