Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/openmeetings
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/3c020e88 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/3c020e88 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/3c020e88 Branch: refs/heads/master Commit: 3c020e88ed6e6b2eec3f4aa3a832b5e83c38a5ee Parents: c90d376 fdcce6a Author: Maxim Solodovnik <[email protected]> Authored: Tue Aug 1 10:29:12 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Aug 1 10:29:12 2017 +0700 ---------------------------------------------------------------------- .../core/data/conference/RoomManager.java | 6 +- .../remote/ISlaveHTTPConnectionManager.java | 25 -- .../openmeetings/core/remote/MobileService.java | 8 +- .../core/remote/RecordingService.java | 2 - .../core/remote/ScopeApplicationAdapter.java | 22 +- .../openmeetings/core/session/ServerUtil.java | 82 ----- .../core/session/SessionManager.java | 240 ++++----------- .../core/session/store/DatabaseStore.java | 142 --------- .../core/session/store/HashMapStore.java | 216 ------------- .../session/store/IClientPersistenceStore.java | 136 --------- .../openmeetings/core/util/IClientUtil.java | 8 +- .../openmeetings/core/util/RoomHelper.java | 4 +- .../org/apache/openmeetings/IApplication.java | 15 +- .../db/dao/basic/ConfigurationDao.java | 14 + .../openmeetings/db/dao/room/ClientDao.java | 142 --------- .../openmeetings/db/dao/room/RoomDao.java | 3 +- .../db/dao/server/ISessionManager.java | 103 ++----- .../openmeetings/db/dao/server/ServerDao.java | 222 -------------- .../db/dao/server/SessiondataDao.java | 2 +- .../openmeetings/db/dao/user/IUserManager.java | 5 +- .../db/dto/server/ClientSessionInfo.java | 50 --- .../openmeetings/db/dto/server/ServerDTO.java | 181 ----------- .../openmeetings/db/entity/basic/Client.java | 60 ++-- .../openmeetings/db/entity/basic/IClient.java | 2 + .../db/entity/room/StreamClient.java | 201 +----------- .../openmeetings/db/entity/server/Server.java | 304 ------------------- .../openmeetings/backup/BackupExport.java | 9 - .../openmeetings/backup/BackupImport.java | 18 +- .../installation/ImportInitvalues.java | 3 +- .../src/site/resources/images/cluster1.png | Bin 51076 -> 0 bytes .../src/site/xdoc/Clustering.xml | 68 +---- .../service/quartz/scheduler/CleanupJob.java | 6 +- .../openmeetings/service/user/UserManager.java | 6 +- openmeetings-web/pom.xml | 5 + .../web/admin/connection/ConnectionsPanel.java | 10 +- .../openmeetings/web/admin/rooms/RoomForm.java | 4 +- .../web/admin/servers/ServerForm.java | 140 --------- .../web/admin/servers/ServersPanel.html | 103 ------- .../web/admin/servers/ServersPanel.java | 95 ------ .../openmeetings/web/app/Application.java | 174 ++++++++--- .../openmeetings/web/room/RoomBroadcaster.java | 10 +- .../apache/openmeetings/web/room/RoomPanel.java | 23 +- .../apache/openmeetings/web/room/SwfPanel.java | 51 ++++ .../web/room/menu/RoomMenuPanel.java | 4 +- .../web/room/menu/StartSharingButton.java | 4 +- .../web/room/sidebar/RoomSidebar.java | 12 +- .../openmeetings/web/util/OmUrlFragment.java | 9 - .../classes/META-INF/db2_persistence.xml | 3 +- .../classes/META-INF/derby_persistence.xml | 2 - .../classes/META-INF/mssql_persistence.xml | 3 +- .../classes/META-INF/mysql_persistence.xml | 3 +- .../classes/META-INF/oracle_persistence.xml | 3 +- .../classes/META-INF/postgresql_persistence.xml | 3 +- .../WEB-INF/classes/applicationContext.xml | 28 +- .../main/webapp/WEB-INF/classes/cxf-servlet.xml | 3 - .../main/webapp/WEB-INF/classes/hazelcast.xml | 32 ++ .../webapp/WEB-INF/classes/logback-config.xml | 7 +- .../webapp/WEB-INF/classes/rebel-remote.xml | 6 +- .../src/main/webapp/WEB-INF/classes/rebel.xml | 6 +- .../test/session/TestDbSession.java | 179 ----------- .../test/session/TestDbSessionGetRoomIds.java | 92 ------ .../test/session/TestHashMapSession.java | 73 ----- .../openmeetings/webservice/RoomWebService.java | 4 +- .../webservice/ServerWebService.java | 171 ----------- .../openmeetings/webservice/UserWebService.java | 142 +++++---- .../webservice/cluster/RestClient.java | 196 ------------ .../cluster/SlaveHTTPConnectionManager.java | 99 ------ .../webservice/cluster/UserService.java | 158 ---------- 68 files changed, 555 insertions(+), 3607 deletions(-) ----------------------------------------------------------------------
