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 2018/10/18 03:48:07 UTC
[openmeetings] 01/01: Merge branch 'master' into new-reflow-site
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch new-reflow-site
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit e906ec07538c5a7f2f5a83e6099ec1de3d1f22be
Merge: ea9d748 c4b3d7d
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Oct 18 10:46:38 2018 +0700
Merge branch 'master' into new-reflow-site
.../openmeetings/core/converter/BaseConverter.java | 123 +++-----
.../core/converter/IRecordingConverter.java | 4 +-
.../core/converter/InterviewConverter.java | 62 ++--
.../core/converter/RecordingConverter.java | 39 ++-
.../openmeetings/core/data/file/FileProcessor.java | 4 +-
.../record/converter/InterviewConverterTask.java | 46 ---
.../record/converter/RecordingConverterTask.java | 46 ---
.../core/data/record/listener/StreamListener.java | 62 ----
.../record/listener/async/BaseStreamWriter.java | 198 ------------
.../data/record/listener/async/CachedEvent.java | 76 -----
.../record/listener/async/StreamAudioWriter.java | 211 -------------
.../record/listener/async/StreamVideoWriter.java | 82 -----
.../apache/openmeetings/core/remote/IKStream.java | 2 +-
.../org/apache/openmeetings/core/remote/KRoom.java | 142 +++++++--
.../apache/openmeetings/core/remote/KStream.java | 225 +++++++++----
.../openmeetings/core/remote/KTestStream.java | 69 ++--
.../openmeetings/core/remote/KurentoHandler.java | 220 ++++++++-----
.../openmeetings/core/remote/MobileService.java | 3 +-
.../openmeetings/core/service/MainService.java | 93 ------
.../core/service/RecordingService.java | 347 ---------------------
.../apache/openmeetings/core/util/IClientUtil.java | 59 ----
.../openmeetings/core/util/WebSocketHelper.java | 2 +-
.../db/dao/record/RecordingChunkDao.java | 105 +++++++
.../db/dao/record/RecordingMetaDataDao.java | 116 -------
.../db/dao/record/RecordingMetaDeltaDao.java | 72 -----
.../openmeetings/db/dao/server/SOAPLoginDao.java | 5 +-
.../openmeetings/db/dao/server/SessiondataDao.java | 5 +-
.../apache/openmeetings/db/dao/user/UserDao.java | 6 +-
.../openmeetings/db/dto/room/InvitationDTO.java | 5 +-
.../openmeetings/db/dto/room/Whiteboards.java | 5 +-
.../openmeetings/db/entity/basic/Client.java | 185 ++++++-----
.../openmeetings/db/entity/basic/IClient.java | 54 ----
.../openmeetings/db/entity/basic/WsClient.java | 4 +-
.../openmeetings/db/entity/record/Recording.java | 30 +-
...{RecordingMetaData.java => RecordingChunk.java} | 115 +++----
.../db/entity/record/RecordingMetaDelta.java | 242 --------------
.../openmeetings/db/manager/IClientManager.java | 3 +-
.../openmeetings/db/util/ApplicationHelper.java | 20 +-
.../openmeetings/db/util/ws/RoomMessage.java | 13 +-
.../openmeetings/db/util/ws/TextRoomMessage.java | 4 +-
.../apache/openmeetings/backup/BackupExport.java | 2 +-
.../apache/openmeetings/backup/BackupImport.java | 27 +-
.../openmeetings/backup/converter/WbConverter.java | 4 +-
.../org/apache/openmeetings/screenshare/Core.java | 4 +-
.../service/calendar/caldav/IcalUtils.java | 3 +-
.../service/room/InvitationManager.java | 4 +-
.../org/apache/openmeetings/util/OmFileHelper.java | 21 +-
.../apache/openmeetings/util/mail/IcalHandler.java | 5 +-
.../web/admin/connection/ConnectionsPanel.java | 48 +--
.../openmeetings/web/admin/rooms/RoomForm.java | 6 +-
.../openmeetings/web/admin/users/UserForm.java | 4 +-
.../apache/openmeetings/web/app/Application.java | 60 +++-
.../apache/openmeetings/web/app/ClientManager.java | 43 +--
.../apache/openmeetings/web/app/UserManager.java | 6 +-
.../openmeetings/web/common/InvitationForm.java | 4 +-
.../apache/openmeetings/web/common/MainPanel.java | 8 +-
.../web/common/tree/FileTreePanel.java | 6 +-
.../web/pages/auth/ForgetPasswordDialog.java | 4 +-
.../apache/openmeetings/web/room/RoomPanel.java | 66 +---
.../openmeetings/web/room/activities/activities.js | 2 +-
.../openmeetings/web/room/menu/RoomMenuPanel.java | 22 +-
.../org/apache/openmeetings/web/room/raw-room.js | 2 +-
.../apache/openmeetings/web/room/raw-settings.js | 14 +-
.../openmeetings/web/room/raw-video-manager.js | 70 ++---
.../apache/openmeetings/web/room/raw-video-util.js | 24 +-
.../org/apache/openmeetings/web/room/raw-video.js | 117 ++++---
.../openmeetings/web/room/sidebar/RoomSidebar.java | 2 +-
.../openmeetings/web/room/wb/InterviewWbPanel.java | 17 +-
.../apache/openmeetings/web/room/wb/WbPanel.java | 6 +-
.../openmeetings/web/room/wb/raw-tool-arrow.js | 2 +-
.../openmeetings/web/room/wb/raw-tool-clipart.js | 2 +-
.../openmeetings/web/room/wb/raw-tool-shape.js | 2 +-
.../openmeetings/web/user/record/VideoInfo.java | 23 +-
.../web/util/CallbackFunctionHelper.java | 5 +-
.../web/util/ExtendedClientProperties.java | 8 +-
.../WEB-INF/classes/META-INF/db2_persistence.xml | 3 +-
.../WEB-INF/classes/META-INF/derby_persistence.xml | 3 +-
.../WEB-INF/classes/META-INF/mssql_persistence.xml | 3 +-
.../WEB-INF/classes/META-INF/mysql_persistence.xml | 3 +-
.../classes/META-INF/oracle_persistence.xml | 3 +-
.../classes/META-INF/postgresql_persistence.xml | 3 +-
.../apache/openmeetings/AbstractJUnitDefaults.java | 14 +-
.../calendar/TestAppointmentAddAppointment.java | 4 +-
.../openmeetings/calendar/TestSendIcalMessage.java | 5 +-
.../org/apache/openmeetings/config/TestConfig.java | 4 +-
.../openmeetings/core/file/TestFileProcessor.java | 4 +-
.../apache/openmeetings/user/TestUserContact.java | 6 +-
.../apache/openmeetings/user/TestUserGroup.java | 4 +-
.../org/apache/openmeetings/web/TestCalendar.java | 4 +-
.../openmeetings/web/pages/auth/TestLoginUI.java | 8 +-
.../webservice/AbstractWebServiceTest.java | 6 +-
.../webservice/TestCalendarService.java | 12 +-
.../openmeetings/webservice/TestErrorService.java | 4 +-
.../webservice/TestRecordingService.java | 4 +-
.../openmeetings/webservice/TestRoomService.java | 6 +-
.../openmeetings/webservice/TestUserService.java | 4 +-
pom.xml | 6 +-
97 files changed, 1193 insertions(+), 2667 deletions(-)