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 2020/03/14 03:21:37 UTC

[openmeetings] 01/01: Merge branch 'master' into java11-modules

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 dcf7215bfac7ba77d181efe7af4b42e320402c1f
Merge: c37124c 3f360c3
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Mar 14 10:21:18 2020 +0700

    Merge branch 'master' into java11-modules

 openmeetings-core/pom.xml                          |   1 +
 .../openmeetings/core/converter/BaseConverter.java |   9 +-
 .../core/converter/RecordingConverter.java         |   3 +-
 .../core/converter/VideoConverter.java             |   9 +-
 .../openmeetings/core/data/file/FileProcessor.java |  16 +-
 .../openmeetings/core/ldap/LdapLoginManager.java   |  18 +-
 .../org/apache/openmeetings/core/remote/KRoom.java |  12 +-
 .../apache/openmeetings/core/remote/KStream.java   |   2 +-
 .../openmeetings/core/remote/KTestStream.java      |  24 +-
 .../openmeetings/core/remote/KurentoHandler.java   |  40 +-
 .../openmeetings/core/remote/StreamProcessor.java  |  26 +-
 .../openmeetings/core/rss/LoadAtomRssFeed.java     |   6 +-
 .../core/util/ChatWebSocketHelper.java             |   2 +-
 .../core/remote/TestRoomFlowMocked.java            |   6 +-
 openmeetings-db/pom.xml                            |   5 +-
 .../org/apache/openmeetings/db/bind/Constants.java |  64 +++
 .../db/bind/adapter/AppointmentAdapter.java        |  22 +-
 .../bind/adapter/AppointmentReminderAdapter.java   |  22 +-
 .../db/bind/adapter/BooleanAdapter.java            |  15 +-
 .../db/bind/adapter/ConfigTypeAdapter.java         |  23 +-
 .../openmeetings/db/bind/adapter/DateAdapter.java  |  29 +-
 .../db/bind/adapter/EntityAdapter.java             |  44 +-
 .../openmeetings/db/bind/adapter/FileAdapter.java  |  23 +-
 .../db/bind/adapter/FileTypeAdapter.java           |  29 +-
 .../openmeetings/db/bind/adapter/GroupAdapter.java |  22 +-
 .../openmeetings/db/bind/adapter/IntAdapter.java   |  15 +-
 .../db/bind/adapter/LocalDateAdapter.java          |  58 ++
 .../openmeetings/db/bind/adapter/LongAdapter.java  |  15 +-
 .../db/bind/adapter/OauthMapAdapter.java           | 118 ++++
 .../db/bind/adapter/OmCalendarAdapter.java         |  22 +-
 .../db/bind/adapter/PollTypeAdapter.java           |  17 +-
 .../db/bind/adapter/RecordingStatusAdapter.java    |  38 +-
 .../openmeetings/db/bind/adapter/RoomAdapter.java  |  22 +-
 .../db/bind/adapter/RoomElementAdapter.java        |  57 ++
 .../db/bind/adapter/RoomTypeAdapter.java           |  18 +-
 .../db/bind/adapter/SalutationAdapter.java         |  19 +-
 .../openmeetings/db/bind/adapter/UserAdapter.java  |  22 +-
 .../db/bind/adapter/UserRightAdapter.java          |  20 +-
 .../db/bind/adapter/UserTypeAdapter.java           |  20 +-
 .../db/dao/basic/ConfigurationDao.java             |  13 +-
 .../db/dao/calendar/AppointmentDao.java            |  41 +-
 .../db/dao/calendar/MeetingMemberDao.java          |   2 +-
 .../db/dao/calendar/OmCalendarDao.java             |  35 +-
 .../openmeetings/db/dao/file/BaseFileItemDao.java  |  40 +-
 .../openmeetings/db/dao/file/FileItemDao.java      |  18 +-
 .../openmeetings/db/dao/record/RecordingDao.java   |   8 +-
 .../db/dao/room/IInvitationManager.java            |   2 +-
 .../openmeetings/db/dao/room/InvitationDao.java    |   6 +-
 .../apache/openmeetings/db/dao/room/RoomDao.java   |  10 +-
 .../apache/openmeetings/db/dao/user/UserDao.java   |  31 +-
 .../db/dto/calendar/MeetingMemberDTO.java          |   4 +-
 .../openmeetings/db/dto/room/InvitationDTO.java    |  10 +-
 .../openmeetings/db/dto/room/Whiteboard.java       |  10 +-
 .../apache/openmeetings/db/dto/user/UserDTO.java   |   6 +-
 .../openmeetings/db/entity/HistoricalEntity.java   |  17 +-
 .../openmeetings/db/entity/basic/ChatMessage.java  |  41 +-
 .../openmeetings/db/entity/basic/Client.java       |  33 +-
 .../db/entity/basic/Configuration.java             |  28 +-
 .../db/entity/calendar/Appointment.java            |  86 ++-
 .../db/entity/calendar/MeetingMember.java          |  26 +-
 .../db/entity/calendar/OmCalendar.java             |  25 +-
 .../openmeetings/db/entity/file/BaseFileItem.java  |  67 ++-
 .../openmeetings/db/entity/file/FileItem.java      |  18 +-
 .../openmeetings/db/entity/log/ConferenceLog.java  |   5 +-
 .../openmeetings/db/entity/record/Recording.java   |  54 +-
 .../db/entity/record/RecordingChunk.java           |  28 +-
 .../openmeetings/db/entity/room/Invitation.java    |  16 +-
 .../apache/openmeetings/db/entity/room/Room.java   | 154 +++---
 .../openmeetings/db/entity/room/RoomFile.java      |  25 +-
 .../openmeetings/db/entity/room/RoomGroup.java     |  24 +-
 .../openmeetings/db/entity/room/RoomModerator.java |  18 +-
 .../openmeetings/db/entity/room/RoomPoll.java      |  49 +-
 .../db/entity/room/RoomPollAnswer.java             |  38 +-
 .../openmeetings/db/entity/server/LdapConfig.java  |  28 +-
 .../openmeetings/db/entity/server/OAuthServer.java |  62 ++-
 .../db/entity/server/RemoteSessionObject.java      |  85 +--
 .../openmeetings/db/entity/user/Address.java       |  34 +-
 .../db/entity/user/AsteriskSipUser.java            |  52 +-
 .../apache/openmeetings/db/entity/user/Group.java  |  48 +-
 .../openmeetings/db/entity/user/GroupUser.java     |  18 +-
 .../db/entity/user/PrivateMessage.java             |  54 +-
 .../db/entity/user/PrivateMessageFolder.java       |  28 +-
 .../apache/openmeetings/db/entity/user/User.java   | 148 ++---
 .../openmeetings/db/entity/user/UserContact.java   |  76 ++-
 .../openmeetings/db/util/ApplicationHelper.java    |   8 +-
 .../apache/openmeetings/db/util/AuthLevelUtil.java |  26 +-
 .../org/apache/openmeetings/db/util/DaoHelper.java |  22 +-
 .../apache/openmeetings/db/util/LocaleHelper.java  |   7 +-
 .../org/apache/openmeetings/db/util/XmlHelper.java |  57 ++
 .../openmeetings/db/util/ws/RoomMessage.java       |  50 +-
 .../openmeetings/db/util/TestAuthLevelUtil.java    |  12 +-
 openmeetings-install/pom.xml                       |   1 +
 .../apache/openmeetings/backup/BackupExport.java   | 372 +++++--------
 .../apache/openmeetings/backup/BackupImport.java   | 509 +++++++++---------
 .../apache/openmeetings/backup/BackupVersion.java  |  22 +-
 .../backup/converter/AppointmentConverter.java     |  58 --
 .../AppointmentReminderTypeConverter.java          |  39 --
 .../backup/converter/BaseFileItemConverter.java    |  60 ---
 .../backup/converter/EnumIcaseConverter.java       |  53 --
 .../backup/converter/GroupConverter.java           |  58 --
 .../backup/converter/OmCalendarConverter.java      |  58 --
 .../backup/converter/PollTypeConverter.java        |  39 --
 .../backup/converter/RecordingStatusConverter.java |  51 --
 .../backup/converter/RoomConverter.java            |  58 --
 .../openmeetings/backup/converter/WbConverter.java |  13 +-
 .../java/org/apache/openmeetings/cli/Admin.java    |  94 ++--
 .../cli/ConnectionPropertiesPatcher.java           |  29 +-
 .../apache/openmeetings/cli/OmHelpFormatter.java   |   4 +-
 .../installation/ImportInitvalues.java             |  28 +-
 openmeetings-screenshare/pom.xml                   |   1 +
 .../openmeetings/screenshare/ScreenV1Encoder.java  |   8 +-
 .../openmeetings/screenshare/job/OmKeyEvent.java   |   7 +-
 openmeetings-server/pom.xml                        |   1 +
 .../src/site/resources/css/site.css                |  11 +
 openmeetings-server/src/site/resources/js/site.js  |   4 +-
 openmeetings-server/src/site/xdoc/downloads.xml    |  38 +-
 openmeetings-service/pom.xml                       |   1 +
 .../calendar/caldav/AppointmentManager.java        |   6 +-
 .../service/calendar/caldav/IcalUtils.java         |  12 +-
 .../service/notifier/MailNotifier.java             |   2 +-
 .../service/quartz/scheduler/AtomReader.java       |  11 +-
 .../service/room/InvitationManager.java            |  24 +-
 openmeetings-util/pom.xml                          |   1 +
 .../openmeetings/util/ConnectionProperties.java    |  28 +-
 .../org/apache/openmeetings/util/OmFileHelper.java |  10 +-
 .../openmeetings/util/OpenmeetingsVariables.java   |   4 +-
 .../org/apache/openmeetings/util/StoredFile.java   |   9 +-
 .../org/apache/openmeetings/util/XmlExport.java    |   6 +-
 openmeetings-web/pom.xml                           |  53 +-
 .../openmeetings/web/admin/AdminActionsPanel.html  |  14 +-
 .../openmeetings/web/admin/AdminActionsPanel.java  |  32 +-
 .../openmeetings/web/admin/AdminBasePanel.java     |   4 +-
 .../openmeetings/web/admin/backup/BackupPanel.html |  31 +-
 .../openmeetings/web/admin/backup/BackupPanel.java | 202 ++++---
 .../web/admin/configurations/ConfigForm.java       |  38 +-
 .../web/admin/configurations/ConfigsPanel.html     |  79 +--
 .../web/admin/configurations/admin-config.js       |  32 ++
 .../web/admin/connection/ConnectionsPanel.html     |  10 +-
 .../web/admin/connection/ConnectionsPanel.java     |  27 +-
 .../openmeetings/web/admin/email/EmailForm.java    |  42 +-
 .../openmeetings/web/admin/email/EmailPanel.html   |  56 +-
 .../openmeetings/web/admin/email/EmailPanel.java   |   2 +-
 .../web/admin/groups/GroupUsersPanel.html          |  12 +-
 .../web/admin/groups/GroupUsersPanel.java          |  30 +-
 .../openmeetings/web/admin/groups/GroupsPanel.html |  49 +-
 .../openmeetings/web/admin/groups/GroupsPanel.java |   2 +-
 .../web/admin/labels/AddLanguageDialog.html        |   4 +-
 .../web/admin/labels/AddLanguageDialog.java        |  93 ++--
 .../openmeetings/web/admin/labels/LabelsForm.java  |   6 -
 .../openmeetings/web/admin/labels/LangPanel.html   |  67 +--
 .../openmeetings/web/admin/labels/LangPanel.java   |  57 +-
 .../openmeetings/web/admin/ldaps/LdapsPanel.html   |  50 +-
 .../openmeetings/web/admin/oauth/OAuthForm.java    |  46 +-
 .../openmeetings/web/admin/oauth/OAuthPanel.html   | 113 ++--
 .../openmeetings/web/admin/rooms/RoomForm.java     | 107 ++--
 .../openmeetings/web/admin/rooms/RoomsPanel.html   | 203 ++++---
 .../openmeetings/web/admin/rooms/RoomsPanel.java   |   2 +-
 .../web/admin/users/PasswordDialog.html            |   6 +-
 .../web/admin/users/PasswordDialog.java            |  94 ++--
 .../openmeetings/web/admin/users/UserForm.html     |  34 +-
 .../openmeetings/web/admin/users/UserForm.java     |  27 +-
 .../openmeetings/web/admin/users/UsersPanel.html   |   4 +-
 .../openmeetings/web/admin/users/UsersPanel.java   |  25 +-
 .../apache/openmeetings/web/app/Application.java   |  74 ++-
 .../web/app/Application.properties.xml             |  52 +-
 .../web/app/Application_ar.properties.xml          |  52 +-
 .../web/app/Application_bg.properties.xml          |  52 +-
 .../web/app/Application_bn.properties.xml          |  52 +-
 .../web/app/Application_ca.properties.xml          |  52 +-
 .../web/app/Application_cs.properties.xml          |  52 +-
 .../web/app/Application_da.properties.xml          |  52 +-
 .../web/app/Application_de.properties.xml          |  52 +-
 .../web/app/Application_el.properties.xml          |  52 +-
 .../web/app/Application_es.properties.xml          |  52 +-
 .../web/app/Application_fa.properties.xml          |  52 +-
 .../web/app/Application_fi.properties.xml          |  50 +-
 .../web/app/Application_fr.properties.xml          |  52 +-
 .../web/app/Application_gl.properties.xml          |  52 +-
 .../web/app/Application_he.properties.xml          |  52 +-
 .../web/app/Application_hu.properties.xml          |  50 +-
 .../web/app/Application_in.properties.xml          |  52 +-
 .../web/app/Application_it.properties.xml          |  52 +-
 .../web/app/Application_ja.properties.xml          |  52 +-
 .../web/app/Application_ko.properties.xml          |  52 +-
 .../web/app/Application_nl.properties.xml          |  52 +-
 .../web/app/Application_pl.properties.xml          |  52 +-
 .../web/app/Application_pt.properties.xml          |  52 +-
 .../web/app/Application_pt_BR.properties.xml       |  52 +-
 .../web/app/Application_ru.properties.xml          |  62 ++-
 .../web/app/Application_sk.properties.xml          |  52 +-
 .../web/app/Application_sv.properties.xml          |  52 +-
 .../web/app/Application_th.properties.xml          |  52 +-
 .../web/app/Application_tr.properties.xml          |  52 +-
 .../web/app/Application_uk.properties.xml          |  52 +-
 .../web/app/Application_zh_CN.properties.xml       |  52 +-
 .../web/app/Application_zh_TW.properties.xml       |  52 +-
 .../apache/openmeetings/web/app/ClientManager.java |  19 +-
 .../web/app/OmAuthenticationStrategy.java          |   2 +-
 .../openmeetings/web/app/QuickPollManager.java     |  10 +-
 .../apache/openmeetings/web/app/TimerService.java  |   2 +-
 .../apache/openmeetings/web/app/UserManager.java   |  18 +-
 .../apache/openmeetings/web/app/WebSession.java    |  41 +-
 .../openmeetings/web/app/WhiteboardManager.java    |   2 +-
 .../web/common/AbstractOmDateTimePicker.java       |  74 +++
 .../{OmButton.java => AjaxOmDatePicker.java}       |  31 +-
 .../apache/openmeetings/web/common/BasePanel.java  |   6 +-
 .../apache/openmeetings/web/common/Captcha.html    |   6 +-
 .../apache/openmeetings/web/common/Captcha.java    |  16 +-
 .../openmeetings/web/common/ComunityUserForm.html  |  34 +-
 .../web/common/ConfirmableAjaxBorder.java          | 200 -------
 .../openmeetings/web/common/FormActionsPanel.html  |  14 +-
 .../openmeetings/web/common/FormActionsPanel.java  |  34 +-
 .../openmeetings/web/common/GeneralUserForm.html   |  49 +-
 .../openmeetings/web/common/GeneralUserForm.java   |  31 +-
 .../web/common/GroupChoiceProvider.java            |   2 +-
 .../openmeetings/web/common/InvitationDialog.html  |   4 +-
 .../openmeetings/web/common/InvitationDialog.java  | 111 ++--
 .../openmeetings/web/common/InvitationForm.html    |   4 +-
 .../openmeetings/web/common/InvitationForm.java    |  43 +-
 .../apache/openmeetings/web/common/MainPanel.html  |  27 +-
 .../apache/openmeetings/web/common/MainPanel.java  |  53 +-
 .../apache/openmeetings/web/common/NameDialog.html |   6 +-
 .../apache/openmeetings/web/common/NameDialog.java |  86 ++-
 .../openmeetings/web/common/OmDateTimePicker.java  |  29 +-
 .../{OmButton.java => OmModalCloseButton.java}     |  28 +-
 .../openmeetings/web/common/OmPagingNavigator.html |   8 +-
 .../web/common/PagedEntityListPanel.html           |   8 +-
 .../web/common/PagedEntityListPanel.java           |  19 +-
 .../web/common/PagingNavigatorPanel.html           |   8 +-
 .../web/common/PagingNavigatorPanel.java           |  17 +-
 .../web/common/UploadableImagePanel.html           |  25 +-
 .../web/common/UploadableImagePanel.java           |  24 +-
 .../openmeetings/web/common/UserBasePanel.java     |   2 +-
 .../apache/openmeetings/web/common/UserPanel.java  |   2 +-
 .../ConfirmableAjaxBorder.html}                    |   5 +-
 .../common/confirmation/ConfirmableAjaxBorder.java | 136 +++++
 .../common/confirmation/ConfirmationBehavior.java  |  84 +++
 .../common/confirmation/ConfirmationConfig.java    | 116 ++++
 .../common/confirmation/ConfirmationDialog.java    |  77 +++
 .../common/confirmation/bootstrap-confirmation.js  | 597 +++++++++++++++++++++
 .../org/apache/openmeetings/web/common/main.js     |  28 +-
 .../openmeetings/web/common/menu/MenuPanel.html    |   2 +-
 .../openmeetings/web/common/menu/MenuPanel.java    |  32 +-
 .../openmeetings/web/common/menu/OmMenuItem.java   |  87 ++-
 .../openmeetings/web/common/menu/RoomMenuItem.java |   6 +-
 .../web/common/tree/ConvertingErrorsDialog.html    |  26 +-
 .../web/common/tree/ConvertingErrorsDialog.java    |  53 +-
 .../web/common/tree/DownloadMenuItem.java          |  60 ---
 .../web/common/tree/FileItemPanel.html             |   2 +-
 .../web/common/tree/FileItemPanel.java             |   4 +-
 .../openmeetings/web/common/tree/FileItemTree.java |   2 +-
 .../web/common/tree/FileTreePanel.html             |  23 +-
 .../web/common/tree/FileTreePanel.java             | 163 +++---
 .../openmeetings/web/common/tree/FolderPanel.java  |  28 +-
 .../web/common/tree/OmTreeProvider.java            |   7 +-
 .../openmeetings/web/common/tree/filetree.js       |  37 +-
 .../openmeetings/web/pages/AccessDeniedPage.html   |  10 +-
 .../openmeetings/web/pages/AccessDeniedPage.java   |   8 +-
 .../openmeetings/web/pages/ActivatePage.java       |   2 +-
 .../apache/openmeetings/web/pages/BasePage.html    |  40 +-
 .../apache/openmeetings/web/pages/BasePage.java    |  31 +-
 .../openmeetings/web/pages/BasePage.properties     |   6 +-
 .../apache/openmeetings/web/pages/HashPage.java    |  49 +-
 .../web/pages/InvitationPasswordDialog.html        |   4 +-
 .../web/pages/InvitationPasswordDialog.java        |  93 ++--
 .../apache/openmeetings/web/pages/MainPage.html    |   2 +-
 .../apache/openmeetings/web/pages/MainPage.java    |  13 +-
 .../apache/openmeetings/web/pages/PrivacyPage.html |  38 +-
 .../apache/openmeetings/web/pages/ResetPage.html   |   1 +
 .../apache/openmeetings/web/pages/ResetPage.java   |  19 +-
 .../web/pages/auth/ForgetPasswordDialog.html       |  55 +-
 .../web/pages/auth/ForgetPasswordDialog.java       | 247 +++++----
 .../web/pages/auth/KickMessageDialog.html          |  30 --
 .../web/pages/auth/KickMessageDialog.java          |  62 ---
 .../web/pages/auth/RegisterDialog.html             |  69 ++-
 .../web/pages/auth/RegisterDialog.java             | 185 +++----
 .../web/pages/auth/ResetPasswordDialog.html        |  33 +-
 .../web/pages/auth/ResetPasswordDialog.java        | 119 ++--
 .../openmeetings/web/pages/auth/SignInDialog.html  |  87 +--
 .../openmeetings/web/pages/auth/SignInDialog.java  | 290 +++++-----
 .../openmeetings/web/pages/auth/SignInPage.html    |  17 +-
 .../openmeetings/web/pages/auth/SignInPage.java    |  89 ++-
 .../web/pages/install/CongratulationsPanel.html    |  12 +-
 .../web/pages/install/InstallWizard$DbStep.html    |   4 +-
 .../pages/install/InstallWizard$InstallStep.html   |   2 +-
 .../pages/install/InstallWizard$ParamsStep1.html   |   4 +-
 .../pages/install/InstallWizard$ParamsStep2.html   |   2 +-
 .../pages/install/InstallWizard$ParamsStep3.html   |   2 +-
 .../pages/install/InstallWizard$ParamsStep4.html   |   4 +-
 .../web/pages/install/InstallWizard.java           |  34 +-
 .../web/pages/install/InstallWizardPage.html       |  26 -
 .../org/apache/openmeetings/web/pages/loader.css   |  32 ++
 .../openmeetings/web/room/EventDetailDialog.html   |   6 +-
 .../openmeetings/web/room/EventDetailDialog.java   |  38 +-
 .../ResetPage.html => room/IconTextModal.html}     |   2 +-
 .../openmeetings/web/room/IconTextModal.java       |  72 +++
 .../apache/openmeetings/web/room/NetTestPanel.html |  40 +-
 .../openmeetings/web/room/NicknameDialog.java      |  91 ++--
 .../openmeetings/web/room/OmTimerBehavior.java     |   3 +-
 .../web/room/RedirectMessageDialog.java            |  51 +-
 .../apache/openmeetings/web/room/RoomPanel.html    |  64 ++-
 .../apache/openmeetings/web/room/RoomPanel.java    | 279 +++++-----
 .../web/room/RoomPreviewResourceReference.java     |   2 +-
 .../web/room/RoomResourceReference.java            |  12 +-
 .../openmeetings/web/room/VideoSettings.html       | 135 ++---
 .../openmeetings/web/room/VideoSettings.java       |  15 +-
 .../openmeetings/web/room/WaitModeratorDialog.html |  25 -
 .../openmeetings/web/room/WaitModeratorDialog.java |  57 --
 .../web/room/WaitModeratorDialog_ru.html           |  25 -
 .../web/room/activities/ActivitiesPanel.html       |  37 +-
 .../web/room/activities/ActivitiesPanel.java       |  53 +-
 .../openmeetings/web/room/activities/activities.js |  14 +-
 .../openmeetings/web/room/menu/ActionsSubMenu.java |  57 +-
 .../openmeetings/web/room/menu/PollsSubMenu.java   |  38 +-
 .../web/room/menu/RoomInvitationForm.java          |  16 +-
 .../openmeetings/web/room/menu/RoomMenuPanel.html  |  16 +-
 .../openmeetings/web/room/menu/RoomMenuPanel.java  |  46 +-
 .../web/room/menu/SipDialerDialog.java             |  78 ++-
 .../web/room/poll/CreatePollDialog.html            |   8 +-
 .../web/room/poll/CreatePollDialog.java            |  77 ++-
 .../web/room/poll/PollResultsDialog.html           |  14 +-
 .../web/room/poll/PollResultsDialog.java           | 177 +++---
 .../openmeetings/web/room/poll/VoteDialog.html     |   6 +-
 .../openmeetings/web/room/poll/VoteDialog.java     | 114 ++--
 .../apache/openmeetings/web/room/raw-nettest.js    |  30 +-
 .../org/apache/openmeetings/web/room/raw-room.js   | 101 ++--
 .../apache/openmeetings/web/room/raw-settings.js   | 111 +---
 .../openmeetings/web/room/raw-video-manager.js     |   6 +-
 .../apache/openmeetings/web/room/raw-video-util.js |   2 +-
 .../org/apache/openmeetings/web/room/raw-video.js  |   4 +-
 .../web/room/sidebar/ClientIconsPanel.html         |  32 +-
 .../web/room/sidebar/RoomClientPanel.html          |  14 +-
 .../web/room/sidebar/RoomClientPanel.java          |  14 +-
 .../web/room/sidebar/RoomFilePanel.java            |   5 +-
 .../openmeetings/web/room/sidebar/RoomSidebar.html |  40 +-
 .../openmeetings/web/room/sidebar/RoomSidebar.java |  60 +--
 .../web/room/sidebar/SelfIconsPanel.html           |  32 +-
 .../web/room/sidebar/UploadDialog.html             |  21 +-
 .../web/room/sidebar/UploadDialog.java             | 163 ++----
 .../web/room/sidebar/icon/ClientIcon.java          |   2 +-
 .../web/room/sidebar/icon/KickIcon.java            |   4 +-
 .../web/room/sidebar/icon/UserSpeaksIcon.java      |   2 +-
 .../room/sidebar/icon/right/AudioRightIcon.java    |   2 +-
 .../sidebar/icon/right/ModeratorRightIcon.java     |   2 +-
 .../sidebar/icon/right/MuteOthersRightIcon.java    |   4 +-
 .../sidebar/icon/right/PresenterRightIcon.java     |   4 +-
 .../sidebar/icon/right/RemoteControlRightIcon.java |   2 +-
 .../web/room/sidebar/icon/right/RoomRightIcon.java |   6 +-
 .../sidebar/icon/right/ScreenShareRightIcon.java   |   2 +-
 .../room/sidebar/icon/right/VideoRightIcon.java    |   2 +-
 .../sidebar/icon/right/WhiteboardRightIcon.java    |   6 +-
 .../openmeetings/web/room/wb/AbstractWbPanel.java  |   2 +-
 .../openmeetings/web/room/wb/InterviewWbPanel.java |   2 +-
 .../apache/openmeetings/web/room/wb/WbPanel.html   | 265 +++++----
 .../apache/openmeetings/web/room/wb/WbPanel.java   |  90 ++--
 .../web/room/wb/WbWebSocketHelper.java             |  12 +-
 .../openmeetings/web/room/wb/raw-wb-area-base.js   |   4 +-
 .../apache/openmeetings/web/room/wb/raw-wb-area.js | 151 +++---
 .../openmeetings/web/room/wb/raw-wb-board.js       | 310 +++++------
 .../apache/openmeetings/web/user/AboutDialog.html  |  38 +-
 .../apache/openmeetings/web/user/AboutDialog.java  |  33 +-
 .../web/user/InviteUserMessageDialog.html          |   6 +-
 .../web/user/InviteUserMessageDialog.java          |  66 +--
 .../web/user/InviteUserToRoomDialog.html           |   6 +-
 .../web/user/InviteUserToRoomDialog.java           |  32 +-
 .../openmeetings/web/user/MessageDialog.html       |  19 +-
 .../openmeetings/web/user/MessageDialog.java       | 241 ++++-----
 .../openmeetings/web/user/OmWysiwygToolbar.html    |  86 +++
 .../openmeetings/web/user/OmWysiwygToolbar.java    |  13 +-
 .../openmeetings/web/user/UserInfoDialog.html      |   4 +-
 .../openmeetings/web/user/UserInfoDialog.java      |  72 ++-
 .../web/user/calendar/AppointmentDialog.html       |  89 ++-
 .../web/user/calendar/AppointmentDialog.java       | 379 ++++++-------
 .../web/user/calendar/CalendarDialog.html          |  47 +-
 .../web/user/calendar/CalendarDialog.java          | 229 +++-----
 .../user/calendar/CalendarFunctionsBehavior.java   |  58 --
 .../web/user/calendar/CalendarPanel.html           |  10 +-
 .../web/user/calendar/CalendarPanel.java           |  52 +-
 .../web/user/calendar/calendar-functions.js        |  72 ++-
 .../apache/openmeetings/web/user/chat/Chat.html    |  39 +-
 .../apache/openmeetings/web/user/chat/Chat.java    |   7 +-
 .../openmeetings/web/user/chat/ChatForm.java       |  31 +-
 .../openmeetings/web/user/chat/ChatPanel.html      |   6 +-
 .../openmeetings/web/user/chat/ChatPanel.java      |  13 +-
 .../openmeetings/web/user/chat/ChatToolbar.html    |  73 ++-
 .../openmeetings/web/user/chat/ChatToolbar.java    |   8 +-
 .../apache/openmeetings/web/user/chat/raw-chat.js  | 117 ++--
 .../web/user/dashboard/RssWidgetView.html          |  10 +
 .../web/user/dashboard/StartWidgetView.html        |   4 +-
 .../web/user/dashboard/StartWidgetView.java        |   8 +-
 .../dashboard/admin/AdminCleanupInfoDialog.html    |  40 +-
 .../dashboard/admin/AdminCleanupInfoDialog.java    |  66 ++-
 .../web/user/dashboard/admin/AdminWidgetView.html  |   2 +-
 .../web/user/dashboard/admin/AdminWidgetView.java  |  20 +-
 .../apache/openmeetings/web/user/dashboard/rss.js  |  16 +-
 .../web/user/profile/ChangePasswordDialog.html     |   4 +-
 .../web/user/profile/ChangePasswordDialog.java     |  74 +--
 .../web/user/profile/EditProfileForm.html          |  57 +-
 .../web/user/profile/EditProfileForm.java          |  16 +-
 .../web/user/profile/EditProfilePanel.html         |   2 +-
 .../web/user/profile/InvitationDetails.java        |  29 +-
 .../web/user/profile/InvitationsPanel.html         |  14 +-
 .../web/user/profile/InvitationsPanel.java         |  10 +-
 .../web/user/profile/MessagesContactsPanel.html    | 101 ++--
 .../web/user/profile/MessagesContactsPanel.java    |  89 ++-
 .../web/user/profile/SettingsPanel.java            |  36 +-
 .../web/user/profile/UserProfilePanel.html         |  10 +-
 .../web/user/profile/UserSearchPanel.html          |  21 +-
 .../web/user/profile/UserSearchPanel.java          |   9 +-
 .../user/record/RecordingResourceReference.java    |   2 +-
 .../web/user/record/RecordingsPanel.html           |   2 +-
 .../web/user/record/RecordingsPanel.java           |   7 +-
 .../openmeetings/web/user/record/VideoInfo.html    |  20 +-
 .../openmeetings/web/user/record/VideoInfo.java    |  98 ++--
 .../openmeetings/web/user/rooms/RoomListPanel.html |  24 +-
 .../openmeetings/web/user/rooms/RoomListPanel.java |  37 +-
 .../openmeetings/web/user/rooms/RoomsPanel.html    |  16 +-
 .../web/user/rooms/RoomsSelectorPanel.html         |   2 +-
 .../web/user/rooms/RoomsSelectorPanel.java         |   2 +-
 .../web/user/rooms/RoomsTabbedPanel.html           |   7 +-
 .../web/user/rooms/RoomsTabbedPanel.java           |  34 +-
 .../openmeetings/web/util/NonClosableDialog.java   |  39 --
 .../web/util/NonClosableMessageDialog.java         |  53 --
 .../openmeetings/web/util/RoomTypeDropDown.java    |   3 +-
 .../apache/openmeetings/web/util/ThreadHelper.java |  48 ++
 .../openmeetings/web/util/UserChoiceProvider.java  |   2 +-
 .../src/main/webapp/css/raw-activities.css         |  20 +-
 openmeetings-web/src/main/webapp/css/raw-admin.css | 141 +----
 .../src/main/webapp/css/raw-calendar.css           |  34 +-
 openmeetings-web/src/main/webapp/css/raw-chat.css  |  98 ++--
 .../src/main/webapp/css/raw-general-rtl.css        |  33 +-
 .../src/main/webapp/css/raw-general.css            | 437 ++++++++-------
 openmeetings-web/src/main/webapp/css/raw-menu.css  |  60 +--
 .../src/main/webapp/css/raw-nettest.css            |  60 +--
 openmeetings-web/src/main/webapp/css/raw-room.css  | 440 +++++++--------
 openmeetings-web/src/main/webapp/css/raw-tree.css  | 131 ++---
 .../src/main/webapp/css/raw-variables.css          |   9 +-
 openmeetings-web/src/main/webapp/css/raw-wb.css    | 207 ++++---
 .../apache/openmeetings/AbstractJUnitDefaults.java |  10 +-
 .../apache/openmeetings/AbstractWicketTester.java  |  54 +-
 .../openmeetings/backup/AbstractTestImport.java    |  61 +++
 .../org/apache/openmeetings/backup/TestExport.java |  64 +++
 .../org/apache/openmeetings/backup/TestImport.java | 125 +++++
 .../openmeetings/backup/TestImportCalendar.java    |  63 +++
 .../openmeetings/backup/TestImportConfig.java      |  68 +++
 .../backup/{TestBackup.java => TestImportOld.java} |  51 +-
 .../apache/openmeetings/backup/TestImportRoom.java |  47 ++
 .../apache/openmeetings/backup/TestImportUser.java |  52 ++
 .../calendar/TestAppointmentAddAppointment.java    |   6 +-
 .../org/apache/openmeetings/cli/TestAdmin.java     |   3 +-
 .../org/apache/openmeetings/cli/TestPatcher.java   |   6 +-
 .../openmeetings/core/file/TestFileProcessor.java  |   4 +-
 .../apache/openmeetings/db/dao/TestRoomDao.java    |  12 +-
 .../apache/openmeetings/h2/PrepareSystemFiles.java |  65 ---
 .../openmeetings/invitiation/TestInvitation.java   |   6 +-
 .../org/apache/openmeetings/ldap/TestLdap.java     |   4 +-
 .../test/selenium/AbstractTestDefaults.java        | 229 --------
 .../openmeetings/test/selenium/SeleniumUtils.java  | 227 --------
 .../openmeetings/test/selenium/TestSignUp.java     | 128 -----
 .../apache/openmeetings/user/TestUserContact.java  |  30 +-
 .../apache/openmeetings/user/TestUserGroup.java    |   2 +-
 .../org/apache/openmeetings/web/TestCalendar.java  |  13 +-
 .../org/apache/openmeetings/web/TestMainAreas.java |  16 +-
 .../org/apache/openmeetings/web/TestMainMenu.java  |   7 +-
 .../web/app/TestOmAuthenticationStrategy.java      |   4 +-
 .../web/app/TestUserManagerMocked.java             |   6 +-
 .../openmeetings/web/app/TestWebSession.java       |   8 +-
 .../openmeetings/web/pages/TestHashPage.java       |  30 +-
 .../openmeetings/web/pages/auth/TestLoginUI.java   |  39 +-
 .../web/pages/install/TestInstall.java             |  35 +-
 .../webservice/AbstractWebServiceTest.java         |  48 +-
 .../webservice/TestCalendarService.java            |   4 +-
 .../openmeetings/webservice/TestFileService.java   |   4 +-
 .../openmeetings/webservice/TestRoomService.java   |  16 +-
 .../openmeetings/webservice/TestUserService.java   |   4 +-
 .../openmeetings/webservice/TestWbService.java     |   2 +-
 .../openmeetings/backup/calendar/appointements.xml |  57 ++
 .../openmeetings/backup/calendar/calendars.xml}    |  20 +-
 .../backup/calendar/meetingmembers.xml}            |  22 +-
 .../backup/calendar/skip/appointements.xml         |  90 ++++
 .../openmeetings/backup/chat/chat_messages.xml     |  52 ++
 .../backup/chat/skip/chat_messages.xml             |  58 ++
 .../openmeetings/backup/config/bool/configs.xml    |  78 +++
 .../apache/openmeetings/backup/config/configs.xml  | 550 +++++++++++++++++++
 .../openmeetings/backup/config/skip/configs.xml    |  44 ++
 .../openmeetings/backup/file/flvRecordings.xml     | 165 ++++++
 .../openmeetings/backup/group/organizations.xml    |  44 ++
 .../openmeetings/backup/ldap/ldapconfigs.xml       |  42 ++
 .../backup/msg/privateMessageFolder.xml}           |  21 +-
 .../openmeetings/backup/oauth/oauth2servers.xml    |  82 +++
 .../org/apache/openmeetings/backup/room/rooms.xml  |  70 +++
 .../backup/room/rooms_organisation.xml             |  47 ++
 .../apache/openmeetings/backup/user/skip/users.xml |  66 +++
 .../openmeetings/backup/user/userContacts.xml      |  64 +++
 .../org/apache/openmeetings/backup/user/users.xml  | 225 ++++++++
 .../openmeetings/backup/version/version.xml}       |  21 +-
 openmeetings-webservice/pom.xml                    |   1 +
 .../webservice/CalendarWebService.java             |  18 +-
 .../openmeetings/webservice/FileWebService.java    |  24 +-
 .../openmeetings/webservice/GroupWebService.java   |  26 +-
 .../webservice/RecordingWebService.java            |  10 +-
 .../openmeetings/webservice/RoomWebService.java    |  62 ++-
 .../openmeetings/webservice/UserWebService.java    |  20 +-
 .../openmeetings/webservice/WbWebService.java      |   6 +-
 .../webservice/util/AllowOriginProvider.java       |   3 +-
 pom.xml                                            | 101 +---
 src/site/site.xml                                  |   3 +-
 507 files changed, 12903 insertions(+), 10723 deletions(-)

diff --cc pom.xml
index 1517123,590f965..bc91bd3
--- a/pom.xml
+++ b/pom.xml
@@@ -91,8 -92,8 +92,8 @@@
  		<h2.version>1.4.200</h2.version>
  		<commons-lang3.version>3.9</commons-lang3.version>
  		<javax.mail.version>1.6.2</javax.mail.version>
- 		<openjpa.version>3.1.1-SNAPSHOT</openjpa.version>
- 		<asterisk-java.version>2.0.2</asterisk-java.version>
 -		<openjpa.version>3.1.1</openjpa.version>
++		<openjpa.version>3.1.2-SNAPSHOT</openjpa.version>
+ 		<asterisk-java.version>3.1.0</asterisk-java.version>
  		<commons-dbcp.version>2.7.0</commons-dbcp.version>
  		<commons-pool2.version>2.8.0</commons-pool2.version>
  		<postgresql.version>42.2.10</postgresql.version>