This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new feb4ab0 [OPENMEETINGS-2559] oracle DB seems to be fixed, code clean-up
feb4ab0 is described below
commit feb4ab0e4d3a0f8d5e8fcdbe1179b636c562fcfc
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Jan 22 13:57:24 2021 +0700
[OPENMEETINGS-2559] oracle DB seems to be fixed, code clean-up
---
CHANGELOG.md | 100 ++++++++++-----------
CONTRIBUTING.md | 2 +-
NOTICE.md | 10 +--
README.md | 4 +-
openmeetings-db/pom.xml | 5 ++
.../db/entity/basic/Configuration.java | 2 +-
.../db/entity/record/RecordingChunk.java | 4 +-
.../openmeetings/db/entity/room/Invitation.java | 2 +-
.../apache/openmeetings/backup/BackupExport.java | 6 +-
.../src/site/markdown/AsteriskIntegration.md | 2 +-
.../src/site/markdown/ExternalVideo.md | 2 +-
openmeetings-server/src/site/markdown/HTTPS.md | 2 +-
.../src/site/markdown/InstallMediaServer.md | 2 +-
.../src/site/markdown/LdapAndADS.md | 56 ++++++------
.../src/site/markdown/OracleConfig.md | 44 +++++++++
.../src/site/markdown/PortSettings.md | 2 +-
.../src/site/markdown/RestrictedAccess.md | 2 +-
openmeetings-server/src/site/xdoc/OracleConfig.xml | 61 -------------
openmeetings-server/src/site/xdoc/security.xml | 4 +-
openmeetings-web/pom.xml | 8 ++
openmeetings-web/src/main/front/main/src/index.js | 2 +-
.../apache/openmeetings/web/pages/PrivacyPage.html | 6 +-
.../apache/openmeetings/web/room/sidebar/upload.js | 2 +-
openmeetings-web/src/main/webapp/css/raw-admin.css | 2 +-
.../src/main/webapp/css/raw-cssemoticons.css | 6 +-
.../openmeetings/backup/calendar/appointements.xml | 6 +-
.../openmeetings/backup/calendar/calendars.xml | 6 +-
.../backup/calendar/meetingmembers.xml | 6 +-
.../backup/calendar/skip/appointements.xml | 6 +-
.../openmeetings/backup/chat/chat_messages.xml | 6 +-
.../backup/chat/skip/chat_messages.xml | 6 +-
.../openmeetings/backup/config/bool/configs.xml | 6 +-
.../apache/openmeetings/backup/config/configs.xml | 6 +-
.../openmeetings/backup/config/skip/configs.xml | 6 +-
.../openmeetings/backup/file/flvRecordings.xml | 6 +-
.../backup/msg/privateMessageFolder.xml | 6 +-
.../openmeetings/backup/oauth/oauth2servers.xml | 6 +-
.../org/apache/openmeetings/backup/room/rooms.xml | 6 +-
.../backup/room/rooms_organisation.xml | 6 +-
.../apache/openmeetings/backup/user/ldap/users.xml | 6 +-
.../apache/openmeetings/backup/user/skip/users.xml | 6 +-
.../openmeetings/backup/user/userContacts.xml | 6 +-
.../org/apache/openmeetings/backup/user/users.xml | 6 +-
pom.xml | 1 +
44 files changed, 222 insertions(+), 225 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc359c4..c597ae0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -184,7 +184,7 @@ Release Notes - Openmeetings - Version 5.0.0
* [OPENMEETINGS-2369] - Prioritize camera facing the user by default
* Test
- * [OPENMEETINGS-2342] - whiteboard at the moment of loading for the first
time the classroom remains the background of the modalbox
+ * [OPENMEETINGS-2342] - whiteboard at the moment of loading for the first
time the classroom remains the background of the modalbox
* [OPENMEETINGS-2351] - Does not allow to deselect the option "Include
uploaded files and recordings in the backup"
* [OPENMEETINGS-2372] - when many tabs are created the new tabs are
downloaded to a new line
@@ -428,7 +428,7 @@ Release Notes - Openmeetings - Version 5.0.0-M1
* [OPENMEETINGS-2029] - The mic at room don`t work - Firefox and Safari.
The cam works in firefox, not in Safari
* [OPENMEETINGS-2031] - "Mute others" icon is absent on video pad
* [OPENMEETINGS-2035] - When start a recording can not stop it
- * [OPENMEETINGS-2039] - When recording the video file have errors
+ * [OPENMEETINGS-2039] - When recording the video file have errors
* [OPENMEETINGS-2041] - Microphone feedback in OM 5.0
* [OPENMEETINGS-2046] - webm recording not always correctly converted to
mp4
@@ -787,7 +787,7 @@ Release Notes - OpenMeetings - Version 4.0.0
* [OPENMEETINGS-809] - Global chat issues in rooms
* [OPENMEETINGS-825] - xss in poll results and calendar
* [OPENMEETINGS-839] - user can switch himself between boards in
moderated room
- * [OPENMEETINGS-840] - Strange uploaded video behaviour
+ * [OPENMEETINGS-840] - Strange uploaded video behaviour
* [OPENMEETINGS-859] - Audio and Video in recordings is no more in sync
* [OPENMEETINGS-878] - Sign Web-Start application with trusted root cert
* [OPENMEETINGS-887] - Global chat is not implemented completly for OM 3.0
@@ -844,7 +844,7 @@ Release Notes - OpenMeetings - Version 4.0.0
* [OPENMEETINGS-986] - Oauth2.0 Logon Not Working
* [OPENMEETINGS-990] - error while playing recording
* [OPENMEETINGS-993] - Deleted rooms are now excluded from backup
- * [OPENMEETINGS-997] - error installing with mssql
+ * [OPENMEETINGS-997] - error installing with mssql
* [OPENMEETINGS-998] - Audio and Video of recordings are not in sync after
a few minutes
* [OPENMEETINGS-1002] - OM theming should be consistent
* [OPENMEETINGS-1004] - Internal error is thrown when you search a user on
the Search Users Tab
@@ -865,7 +865,7 @@ Release Notes - OpenMeetings - Version 4.0.0
* [OPENMEETINGS-1048] - Appointement owner has no moderation rights
* [OPENMEETINGS-1052] - Room list not displayed after room exit
* [OPENMEETINGS-1055] - Error is thrown and connection is closed when
external user try to generate URL and send email invitation
- * [OPENMEETINGS-1056] - "Remove moderator role fom this user" icon is not
availble for moderator in the conference
+ * [OPENMEETINGS-1056] - "Remove moderator role fom this user" icon is not
availble for moderator in the conference
* [OPENMEETINGS-1059] - Language not loaded from user profile.
* [OPENMEETINGS-1060] - Strange view of warnings at User editing screen.
* [OPENMEETINGS-1061] - Font size list is not visible and availble in the
global chat
@@ -873,7 +873,7 @@ Release Notes - OpenMeetings - Version 4.0.0
* [OPENMEETINGS-1063] - When "Show contact data to contacts only" was
selected, contact data are not showing for users from contacts.
* [OPENMEETINGS-1079] - Synchronous backup does not work through the web
interface with a large volume of data
* [OPENMEETINGS-1083] - Impossible to add user to group, moderator to room
- * [OPENMEETINGS-1084] - cannot remove auto created user by invite for
conference room
+ * [OPENMEETINGS-1084] - cannot remove auto created user by invite for
conference room
* [OPENMEETINGS-1087] - X-UA-Compatible should be set as first META tag
* [OPENMEETINGS-1088] - error installing with mssql
* [OPENMEETINGS-1089] - Spanish installation screens contains bad UTF-8
chars
@@ -933,7 +933,7 @@ Release Notes - OpenMeetings - Version 4.0.0
* [OPENMEETINGS-1260] - Period invitation created from room is shifted one
month
* [OPENMEETINGS-1263] - component.getString() should not be called from
constructor
* [OPENMEETINGS-1264] - "Old style" confirm dialogs should be replaced
with jquery-ui confirmations
- * [OPENMEETINGS-1265] - Internal error Return to home page
+ * [OPENMEETINGS-1265] - Internal error Return to home page
* [OPENMEETINGS-1266] - Width/height parameters are missing in RecordingDTO
* [OPENMEETINGS-1269] - 'Internal Error' Message on Deleting / Selecting a
User in Admin/User Panel
* [OPENMEETINGS-1272] - Exception and Internal Errror When "To complete
your registration please click on the following link"
@@ -942,21 +942,21 @@ Release Notes - OpenMeetings - Version 4.0.0
* [OPENMEETINGS-1287] - Mail templates are excluded from the build artefact
* [OPENMEETINGS-1288] - Search User page is broken
* [OPENMEETINGS-1292] - OM 3.1 When clic on Upload file picture button
profile, nothings happens
- * [OPENMEETINGS-1295] - OM 3.0.7 - No upload image for widget user
+ * [OPENMEETINGS-1295] - OM 3.0.7 - No upload image for widget user
* [OPENMEETINGS-1296] - Unable to upload image to profile
* [OPENMEETINGS-1297] - svn tree need to be restructured
* [OPENMEETINGS-1299] - In Application_zh_CN.properties file, from entry
1465 to entry 1600, we should have Chinese entries, but there are still English
entries.
* [OPENMEETINGS-1303] - Report a bug URL
* [OPENMEETINGS-1308] - "File tree" is broken in room after installation
* [OPENMEETINGS-1309] - Issue with playing the recordings in OM 3.1.0
- * [OPENMEETINGS-1314] - A no user receive an invitation and he tries to
send an invitation
+ * [OPENMEETINGS-1314] - A no user receive an invitation and he tries to
send an invitation
* [OPENMEETINGS-1316] - Older timezone's in OM
* [OPENMEETINGS-1323] - Error is thrown to the log file during conversion
recording
* [OPENMEETINGS-1327] - Messages are being displayed in the folder right
after creation
* [OPENMEETINGS-1328] - ConfirmAjaxCallListener should be changed on
standard wicket dialog in the MessagesContactsPanel
* [OPENMEETINGS-1329] - "null" adds to the Subject when user send private
masage to contact
* [OPENMEETINGS-1330] - Contact being deleted from contact list without
confirmation dialog
- * [OPENMEETINGS-1333] - Recording and sharing is not started when contact
try to start recording or sharing
+ * [OPENMEETINGS-1333] - Recording and sharing is not started when contact
try to start recording or sharing
* [OPENMEETINGS-1334] - It's impossible to invite om user to the my rooms
* [OPENMEETINGS-1335] - Screen sharing icons and favicon need to be updated
* [OPENMEETINGS-1336] - User can not enter to group room
@@ -1005,7 +1005,7 @@ Release Notes - OpenMeetings - Version 4.0.0
* [OPENMEETINGS-1461] - We need to switch to java8
* [OPENMEETINGS-1465] - Password field is enabled when Password protected
is not checked
* [OPENMEETINGS-1466] - REST/SOAP methods are incomplete
- * [OPENMEETINGS-1468] - problems with keyborad usage while screensharing
with remote desktop
+ * [OPENMEETINGS-1468] - problems with keyborad usage while screensharing
with remote desktop
* [OPENMEETINGS-1470] - WB video is not displayed
* [OPENMEETINGS-1472] - User cannot be deleted
* [OPENMEETINGS-1476] - Deleted records are shown under trash
@@ -1032,7 +1032,7 @@ Release Notes - OpenMeetings - Version 4.0.0
* [OPENMEETINGS-1518] - Recorgings should not be converted to ogg/avi
format
* [OPENMEETINGS-1521] - 'null' is shown instead of usergroup when user
update and save User details
* [OPENMEETINGS-1524] - Poll description is missed in the Poll results
- * [OPENMEETINGS-1525] - Openmeetings 3.1.3 - Problem with script
red5-highperf.sh
+ * [OPENMEETINGS-1525] - Openmeetings 3.1.3 - Problem with script
red5-highperf.sh
* [OPENMEETINGS-1532] - Recording folders not always imported as expected
* [OPENMEETINGS-1533] - Impossible to create Appointment using calendar
WebService
* [OPENMEETINGS-1534] - Video upload to room is broken
@@ -1060,7 +1060,7 @@ Release Notes - OpenMeetings - Version 4.0.0
* [OPENMEETINGS-1578] - Invitation URL is incorerct
* [OPENMEETINGS-1579] - Room polls are not work as expected
* [OPENMEETINGS-1581] - Permission on video & audio on public rooms
- * [OPENMEETINGS-1586] - Administrator no access to the room
+ * [OPENMEETINGS-1586] - Administrator no access to the room
* [OPENMEETINGS-1590] - Video frame of mobile user are resized when mobile
user switch off video
* [OPENMEETINGS-1591] - Chat messages are not sorted correctly when user
send message in the room
* [OPENMEETINGS-1592] - Avatar is not shown when mobile client sends chat
message in the room
@@ -1072,7 +1072,7 @@ Release Notes - OpenMeetings - Version 4.0.0
* [OPENMEETINGS-1600] - The "Clear whiteboard" flag does not work when
user upload file directly to whiteboard
* [OPENMEETINGS-1601] - Drop recording to WB doesn't work as expected
* [OPENMEETINGS-1603] - The "Internal error" is thrown when user select
custom folder in the room
- * [OPENMEETINGS-1610] - "'timepicker' is not a valid LocalTime
+ * [OPENMEETINGS-1610] - "'timepicker' is not a valid LocalTime
* [OPENMEETINGS-1611] - JS errors in OM Admin
* [OPENMEETINGS-1616] - New chat messages should be added to the bottom
* [OPENMEETINGS-1619] - User details panel is cut off when admin click on
add new user button
@@ -1114,7 +1114,7 @@ Release Notes - OpenMeetings - Version 4.0.0
* [OPENMEETINGS-1703] - OM Loooong load
* [OPENMEETINGS-1705] - Error on Rest api
/openmeetings/services//calendar/title/{title}
* [OPENMEETINGS-1706] - Remote control is not implemented
- * [OPENMEETINGS-1710] - Recording is loaded on the whiteboard for too long
time
+ * [OPENMEETINGS-1710] - Recording is loaded on the whiteboard for too long
time
* [OPENMEETINGS-1711] - Internal Error is shown when click on " Contacts
and messages" link
* [OPENMEETINGS-1712] - There is no logout or exit option if come in to
room directly by API call
* [OPENMEETINGS-1713] - References to outdated config.xml should be removed
@@ -1150,9 +1150,9 @@ Release Notes - OpenMeetings - Version 4.0.0
* [OPENMEETINGS-623] - OpenMeetings怎么修改发送邮件的格式
* [OPENMEETINGS-649] - Add email management functions to Om Admin
* [OPENMEETINGS-662] - Code contribution - mathematical whiteboard
- * [OPENMEETINGS-690] - possibility for user to signal a question
+ * [OPENMEETINGS-690] - possibility for user to signal a question
* [OPENMEETINGS-794] - Add a possibility to enter brief name for users
with same invitation url (grouped mail)
- * [OPENMEETINGS-800] - New Whiteboard should provide user rights
controlling
+ * [OPENMEETINGS-800] - New Whiteboard should provide user rights
controlling
* [OPENMEETINGS-846] - Invitation of a complete usergroup as a one-click
operation
* [OPENMEETINGS-894] - Red5 should be updated to the latest stable version
* [OPENMEETINGS-938] - Recording length field should be filled by
converters
@@ -1187,7 +1187,7 @@ Release Notes - OpenMeetings - Version 4.0.0
* [OPENMEETINGS-1313] - Support for Google Analytics scripts should be
added
* [OPENMEETINGS-1356] - Build should be speed up by reducing forking
* [OPENMEETINGS-1357] - maven-dependency-plugin should be used to
download/unpack OpenLaszlo
- * [OPENMEETINGS-1382] - Update default avatar of user
+ * [OPENMEETINGS-1382] - Update default avatar of user
* [OPENMEETINGS-1383] - Updated French translation for OpenMeetings
3.1.1/3.1.1+
* [OPENMEETINGS-1403] - External cameras should be supported
* [OPENMEETINGS-1405] - Appointment dialog should be simplified
@@ -1195,14 +1195,14 @@ Release Notes - OpenMeetings - Version 4.0.0
* [OPENMEETINGS-1420] - Select a whole group of users as attendees in event
* [OPENMEETINGS-1424] - Add a "recent rooms" functionality
* [OPENMEETINGS-1445] - 3.1.2 Build Compilation Warnings
- * [OPENMEETINGS-1462] - Implementation for a delete button for the chat
content on the principal chat window
+ * [OPENMEETINGS-1462] - Implementation for a delete button for the chat
content on the principal chat window
* [OPENMEETINGS-1480] - Ukrainian translation need to be improved
* [OPENMEETINGS-1488] - Additional functionality for groups
* [OPENMEETINGS-1490] - Jodconverter should be added to openmeetings
project
* [OPENMEETINGS-1507] - Remove "application.base.url" configuration key
* [OPENMEETINGS-1512] - Wrong LDAP value can cause error on My Profile Page
* [OPENMEETINGS-1527] - Multiselect using Shift/Ctrl need to be added to
file tree
- * [OPENMEETINGS-1551] - Add prohibition of time format сombination as
15:00 PM when creating event
+ * [OPENMEETINGS-1551] - Add prohibition of time format сombination as
15:00 PM when creating event
* [OPENMEETINGS-1554] - Please add the feature to upload your video files
to the server, in the recording section
* [OPENMEETINGS-1558] - Room public drive should be accessible to all
users in read-only mode
* [OPENMEETINGS-1580] - Enable multiple uploads at once to file tree and
whiteboard.
@@ -1378,7 +1378,7 @@ Release Notes - OpenMeetings - Version 3.2.1
* [OPENMEETINGS-1579] - Room polls are not work as expected
* [OPENMEETINGS-1581] - Permission on video & audio on public rooms
* [OPENMEETINGS-1585] - Camera resolution is not saved when you click Save.
- * [OPENMEETINGS-1586] - Administrator no access to the room
+ * [OPENMEETINGS-1586] - Administrator no access to the room
* [OPENMEETINGS-1590] - Video frame of mobile user are resized when mobile
user switch off video
* [OPENMEETINGS-1591] - Chat messages are not sorted correctly when user
send message in the room
* [OPENMEETINGS-1592] - Avatar is not shown when mobile client sends chat
message in the room
@@ -1393,13 +1393,13 @@ Release Notes - OpenMeetings - Version 3.2.1
* Improvement
* [OPENMEETINGS-372] - Please make the ability to “clear the Chat window”
only available to Moderators, and not to participants who have “Draw on the
Whiteboard” rights
- * [OPENMEETINGS-690] - possibility for user to signal a question
+ * [OPENMEETINGS-690] - possibility for user to signal a question
* [OPENMEETINGS-1209] - typing indicator
* [OPENMEETINGS-1210] - chat jumps down, if it was scrolled up before
* [OPENMEETINGS-1301] - No Accessability for Conference Room
* [OPENMEETINGS-1420] - Select a whole group of users as attendees in event
* [OPENMEETINGS-1424] - Add a "recent rooms" functionality
- * [OPENMEETINGS-1551] - Add prohibition of time format сombination as
15:00 PM when creating event
+ * [OPENMEETINGS-1551] - Add prohibition of time format сombination as
15:00 PM when creating event
* [OPENMEETINGS-1558] - Room public drive should be accessible to all
users in read-only mode
* [OPENMEETINGS-1571] - 3.2.1 - Library versions should be updated
* [OPENMEETINGS-1580] - Enable multiple uploads at once to file tree and
whiteboard.
@@ -1430,7 +1430,7 @@ Release Notes - OpenMeetings - Version 3.2.0
* [OPENMEETINGS-508] - Network testing page is not localized
* [OPENMEETINGS-653] - playing video follow the scrolling of the screen
and leave its player.
* [OPENMEETINGS-827] - Video play/stop event acceptable one time in all tab
- * [OPENMEETINGS-840] - Strange uploaded video behaviour
+ * [OPENMEETINGS-840] - Strange uploaded video behaviour
* [OPENMEETINGS-863] - Video Problem
* [OPENMEETINGS-1327] - Messages are being displayed in the folder right
after creation
* [OPENMEETINGS-1358] - RTMPS SSHHandshakeFailed error in 3.0.7 and
working fine with 3.0.4
@@ -1470,7 +1470,7 @@ Release Notes - OpenMeetings - Version 3.2.0
* [OPENMEETINGS-1464] - Clear objects on current slide only is not working
* [OPENMEETINGS-1465] - Password field is enabled when Password protected
is not checked
* [OPENMEETINGS-1466] - REST/SOAP methods are incomplete
- * [OPENMEETINGS-1468] - problems with keyborad usage while screensharing
with remote desktop
+ * [OPENMEETINGS-1468] - problems with keyborad usage while screensharing
with remote desktop
* [OPENMEETINGS-1470] - WB video is not displayed
* [OPENMEETINGS-1472] - User cannot be deleted
* [OPENMEETINGS-1476] - Deleted records are shown under trash
@@ -1499,7 +1499,7 @@ Release Notes - OpenMeetings - Version 3.2.0
* [OPENMEETINGS-1518] - Recorgings should not be converted to ogg/avi
format
* [OPENMEETINGS-1521] - 'null' is shown instead of usergroup when user
update and save User details
* [OPENMEETINGS-1524] - Poll description is missed in the Poll results
- * [OPENMEETINGS-1525] - Openmeetings 3.1.3 - Problem with script
red5-highperf.sh
+ * [OPENMEETINGS-1525] - Openmeetings 3.1.3 - Problem with script
red5-highperf.sh
* [OPENMEETINGS-1532] - Recording folders not always imported as expected
* [OPENMEETINGS-1533] - Impossible to create Appointment using calendar
WebService
* [OPENMEETINGS-1534] - Video upload to room is broken
@@ -1520,7 +1520,7 @@ Release Notes - OpenMeetings - Version 3.2.0
* [OPENMEETINGS-1138] - In the general interface, provide a way to access
links to recordings, which can be shared with others (both registered users and
external people).
* [OPENMEETINGS-1366] - Recommendations
* [OPENMEETINGS-1373] - 3.2.0 Library versions should be updated
- * [OPENMEETINGS-1382] - Update default avatar of user
+ * [OPENMEETINGS-1382] - Update default avatar of user
* [OPENMEETINGS-1383] - Updated French translation for OpenMeetings
3.1.1/3.1.1+
* [OPENMEETINGS-1393] - Missing text strings are not internationalized for
translation
* [OPENMEETINGS-1403] - External cameras should be supported
@@ -1528,7 +1528,7 @@ Release Notes - OpenMeetings - Version 3.2.0
* [OPENMEETINGS-1419] - Connect to Oracle DB with Service Name through Web
Installer
* [OPENMEETINGS-1445] - 3.1.2 Build Compilation Warnings
* [OPENMEETINGS-1446] - SSL installation not fully working
- * [OPENMEETINGS-1462] - Implementation for a delete button for the chat
content on the principal chat window
+ * [OPENMEETINGS-1462] - Implementation for a delete button for the chat
content on the principal chat window
* [OPENMEETINGS-1480] - Ukrainian translation need to be improved
* [OPENMEETINGS-1488] - Additional functionality for groups
* [OPENMEETINGS-1490] - Jodconverter should be added to openmeetings
project
@@ -1606,11 +1606,11 @@ Release Notes - OpenMeetings - Version 3.1.4
* [OPENMEETINGS-1521] - 'null' is shown instead of usergroup when user
update and save User details
* [OPENMEETINGS-1523] - Inplace folder rename is not working
* [OPENMEETINGS-1524] - Poll description is missed in the Poll results
- * [OPENMEETINGS-1525] - Openmeetings 3.1.3 - Problem with script
red5-highperf.sh
+ * [OPENMEETINGS-1525] - Openmeetings 3.1.3 - Problem with script
red5-highperf.sh
* Improvement
* [OPENMEETINGS-1366] - Recommendations
- * [OPENMEETINGS-1462] - Implementation for a delete button for the chat
content on the principal chat window
+ * [OPENMEETINGS-1462] - Implementation for a delete button for the chat
content on the principal chat window
* [OPENMEETINGS-1467] - 3.1.4 Library versions should be updated
* [OPENMEETINGS-1480] - Ukrainian translation need to be improved
* [OPENMEETINGS-1488] - Additional functionality for groups
@@ -1643,7 +1643,7 @@ Release Notes - OpenMeetings - Version 3.1.3
* [OPENMEETINGS-1464] - Clear objects on current slide only is not working
* [OPENMEETINGS-1465] - Password field is enabled when Password protected
is not checked
* [OPENMEETINGS-1466] - REST/SOAP methods are incomplete
- * [OPENMEETINGS-1468] - problems with keyborad usage while screensharing
with remote desktop
+ * [OPENMEETINGS-1468] - problems with keyborad usage while screensharing
with remote desktop
* [OPENMEETINGS-1470] - WB video is not displayed
* [OPENMEETINGS-1472] - User cannot be deleted
* [OPENMEETINGS-1473] - JPG file display in the room is broken
@@ -1792,7 +1792,7 @@ Release Notes - OpenMeetings - Version 3.1.0
* [OPENMEETINGS-1288] - Search User page is broken
* [OPENMEETINGS-1292] - OM 3.1 When clic on Upload file picture button
profile, nothings happens
* [OPENMEETINGS-1293] - OM 3.1 When clic on Conference Room button, show
turning circle and nothing happens
- * [OPENMEETINGS-1295] - OM 3.0.7 - No upload image for widget user
+ * [OPENMEETINGS-1295] - OM 3.0.7 - No upload image for widget user
* [OPENMEETINGS-1296] - Unable to upload image to profile
* [OPENMEETINGS-1297] - svn tree need to be restructured
* [OPENMEETINGS-1299] - In Application_zh_CN.properties file, from entry
1465 to entry 1600, we should have Chinese entries, but there are still English
entries.
@@ -1801,7 +1801,7 @@ Release Notes - OpenMeetings - Version 3.1.0
* [OPENMEETINGS-1309] - Issue with playing the recordings in OM 3.1.0
* [OPENMEETINGS-1310] - Flash permission dialog is not displayed
* [OPENMEETINGS-1312] - "User recording" message is not removed on
recording stop
- * [OPENMEETINGS-1314] - A no user receive an invitation and he tries to
send an invitation
+ * [OPENMEETINGS-1314] - A no user receive an invitation and he tries to
send an invitation
* [OPENMEETINGS-1316] - Older timezone's in OM
* [OPENMEETINGS-1317] - Whiteboard is not displayed for guests in the
restricted moderated rooms
* [OPENMEETINGS-1318] - Firstname and lastname are shown in the userlist
when last user exit from the restricted room
@@ -1813,7 +1813,7 @@ Release Notes - OpenMeetings - Version 3.1.0
* [OPENMEETINGS-1329] - "null" adds to the Subject when user send private
masage to contact
* [OPENMEETINGS-1331] - Openmeeting is not responsed when moderator kick
user from the room
* [OPENMEETINGS-1332] - Vote is not work correctly
- * [OPENMEETINGS-1333] - Recording and sharing is not started when contact
try to start recording or sharing
+ * [OPENMEETINGS-1333] - Recording and sharing is not started when contact
try to start recording or sharing
* [OPENMEETINGS-1334] - It's impossible to invite om user to the my rooms
* [OPENMEETINGS-1335] - Screen sharing icons and favicon need to be updated
* [OPENMEETINGS-1336] - User can not enter to group room
@@ -1865,7 +1865,7 @@ Release Notes - OpenMeetings - Version 3.0.7
* Improvement
* [OPENMEETINGS-954] - Need implement OM client for Android devices.
- * [OPENMEETINGS-1100] - Seperate video/audio permissions capability
+ * [OPENMEETINGS-1100] - Seperate video/audio permissions capability
* [OPENMEETINGS-1101] - Live presenter activity (typing , drawing)
* [OPENMEETINGS-1212] - Library versions should be updated (3.0.7)
@@ -1925,7 +1925,7 @@ Release Notes - OpenMeetings - Version 3.0.4
* [OPENMEETINGS-1079] - Synchronous backup does not work through the web
interface with a large volume of data
* [OPENMEETINGS-1080] - Connection with the server is canceled after
recordings
* [OPENMEETINGS-1083] - Impossible to add user to group, moderator to room
- * [OPENMEETINGS-1084] - cannot remove auto created user by invite for
conference room
+ * [OPENMEETINGS-1084] - cannot remove auto created user by invite for
conference room
* [OPENMEETINGS-1087] - X-UA-Compatible should be set as first META tag
* [OPENMEETINGS-1088] - error installing with mssql
* [OPENMEETINGS-1089] - Spanish installation screens contains bad UTF-8
chars
@@ -2030,7 +2030,7 @@ Release Notes - OpenMeetings - Version 3.0.3
* [OPENMEETINGS-1037] - LDAP passwords are being printed to the log
* [OPENMEETINGS-1038] - PrivateRoom Widget is displayed when
dashboard.show.myrooms key is disabled
* [OPENMEETINGS-1039] - Interview recording is broken if stop-on-close
- * [OPENMEETINGS-1042] - .ppt file not open when i upload
+ * [OPENMEETINGS-1042] - .ppt file not open when i upload
* [OPENMEETINGS-1048] - Appointement owner has no moderation rights
* [OPENMEETINGS-1050] - User list is missing room users
* [OPENMEETINGS-1052] - Room list not displayed after room exit
@@ -2086,7 +2086,7 @@ Release Notes - OpenMeetings - Version 3.0.2
* [OPENMEETINGS-993] - Deleted rooms are now excluded from backup
* [OPENMEETINGS-994] - AllowRecording option lock normal user interaction
in conference Room.
* [OPENMEETINGS-996] - send invitation - generate URL
- * [OPENMEETINGS-997] - error installing with mssql
+ * [OPENMEETINGS-997] - error installing with mssql
* [OPENMEETINGS-1002] - OM theming should be consistent
* [OPENMEETINGS-1004] - Internal error is thrown when you search a user on
the Search Users Tab
@@ -2141,11 +2141,11 @@ Release Notes - OpenMeetings - Version 3.0.0
* [OPENMEETINGS-754] - Fix user admin UI to have timezone as string
* [OPENMEETINGS-755] - Fix invitation popup in Flash to not use the
OmTimeZones for creating the Invitation
* [OPENMEETINGS-758] - Remove OpenLaszlo Admin UI and all related API
calls (only if they are not needed somewhere else)
- * [OPENMEETINGS-759] - Remove Flash UI user settings and related API calls
+ * [OPENMEETINGS-759] - Remove Flash UI user settings and related API calls
* [OPENMEETINGS-762] - Callers of TimezoneUtil.getTimezoneByInternalJName
should be checked to work as expected
* Bug
- * [OPENMEETINGS-69] - Conference Room - Chat RTL dosn't function
+ * [OPENMEETINGS-69] - Conference Room - Chat RTL dosn't function
* [OPENMEETINGS-243] - "Updated" field in Administration -> LDAP panel
contains "null" for string for empty value.
* [OPENMEETINGS-274] - It is impossible to display "test setup recording"
once hidden
* [OPENMEETINGS-321] - Recording under OSX throws exception in
RecordingConverter
@@ -2170,7 +2170,7 @@ Release Notes - OpenMeetings - Version 3.0.0
* [OPENMEETINGS-486] - Sometimes OM stops responding to clicks
* [OPENMEETINGS-494] - Recording gives frame rate of 2 fps
* [OPENMEETINGS-503] - Openmeetings does not logout on the Recording panel
- * [OPENMEETINGS-507] - Error message is shown when user save the Profile
settings
+ * [OPENMEETINGS-507] - Error message is shown when user save the Profile
settings
* [OPENMEETINGS-513] - Participant of poll can vote more than once in the
"My conference room"
* [OPENMEETINGS-514] - Some extra links are displayed on the "Choose
Usergroup" dialog
* [OPENMEETINGS-537] - Pop menu in conference for files shows "Delete
folder"
@@ -2191,11 +2191,11 @@ Release Notes - OpenMeetings - Version 3.0.0
* [OPENMEETINGS-596] - ffmpeg is not work in current version
* [OPENMEETINGS-600] - RSS Feed
* [OPENMEETINGS-601] - User Profile picture
- * [OPENMEETINGS-603] - Conference Room Types List doesn't display textual
content - Book Conference Room Option Selected while Sending an Email
+ * [OPENMEETINGS-603] - Conference Room Types List doesn't display textual
content - Book Conference Room Option Selected while Sending an Email
* [OPENMEETINGS-609] - The end time shown under the Book Conference Room
option in New Message is Incorrect
* [OPENMEETINGS-617] - Impossible to refresh video using button "(Re)
Start audio/video or change device settings"
* [OPENMEETINGS-618] - Incorrect translation
- * [OPENMEETINGS-619] - Problems with a microphone
+ * [OPENMEETINGS-619] - Problems with a microphone
* [OPENMEETINGS-620] - Self-Register, Forgot password and login by LDAP
should be implemented
* [OPENMEETINGS-625] - Profile Pictures not working on LDAP Accounts
* [OPENMEETINGS-627] - Private rooms disappear after use
@@ -2259,7 +2259,7 @@ Release Notes - OpenMeetings - Version 3.0.0
* [OPENMEETINGS-738] - Wrong successful registration message behavior
* [OPENMEETINGS-741] - Failed to change password
* [OPENMEETINGS-742] - Calendar UI - week and day view pretty useless when
you can't select any day
- * [OPENMEETINGS-743] - HTML Version Forgotten your password email link
does not work
+ * [OPENMEETINGS-743] - HTML Version Forgotten your password email link
does not work
* [OPENMEETINGS-744] - Private message does not send in the HTML version
* [OPENMEETINGS-756] - Remove OpenLaszlo/Flash Calendar UI and Server side
components API Calls/DTOs
* [OPENMEETINGS-757] - Several issues with external and internal meeting
members
@@ -2380,7 +2380,7 @@ Release Notes - OpenMeetings - Version 3.0.0
* [OPENMEETINGS-639] - Installer should be implemented on Wicket
* [OPENMEETINGS-646] - Emotions should be added to the chat
* [OPENMEETINGS-685] - Japanese translation update for v2.1.1 / v3.1
- * [OPENMEETINGS-692] - HTML admin should be improved to highlight record
which changes
+ * [OPENMEETINGS-692] - HTML admin should be improved to highlight record
which changes
* [OPENMEETINGS-701] - Wicket HTML templates should be stored unarchived
* [OPENMEETINGS-727] - no warning for too short login names
* [OPENMEETINGS-772] - Project tree structure should be updated
@@ -2451,7 +2451,7 @@ Release Notes - OpenMeetings - Version 2.1.1 Apache
Release
* [OPENMEETINGS-439] - An LDAP user can't change their own profile picture.
* [OPENMEETINGS-481] - When I reserve a room by sending an email, users
who connected to this link from an email have the same email address as me
* [OPENMEETINGS-503] - Openmeetings does not logout on the Recording panel
- * [OPENMEETINGS-507] - Error message is shown when user save the Profile
settings
+ * [OPENMEETINGS-507] - Error message is shown when user save the Profile
settings
* [OPENMEETINGS-537] - Pop menu in conference for files shows "Delete
folder"
* [OPENMEETINGS-586] - FileItem owner_id is not replaced with new id while
system import
* [OPENMEETINGS-587] - Exclusive audio by hotkey is broken
@@ -2548,14 +2548,14 @@ Release Notes - OpenMeetings - Version 2.1 Apache
Release
* [OPENMEETINGS-469] - Deleted meeting data remains in SIP db tables
* [OPENMEETINGS-472] - red5sip rev68 will not run
* [OPENMEETINGS-474] - Links to rooms sent via email do not work
- * [OPENMEETINGS-482] - Network check script hangs after the second "Port"
button click
+ * [OPENMEETINGS-482] - Network check script hangs after the second "Port"
button click
* [OPENMEETINGS-489] - Start recording test hangs if no webcamera connected
* [OPENMEETINGS-490] - Wrong directory for test file in "Choose device"
window
* [OPENMEETINGS-492] - Restoration of backup failed
* [OPENMEETINGS-493] - Uploading Libreoffice-format files only results in
"Deleted"
* [OPENMEETINGS-496] - It's unable to send localized SMS message.
* [OPENMEETINGS-498] - Backup fails with Exception
- * [OPENMEETINGS-502] - Some labels are hardcoded on the System backup tab
+ * [OPENMEETINGS-502] - Some labels are hardcoded on the System backup tab
* [OPENMEETINGS-504] - Some labels are not translated to russian language
* [OPENMEETINGS-505] - Values of the "Unerole User" and "Server Address"
fields are mixed on the Administrator -> Connections tab.
* [OPENMEETINGS-506] - Localized (russian) file name is not uploaded on
the Profile tab
@@ -2568,7 +2568,7 @@ Release Notes - OpenMeetings - Version 2.1 Apache Release
* [OPENMEETINGS-520] - Missing areas on the recorded video
* [OPENMEETINGS-521] - The "Show/Copy chat log" and "Delete server chat
log" buttons are not available for the Ptivate Chat
* [OPENMEETINGS-523] - download manual ghostcript download link is dead
- * [OPENMEETINGS-524] - Unenroled user is not thrown from the conference
room
+ * [OPENMEETINGS-524] - Unenroled user is not thrown from the conference
room
* [OPENMEETINGS-525] - Font styles icon is enabled for Ptivate Chat if the
"Allow font styles" is not enabled for conference room
* [OPENMEETINGS-526] - Not enough checking in the screensharing/recording
* [OPENMEETINGS-530] - Network testing tool on login page does not work
when having OM configured for HTTPS and RTMPS
@@ -2592,7 +2592,7 @@ Release Notes - OpenMeetings - Version 2.1 Apache Release
* [OPENMEETINGS-119] - New users french manual
* [OPENMEETINGS-299] - Language import should be improved to take less time
* [OPENMEETINGS-339] - File location detection should be centralized
- * [OPENMEETINGS-349] - OM should be scalable
+ * [OPENMEETINGS-349] - OM should be scalable
* [OPENMEETINGS-356] - Modify Rooms menu to have three options for each of
the room types
* [OPENMEETINGS-357] - Users should first log into "Private rooms", have
as a Admin selectable option for where users first log into
* [OPENMEETINGS-361] - It should be available to set logo in OM
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 52e8bb4..087905f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-<!--
+<!--
# Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 -->
diff --git a/NOTICE.md b/NOTICE.md
index 5483908..b64b61c 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -2,17 +2,17 @@ Apache OpenMeetings
Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
Copyright 2011- The Apache Software Foundation
-This product includes software developed at
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-This product includes icons from FamFamFam Icon Set Silk.
+This product includes icons from FamFamFam Icon Set Silk.
http://www.famfamfam.com/lab/icons/silk/
-This product includes icons from Yusuke Kamiyamane.
+This product includes icons from Yusuke Kamiyamane.
http://p.yusukekamiyamane.com/
-This product includes free icons from FatCow.
+This product includes free icons from FatCow.
http://www.fatcow.com/free-icons
-This product includes loading indicator animated with CSS from SpinKit
+This product includes loading indicator animated with CSS from SpinKit
https://github.com/tobiasahlin/SpinKit
diff --git a/README.md b/README.md
index d5d2673..7d67f67 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-[Apache OpenMeetings](https://openmeetings.apache.org) provides:
+[Apache OpenMeetings](https://openmeetings.apache.org) provides:
- [x] **video conferencing**
- [x] **instant messaging**
- [x] **white board**
@@ -51,7 +51,7 @@ Builds and CI
| Master nightly | [](https://builds.apache.org/view/M-R/view/OpenMeetings/job/openmeetings/)
|
| Master Pull Request | [](https://builds.apache.org/view/M-R/view/OpenMeetings/job/openmeetings-pr-build/)
|
-Release Notes
+Release Notes
=============
see [CHANGELOG.md](/CHANGELOG.md) file for detailed log
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index 47001fa..0bb67aa 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -104,6 +104,11 @@
<version>${mssql.version}</version>
</dependency>
<dependency>
+ <groupId>com.oracle.database.jdbc</groupId>
+ <artifactId>ojdbc10</artifactId>
+ <version>${ojdbc.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-util</artifactId>
<version>${project.version}</version>
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
index c272283..092b71d 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
@@ -81,7 +81,7 @@ public class Configuration extends HistoricalEntity {
@XmlJavaTypeAdapter(ConfigTypeAdapter.class)
private Type type = Type.STRING;
- @Column(name = "om_key", unique = true)
+ @Column(name = "om_key") // unique via index
@XmlElement(name = "key", required = false)
private String key;
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingChunk.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingChunk.java
index 566ebfd..369534f 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingChunk.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingChunk.java
@@ -90,12 +90,12 @@ public class RecordingChunk extends HistoricalEntity {
@XmlTransient
private Recording recording;
- @Column(name = "start")
+ @Column(name = "ch_start")
@XmlElement(name = "recordStart")
@XmlJavaTypeAdapter(DateAdapter.class)
private Date start;
- @Column(name = "end")
+ @Column(name = "ch_end")
@XmlElement(name = "recordEnd", required = false)
@XmlJavaTypeAdapter(DateAdapter.class)
private Date end;
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
index 9dba47f..062600c 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
@@ -97,7 +97,7 @@ public class Invitation extends HistoricalEntity {
private Recording recording;
// the hash for the link
- @Column(name = "hash", unique = true)
+ @Column(name = "hash") // unique via index
private String hash;
@ManyToOne(fetch = FetchType.EAGER, cascade = {CascadeType.MERGE,
CascadeType.PERSIST})
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
index f1cae31..a12f60b 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
@@ -110,9 +110,9 @@ public class BackupExport {
private static final Logger log =
LoggerFactory.getLogger(BackupExport.class);
private static final String BACKUP_COMMENT =
"###############################################\n"
- + "This File is auto-generated by the Backup Tool \n"
- + "you should use the BackupPanel to modify or change
this file \n"
- + "see https://openmeetings.apache.org/Upgrade.html for
Details \n"
+ + "This File is auto-generated by the Backup Tool\n"
+ + "you should use the BackupPanel to modify or change
this file\n"
+ + "see https://openmeetings.apache.org/Upgrade.html for
Details\n"
+ "###############################################\n";
@Autowired
diff --git a/openmeetings-server/src/site/markdown/AsteriskIntegration.md
b/openmeetings-server/src/site/markdown/AsteriskIntegration.md
index c6459d4..ef229c0 100644
--- a/openmeetings-server/src/site/markdown/AsteriskIntegration.md
+++ b/openmeetings-server/src/site/markdown/AsteriskIntegration.md
@@ -1,4 +1,4 @@
-<!--
+<!--
Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0
-->
diff --git a/openmeetings-server/src/site/markdown/ExternalVideo.md
b/openmeetings-server/src/site/markdown/ExternalVideo.md
index e7a04c0..4ce937f 100644
--- a/openmeetings-server/src/site/markdown/ExternalVideo.md
+++ b/openmeetings-server/src/site/markdown/ExternalVideo.md
@@ -1,4 +1,4 @@
-<!--
+<!--
Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0
-->
diff --git a/openmeetings-server/src/site/markdown/HTTPS.md
b/openmeetings-server/src/site/markdown/HTTPS.md
index 3ca5261..07d493e 100644
--- a/openmeetings-server/src/site/markdown/HTTPS.md
+++ b/openmeetings-server/src/site/markdown/HTTPS.md
@@ -1,4 +1,4 @@
-<!--
+<!--
Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0
-->
diff --git a/openmeetings-server/src/site/markdown/InstallMediaServer.md
b/openmeetings-server/src/site/markdown/InstallMediaServer.md
index 8ffc72e..3d71f4e 100644
--- a/openmeetings-server/src/site/markdown/InstallMediaServer.md
+++ b/openmeetings-server/src/site/markdown/InstallMediaServer.md
@@ -1,4 +1,4 @@
-<!--
+<!--
Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0
-->
diff --git a/openmeetings-server/src/site/markdown/LdapAndADS.md
b/openmeetings-server/src/site/markdown/LdapAndADS.md
index 2077d69..22b3aef 100644
--- a/openmeetings-server/src/site/markdown/LdapAndADS.md
+++ b/openmeetings-server/src/site/markdown/LdapAndADS.md
@@ -1,4 +1,4 @@
-<!--
+<!--
Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0
-->
@@ -49,55 +49,55 @@ To configure access to an LDAP Server, three things are
needed:
ldap_conn_host=10.8.0.10
ldap_conn_port=389
ldap_conn_secure=false
-
- # The following lines specify the data of the ldap user with
+
+ # The following lines specify the data of the ldap user with
# read privileges to the user entries according to the LDAP DB.
ldap_admin_dn=cn=openmeetings,ou=system-users,dc=mydomain,dc=org
ldap_passwd=12345
-
- # The following line specifies where to search for users wanting to login
+
+ # The following line specifies where to search for users wanting to login
ldap_search_base=ou=users,dc=mydomain,dc=org
-
- # The attribute in the LDAP DB which will be matched against the
+
+ # The attribute in the LDAP DB which will be matched against the
# given login data ("Username or mail address" field) in OpenMeetings:
ldap_search_query=(uid=%s)
-
+
# the scope of the search might be: OBJECT, ONELEVEL, SUBTREE
ldap_search_scope=ONELEVEL
-
+
# Ldap auth type(NONE, SEARCHANDBIND, SIMPLEBIND)
# When using SIMPLEBIND a simple bind is performed on the LDAP server to
check user authentication
# When using NONE, the Ldap server is not used for authentication
ldap_auth_type=SIMPLEBIND
-
+
# userDN format, will be used to bind if ldap_auth_type=SIMPLEBIND
# might be used to get provisionningDn in case ldap_auth_type=NONE
ldap_userdn_format=uid=%s,ou=users,dc=mydomain,dc=org
-
+
# Ldap provisioning type(NONE, AUTOCREATE, AUTOUPDATE)
ldap_provisioning=AUTOCREATE
-
+
# Ldap deref mode (never, searching, finding, always)
ldap_deref_mode=always
-
+
# Set this to 'true' if you want to use admin_dn to get user attributes
# If any other value is set, user_dn will be used
ldap_use_admin_to_get_attrs=true
-
+
# Ldap-password synchronization to OM DB
# Set this to 'true' if you want OM to synchronize the user Ldap-password
to OM's internal DB
# If you want to disable the feature, set this to any other string.
# Defautl value is 'true'
ldap_sync_password_to_om=true
-
+
# Ldap group mode (NONE, ATTRIBUTE, QUERY)
# NONE means group associations will be ignored
# ATTRIBUTE means group associations will be taken from 'ldap_group_attr'
attribute (M$ AD mode)
# QUERY means group associations will be taken as a result of
'ldap_group_query' query
ldap_group_mode=NONE
-
+
ldap_group_query=(&(memberUid=%s)(objectClass=posixGroup))
-
+
# Ldap user attributes mapping
# Set the following internal OM user attributes to their corresponding
Ldap-attribute
ldap_user_attr_login=uid
@@ -114,18 +114,18 @@ To configure access to an LDAP Server, three things are
needed:
# optional attribute for user picture
#ldap_user_attr_picture=
ldap_group_attr=memberOf
-
+
# optional, absolute URL will be used as user picture if
#ldap_user_attr_picture will be empty
#ldap_user_picture_uri=picture_uri
-
+
# Ldap ignore upper/lower case, convert all input to lower case
ldap_use_lower_case=false
-
+
# Ldap import query, this query should retrieve all LDAP users
ldap_import_query=(objectClass=inetOrgPerson)
-
- ```
-
+
+ ```
+
NOTE: Directory Servers are individual for every organization, and
might use different attribute names than the ones listed in the
example config. Please obtain the information about the structure
@@ -183,24 +183,24 @@ database can get imported into OpenMeetings internal
table of users
using the command line tool "admin.sh":
- First test with:
-
+
`$OM_HOME/admin.sh -l -d1 --print-only`
-
+
The argument of the `-d` ("domain-id") flag indicates the ID number
of the LDAP DB in the LDAP table on the left pane in OpenMeeting's
Administration->LDAP configuration. If only one LDAP DB is
configured there the ID most probably is 1.
-
+
`--print-only` indicates that the entries shouldn't actually get
imported, but rather printed out on the terminal.
-
+
If everything works as expected, a lot of printout should happen
on the terminal with the user entries of the LDAP DB appearing
last.
- In that case the entries can actually get imported into
OpenMeetings by omitting `--print-only`:
-
+
`$OM_HOME/admin.sh -l -d1`
After import they can be found in the OpenMeeting website at
diff --git a/openmeetings-server/src/site/markdown/OracleConfig.md
b/openmeetings-server/src/site/markdown/OracleConfig.md
new file mode 100644
index 0000000..d863613
--- /dev/null
+++ b/openmeetings-server/src/site/markdown/OracleConfig.md
@@ -0,0 +1,44 @@
+<!--
+Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0
+-->
+
+# Oracle Configuration
+
+## Steps todo
+
+There is a sample configuration for Oracle that ships with every release in:
+`${OM_HOME}/webapps/openmeetings/WEB-INF/classes/META-INF/oracle_persistence.xml`
+
+You should modify necessary parameters `Url/Username/Password`
+
+Run OpenMeetings and goto the web-based installer:
https://localhost:5443/openmeetings/install
+
+## Steps for Dockerized Oracle XE
+
+NOTE: detailed instruction are here
https://github.com/oracle/docker-images/tree/master/OracleDatabase/SingleInstance#running-oracle-database-18c-express-edition-in-a-container
+
+1. Clone this repo `https://github.com/oracle/docker-images/`
+
+2. Go to `docker-images/OracleDatabase/SingleInstance/dockerfiles`
+
+3. run `./buildContainerImage.sh -v 18.4.0 -x`
+
+ - create folder `mkdir ${HOME}/work/tmp/oradata`
+
+ - set rights `chmod -R a+w ${HOME}/work/tmp/oradata`
+
+4. run `docker run -p 1521:1521 -p 5500:5500 -e ORACLE_PWD=openmeetings_test
-v ${HOME}/work/tmp/oradata:/opt/oracle/oradata oracle/database:18.4.0-xe`
+
+5. edit
`${OM_HOME}/webapps/openmeetings/WEB-INF/classes/META-INF/oracle_persistence.xml`
set
+
+ - Url: `jdbc:oracle:thin:@//localhost:1521/XEPDB1`
+
+ - Username: `system`
+
+ - Password: `openmeetings_test`
+
+6. `cp
${OM_HOME}/webapps/openmeetings/WEB-INF/classes/META-INF/oracle_persistence.xml
${OM_HOME}/webapps/openmeetings/WEB-INF/classes/META-INF/persistence.xml`
+
+## Troubleshooting
+
+If you encounter issues, you can drop the db and then run the web based
installer again
diff --git a/openmeetings-server/src/site/markdown/PortSettings.md
b/openmeetings-server/src/site/markdown/PortSettings.md
index bd3b5d0..23b9b8a 100644
--- a/openmeetings-server/src/site/markdown/PortSettings.md
+++ b/openmeetings-server/src/site/markdown/PortSettings.md
@@ -1,4 +1,4 @@
-<!--
+<!--
Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0
-->
diff --git a/openmeetings-server/src/site/markdown/RestrictedAccess.md
b/openmeetings-server/src/site/markdown/RestrictedAccess.md
index 78da57a..e988b0b 100644
--- a/openmeetings-server/src/site/markdown/RestrictedAccess.md
+++ b/openmeetings-server/src/site/markdown/RestrictedAccess.md
@@ -1,4 +1,4 @@
-<!--
+<!--
Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0
-->
diff --git a/openmeetings-server/src/site/xdoc/OracleConfig.xml
b/openmeetings-server/src/site/xdoc/OracleConfig.xml
deleted file mode 100644
index 3183eaf..0000000
--- a/openmeetings-server/src/site/xdoc/OracleConfig.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed 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.
- -->
-<document xmlns="http://maven.apache.org/XDOC/2.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
- <properties>
- <title>Oracle Configuration</title>
- <author email="[email protected]">Apache
OpenMeetings Team</author>
- </properties>
-
- <body>
- <section name="IBM DB2 Configuration">
-
- <subsection name="Before you start">
- <ul>
- <li>Download the latest JDBC Driver
from Oracle for your database
- version. Place those JARs into
-
$OM_HOME/webapps/openmeetings/WEB-INF/lib
- </li>
- <li>If you encounter issues, you can
drop the db and then run
- the web based installer again
- </li>
- </ul>
- </subsection>
-
- <subsection name="Steps todo">
- <ul>
- <li>
- Run OpenMeetings and goto the
web-based installer:
-
https://localhost:5443/openmeetings/install
- </li>
- </ul>
- </subsection>
-
- <subsection name="Oracle Sample Configuration">
- <p>
- There is a sample configuration for
Oracle that ships with
- every release in:
- <br />
-
/webapps/openmeetings/WEB-INF/classes/META-INF/oracle_persistence.xml
- </p>
- </subsection>
-
-
- </section>
-
- </body>
-
-</document>
diff --git a/openmeetings-server/src/site/xdoc/security.xml
b/openmeetings-server/src/site/xdoc/security.xml
index 2fc406f..0501081 100644
--- a/openmeetings-server/src/site/xdoc/security.xml
+++ b/openmeetings-server/src/site/xdoc/security.xml
@@ -34,7 +34,7 @@
<p>
REFERENCES -> permalink to the announce email
in archives<br/>
Going forward, please include the <b>product
and version information</b> in the <b>description</b> itself
- as well as in the "[PRODUCT]" and "[VERSION]"
lines in your submissions.
+ as well as in the "[PRODUCT]" and "[VERSION]"
lines in your submissions.
While this may seem redundant, including the
information in both places satisfies different use cases and supports
automation.
</p>
</section>
@@ -82,7 +82,7 @@
<p>Severity: Medium</p>
<p>Vendor: The Apache Software Foundation</p>
<p>Versions Affected: Apache OpenMeetings 3.0.0 -
4.0.1</p>
- <p>Description: CRUD operations on privileged users are
not password protected allowing an authenticated attacker
+ <p>Description: CRUD operations on privileged users are
not password protected allowing an authenticated attacker
to deny service for privileged users.<br/>
<a
href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1286";>CVE-2018-1286</a>
</p>
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 89f7bb7..39d7ee3 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -59,6 +59,14 @@
</properties>
</profile>
<profile>
+ <id>oracle</id>
+ <properties>
+ <db>oracle</db>
+ <db_user>system</db_user>
+ <db_pass>openmeetings_test</db_pass>
+ </properties>
+ </profile>
+ <profile>
<id>Jenkins</id>
<build>
<plugins>
diff --git a/openmeetings-web/src/main/front/main/src/index.js
b/openmeetings-web/src/main/front/main/src/index.js
index f1cceb3..1e7e33f 100644
--- a/openmeetings-web/src/main/front/main/src/index.js
+++ b/openmeetings-web/src/main/front/main/src/index.js
@@ -8,7 +8,7 @@ Wicket.BrowserInfo.collectExtraInfo = function(info) {
Object.assign(window, {
Settings: require('./settings')
, OmUtil: require('./omutils')
- //Fix to move the close icon on top of the .ui-dialog-titlebar cause
otherwise
+ //Fix to move the close icon on top of the .ui-dialog-titlebar cause
otherwise
// touch-events are broken and you won't be able to close the dialog
, fixJQueryUIDialogTouch: function(dialog) {
dialog.parent().find('.ui-dialog-titlebar-close').appendTo(dialog.parent());
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html
index a050f53..4bd7917 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html
@@ -82,7 +82,7 @@
We do not intentionally collect information that is
<strong>stored in your profile</strong> or other free-form content inputs,
such as room files, documents, calendar events, or
messages. Such Information belongs to you, and you are responsible
for it. OpenMeetings does not access
- private information unless required to for security or
maintenance, or for support reasons, with the consent of
+ private information unless required to for security or
maintenance, or for support reasons, with the consent of
the repository owner.
</p>
<h3>How we share the information we collect</h3>
@@ -91,7 +91,7 @@
their commercial purposes.
</p>
<p>We do not disclose User Personal Information outside
OpenMeetings.</p>
- <p>We do not host advertising on OpenMeetings.</p>
+ <p>We do not host advertising on OpenMeetings.</p>
<p>
We may share User Personal Information with your
permission, so we can perform services you have requested,
for example so that other users can find you and so
that your name is listed in chats.
@@ -127,7 +127,7 @@
<p>
OpenMeetings will not, nor will we allow any third
party to, use the Google Analytics tool to track our users individually;
collect any User Personal Information other than IP
address; or correlate your IP address with your identity.
- Google provides further information about its own
privacy practices and offers a
+ Google provides further information about its own
privacy practices and offers a
<a
href="https://tools.google.com/dlpage/gaoptout";>browser add-on to opt out of
Google Analytics tracking</a>.
</p>
<p>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js
index a5b2fcc..5c40961 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js
@@ -105,7 +105,7 @@ var Upload = (function() {
fi.eventAdded = true;
}
}
-
+
return {
bindUpload: _bindUpload
};
diff --git a/openmeetings-web/src/main/webapp/css/raw-admin.css
b/openmeetings-web/src/main/webapp/css/raw-admin.css
index 867d0f1..b3918be 100644
--- a/openmeetings-web/src/main/webapp/css/raw-admin.css
+++ b/openmeetings-web/src/main/webapp/css/raw-admin.css
@@ -15,7 +15,7 @@
text-overflow: ellipsis;
max-width: 25px;
overflow: hidden;
- display: inline-block;
+ display: inline-block;
}
.adminPanelColumnTable {
display: inline-block;
diff --git a/openmeetings-web/src/main/webapp/css/raw-cssemoticons.css
b/openmeetings-web/src/main/webapp/css/raw-cssemoticons.css
index 602fedb..f693dd0 100644
--- a/openmeetings-web/src/main/webapp/css/raw-cssemoticons.css
+++ b/openmeetings-web/src/main/webapp/css/raw-cssemoticons.css
@@ -9,7 +9,7 @@
*
* Date: Sun Oct 22 1:00:00 2010 -0500
*/
-
+
/* Basic styles for emoticons */
span.css-emoticon {
font-family: "Trebuchet MS", sans-serif; /* seems to give the best and
most consistent emoticon appearance */
@@ -70,7 +70,7 @@ span.css-emoticon.pink-emoticon {
background-image: linear-gradient(to right, #ffade1, #ff8fd4);
}
/* styles for emoticons that need no rotation, like O_o */
-span.css-emoticon.no-rotate {
+span.css-emoticon.no-rotate {
transform: rotate(0deg);
box-shadow: 1px 1px 2px rgba(0,0,0,0.5);
font-size: 0.45em;
@@ -87,7 +87,7 @@ span.css-emoticon.no-rotate.pink-emoticon {
background-image: linear-gradient(#ffade1, #ff8fd4);
}
/* Styles for emoticons that need to be rotated counter-clockwise, like <3 */
-span.css-emoticon.counter-rotated {
+span.css-emoticon.counter-rotated {
transform: rotate(-90deg);
box-shadow: -1px 1px 2px rgba(0,0,0,0.5);
background-image: linear-gradient(to left, #fff4c8, #fc0);
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/appointements.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/appointements.xml
index a07e477..761b577 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/appointements.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/appointements.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<appointments>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/calendars.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/calendars.xml
index 57f570b..3531792 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/calendars.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/calendars.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<calendars>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/meetingmembers.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/meetingmembers.xml
index e5efb96..a622c2d 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/meetingmembers.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/meetingmembers.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<meetingmembers>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/skip/appointements.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/skip/appointements.xml
index 987df4a..b070e17 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/skip/appointements.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/calendar/skip/appointements.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<appointments>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/chat/chat_messages.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/chat/chat_messages.xml
index 5521dbe..5bf0a5e 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/chat/chat_messages.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/chat/chat_messages.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<chat_messages>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/chat/skip/chat_messages.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/chat/skip/chat_messages.xml
index 8f27825..fe0ff32 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/chat/skip/chat_messages.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/chat/skip/chat_messages.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<chat_messages>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/bool/configs.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/bool/configs.xml
index 5274016..5acac2f 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/bool/configs.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/bool/configs.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<configs>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/configs.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/configs.xml
index 2cffdf3..a1e5f24 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/configs.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/configs.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<configs>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/skip/configs.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/skip/configs.xml
index acc38fa..4534b62 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/skip/configs.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/config/skip/configs.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<configs>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/file/flvRecordings.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/file/flvRecordings.xml
index a2accdb..cfddc41 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/file/flvRecordings.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/file/flvRecordings.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<flvrecordings>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/msg/privateMessageFolder.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/msg/privateMessageFolder.xml
index 29054c2..cad9912 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/msg/privateMessageFolder.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/msg/privateMessageFolder.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<privatemessagefolders>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/oauth/oauth2servers.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/oauth/oauth2servers.xml
index 070d9aa..42cdaee 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/oauth/oauth2servers.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/oauth/oauth2servers.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<oauth2servers>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/room/rooms.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/room/rooms.xml
index ad9dae8..d7087cc 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/room/rooms.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/room/rooms.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<rooms>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/room/rooms_organisation.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/room/rooms_organisation.xml
index 2170f52..5867013 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/room/rooms_organisation.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/room/rooms_organisation.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<room_organisations>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/ldap/users.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/ldap/users.xml
index 39b9748..504af34 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/ldap/users.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/ldap/users.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<users>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/skip/users.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/skip/users.xml
index 9b2241f..af75cba 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/skip/users.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/skip/users.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<users>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/userContacts.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/userContacts.xml
index e2bc3e1..07a73c8 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/userContacts.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/userContacts.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<usercontacts>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/users.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/users.xml
index 3d28b60..d3b9400 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/users.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/users.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see http://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<users>
diff --git a/pom.xml b/pom.xml
index adb3c2e..2064743 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,6 +105,7 @@
<postgresql.version>42.2.18</postgresql.version>
<mysql.version>8.0.22</mysql.version>
<mssql.version>8.4.1.jre11</mssql.version>
+ <ojdbc.version>19.9.0.0</ojdbc.version>
<commons-collections4.version>4.4</commons-collections4.version>
<xstream.version>1.4.14</xstream.version>
<api-all.version>2.0.1</api-all.version>
