Author: solomax
Date: Fri Nov 13 01:24:41 2015
New Revision: 1714149
URL: http://svn.apache.org/viewvc?rev=1714149&view=rev
Log:
[OPENMEETINGS-1276] all code is merged (room is still broken)
Added:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
- copied, changed from r1714102,
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java
- copied, changed from r1714051,
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
- copied, changed from r1714051,
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java
- copied, changed from r1714051,
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java
- copied, changed from r1714102,
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OrganisationConverter.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java
- copied, changed from r1714102,
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
openmeetings/branches/3.1.x/src/
openmeetings/branches/3.1.x/src/site/
openmeetings/branches/3.1.x/src/site/resources/
openmeetings/branches/3.1.x/src/site/resources/site.xml
openmeetings/branches/3.1.x/src/site/site.xml
Removed:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OrganisationConverter.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/RecordingConverterTask.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/ClientDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardSyncLockObject.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/server/ClientSessionInfo.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ApacheDerbyConfig.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/BitrixPlugin.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CalendarAndTimezone.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Clustering.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CustomRoomTypeHowTo.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Dashboard.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/DrupalPlugin.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/EditTemplates.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/FFMPEGVersionSwitch.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/GetVersionInfo.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/HotKeys.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/IBMDB2Config.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Internationalisation.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JUnitTesting.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JiraPlugin.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JoomlaPlugin.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/LanguageEditor.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/LdapAndADS.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ManualTesting.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/MoodlePlugin.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/MySQLConfig.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Navigation.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/OracleConfig.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/PortSettings.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/PostgresConfig.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RecommendedHardwareList.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RedminePlugin.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RestAPISample.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/SakaiPlugin.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Upgrade.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/WebappNamePath.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/WebcamResolutions.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/commercial-support.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/demo.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/documentation.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/downloads.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/get-involved.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/index.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/installation.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/oauth2.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/themes-and-branding.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/voip-sip-integration.xml
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/PublicRecordingTreeProvider.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserService.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java?rev=1714149&r1=1714148&r2=1714149&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
Fri Nov 13 01:24:41 2015
@@ -83,8 +83,8 @@ public abstract class BaseConverter {
return
"1".equals(configurationDao.getConfValue("use.old.style.ffmpeg.map.option",
String.class, "0"));
}
- protected File getStreamFolder(Recording flvRecording) {
- return getStreamsSubDir(flvRecording.getRoomId());
+ protected File getStreamFolder(Recording recording) {
+ return getStreamsSubDir(recording.getRoomId());
}
protected long diff(Date from, Date to) {
@@ -134,11 +134,11 @@ public abstract class BaseConverter {
return argv.toArray(new String[0]);
}
- protected void stripAudioFirstPass(Recording flvRecording,
List<ConverterProcessResult> returnLog,
+ protected void stripAudioFirstPass(Recording recording,
List<ConverterProcessResult> returnLog,
List<String> listOfFullWaveFiles, File streamFolder)
{
- stripAudioFirstPass(flvRecording, returnLog,
listOfFullWaveFiles, streamFolder
- ,
metaDataDao.getAudioMetaDataByRecording(flvRecording.getId()));
+ stripAudioFirstPass(recording, returnLog, listOfFullWaveFiles,
streamFolder
+ ,
metaDataDao.getAudioMetaDataByRecording(recording.getId()));
}
private String[] addSoxPad(List<ConverterProcessResult> returnLog,
String job, double length, double position, File inFile, File outFile) throws
IOException {
@@ -226,7 +226,7 @@ public abstract class BaseConverter {
return metaData;
}
- protected void stripAudioFirstPass(Recording flvRecording,
+ protected void stripAudioFirstPass(Recording recording,
List<ConverterProcessResult> returnLog,
List<String> listOfFullWaveFiles, File streamFolder,
List<RecordingMetaData> metaDataList) {
@@ -270,11 +270,11 @@ public abstract class BaseConverter {
File outputGapFullWav = outputWav;
// Fix Start/End in Audio
- List<RecordingMetaDelta>
flvRecordingMetaDeltas = metaDeltaDao.getByMetaId(metaId);
+ List<RecordingMetaDelta> metaDeltas =
metaDeltaDao.getByMetaId(metaId);
int counter = 0;
- for (RecordingMetaDelta metaDelta :
flvRecordingMetaDeltas) {
+ for (RecordingMetaDelta metaDelta :
metaDeltas) {
File inputFile =
outputGapFullWav;
// Strip Wave to Full Length
@@ -309,10 +309,10 @@ public abstract class BaseConverter {
File outputFullWav = new
File(streamFolder, hashFileFullName);
// Calculate delta at beginning
- double startPad =
diffSeconds(metaData.getRecordStart(), flvRecording.getRecordStart());
+ double startPad =
diffSeconds(metaData.getRecordStart(), recording.getRecordStart());
// Calculate delta at ending
- double endPad =
diffSeconds(flvRecording.getRecordEnd(), metaData.getRecordEnd());
+ double endPad =
diffSeconds(recording.getRecordEnd(), metaData.getRecordEnd());
addSoxPad(returnLog,
"addStartEndToAudio", startPad, endPad, outputGapFullWav, outputFullWav);
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1714149&r1=1714148&r2=1714149&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
Fri Nov 13 01:24:41 2015
@@ -45,9 +45,9 @@ public class FlvExplorerConverter extend
@Autowired
private FileExplorerItemDao fileExplorerItemDaoImpl;
@Autowired
- private RecordingLogDao flvRecordingLogDaoImpl;
+ private RecordingLogDao recordingLogDao;
- private class FlvDimension {
+ private static class FlvDimension {
public FlvDimension(int width, int height) {
this.width = width;
this.height = height;
@@ -115,14 +115,12 @@ public class FlvExplorerConverter extend
"-f", "rawvideo", "-s", flvWidth + "x"
+ flvHeight,
outPutJpeg.getCanonicalPath() };
-
returnLog.add(ProcessHelper.executeScript("previewUpload ID :: "
- +
fileExplorerItem.getId(),
- argv_previewFLV));
+
returnLog.add(ProcessHelper.executeScript("previewUpload ID :: " +
fileExplorerItem.getId(), argv_previewFLV));
fileExplorerItemDaoImpl.update(fileExplorerItem);
for (ConverterProcessResult returnMap : returnLog) {
- flvRecordingLogDaoImpl.add("generateFFMPEG",
null, returnMap);
+ recordingLogDao.add("generateFFMPEG", null,
returnMap);
}
} catch (Exception err) {
log.error("[convertToFLV]", err);
@@ -133,7 +131,6 @@ public class FlvExplorerConverter extend
}
private FlvDimension getFlvDimension(String txt) throws Exception {
-
Pattern p = Pattern.compile("\\d{2,4}(x)\\d{2,4}");
Matcher matcher = p.matcher(txt);
@@ -144,7 +141,6 @@ public class FlvExplorerConverter extend
String[] resultions = foundResolution.split("x");
return new
FlvDimension(Integer.valueOf(resultions[0]).intValue(),
Integer.valueOf(resultions[1]).intValue());
-
}
return null;
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java?rev=1714149&r1=1714148&r2=1714149&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
Fri Nov 13 01:24:41 2015
@@ -47,7 +47,7 @@ public class GenerateImage extends BaseC
private static final Logger log =
Red5LoggerFactory.getLogger(GenerateImage.class, webAppRootKey);
@Autowired
- private UserDao usersDao;
+ private UserDao userDao;
@Autowired
private GenerateThumbs generateThumbs;
@@ -75,11 +75,11 @@ public class GenerateImage extends BaseC
return returnMap;
}
- public ConverterProcessResultList convertImageUserProfile(File file,
Long users_id, boolean skipConvertion) throws Exception {
+ public ConverterProcessResultList convertImageUserProfile(File file,
Long userId, boolean skipConvertion) throws Exception {
ConverterProcessResultList returnMap = new
ConverterProcessResultList();
// User Profile Update
- for (File f : getUploadProfilesUserDir(users_id).listFiles(new
FileFilter() {
+ for (File f : getUploadProfilesUserDir(userId).listFiles(new
FileFilter() {
public boolean accept(File pathname) {
return
pathname.getName().endsWith(JPG_EXTENTION);
}
@@ -87,7 +87,7 @@ public class GenerateImage extends BaseC
FileHelper.removeRec(f);
}
- File destinationFile =
OmFileHelper.getNewFile(getUploadProfilesUserDir(users_id), profileFileName,
JPG_EXTENTION);
+ File destinationFile =
OmFileHelper.getNewFile(getUploadProfilesUserDir(userId), profileFileName,
JPG_EXTENTION);
if (!skipConvertion) {
returnMap.addItem("processJPG",
convertSingleJpg(file.getCanonicalPath(), destinationFile));
} else {
@@ -103,13 +103,13 @@ public class GenerateImage extends BaseC
}
String pictureuri = destinationFile.getName();
- User us = usersDao.get(users_id);
+ User us = userDao.get(userId);
us.setUpdated(new java.util.Date());
us.setPictureuri(pictureuri);
- usersDao.update(us, users_id);
+ userDao.update(us, userId);
//FIXME: After uploading a new picture all other clients should
refresh
- //scopeApplicationAdapter.updateUserSessionObject(users_id,
pictureuri);
+ //scopeApplicationAdapter.updateUserSessionObject(userId,
pictureuri);
return returnMap;
}
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java?rev=1714149&r1=1714148&r2=1714149&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
Fri Nov 13 01:24:41 2015
@@ -112,10 +112,9 @@ public class RoomManager {
return null;
}
- public List<Room> getRoomsWithCurrentUsersByListAndType(int start, int
max, String orderby, boolean asc, String externalRoomType) {
+ public List<Room> getRoomsWithCurrentUsersByListAndType(int start, int
max, String orderby, boolean asc, String externalType) {
try {
- List<Room> rooms = this.getRoomsInternatlbyType(start,
max,
- orderby, asc, externalRoomType);
+ List<Room> rooms = this.getRoomsInternatlbyType(start,
max, orderby, asc, externalType);
for (Room room : rooms) {
room.setCurrentusers(sessionManager.getClientListByRoom(room.getId()));
@@ -157,8 +156,7 @@ public class RoomManager {
* @param asc
* @return
*/
- public List<Room> getRoomsInternatl(int start, int max, String orderby,
- boolean asc) {
+ public List<Room> getRoomsInternatl(int start, int max, String orderby,
boolean asc) {
try {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Room> cq = cb.createQuery(Room.class);
@@ -241,15 +239,13 @@ public class RoomManager {
return null;
}
- public List<Room> getRoomsInternatlbyType(int start, int max,
- String orderby, boolean asc, String externalRoomType) {
+ public List<Room> getRoomsInternatlbyType(int start, int max, String
orderby, boolean asc, String externalType) {
try {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Room> cq = cb.createQuery(Room.class);
Root<Room> c = cq.from(Room.class);
Predicate condition = cb.equal(c.get("deleted"), false);
- Predicate subCondition =
cb.equal(c.get("externalRoomType"),
- externalRoomType);
+ Predicate subCondition =
cb.equal(c.get("externalType"), externalType);
cq.where(condition, subCondition);
cq.distinct(asc);
if (asc) {
@@ -268,18 +264,18 @@ public class RoomManager {
return null;
}
- public List<RoomGroup> getOrganisationsByRoom(long rooms_id) {
+ public List<RoomGroup> getGroupsByRoom(long roomId) {
try {
- String hql = "select c from RoomOrganisation as c "
- + "where c.room.rooms_id = :rooms_id "
+ String hql = "select c from RoomGroup as c "
+ + "where c.room.id = :id "
+ "AND c.deleted = false";
TypedQuery<RoomGroup> q = em.createQuery(hql,
RoomGroup.class);
- q.setParameter("rooms_id", rooms_id);
+ q.setParameter("id", roomId);
List<RoomGroup> ll = q.getResultList();
return ll;
} catch (Exception ex2) {
- log.error("[getOrganisationsByRoom] ", ex2);
+ log.error("[getGroupsByRoom] ", ex2);
}
return null;
}
@@ -295,11 +291,11 @@ public class RoomManager {
queryString += "(";
int i = 0;
- for (Integer room_id : roomIds) {
+ for (Integer roomId : roomIds) {
if (i != 0) {
queryString += " OR ";
}
- queryString += " r.rooms_id = " + room_id;
+ queryString += " r.id = " + roomId;
i++;
}
@@ -321,11 +317,11 @@ public class RoomManager {
/**
* Returns number of SIP conference participants
- * @param rooms_id id of room
+ * @param roomId id of room
* @return number of participants
*/
- public Integer getSipConferenceMembersNumber(Long rooms_id) {
- Room r = roomDao.get(rooms_id);
+ public Integer getSipConferenceMembersNumber(Long roomId) {
+ Room r = roomDao.get(roomId);
return r == null || r.getConfno() == null ? null :
sipDao.countUsers(r.getConfno());
}
@@ -349,18 +345,17 @@ public class RoomManager {
}
/**
- * Gets all rooms by an organisation
+ * Gets all rooms by an group
*
- * @param organisation_id
- * @return list of Rooms_Organisation with Rooms as Sub-Objects or null
+ * @param groupId
+ * @return list of RoomGroup with Rooms as Sub-Objects or null
*/
- public List<RoomGroup> getRoomsOrganisationByOrganisationId(long
organisation_id) {
+ public List<RoomGroup> getRoomGroupByGroupId(long groupId) {
try {
TypedQuery<RoomGroup> query = em.
-
createNamedQuery("getRoomsOrganisationByOrganisationId", RoomGroup.class);
+
createNamedQuery("getRoomGroupByGroupId", RoomGroup.class);
- query.setParameter("organisation_id", organisation_id);
- query.setParameter("deleted", true);
+ query.setParameter("groupId", groupId);
List<RoomGroup> ll = query.getResultList();
@@ -371,53 +366,47 @@ public class RoomManager {
return null;
}
- public SearchResult<RoomGroup>
getRoomsOrganisationsByOrganisationId(long organisation_id, int start, int max,
String orderby,
+ public SearchResult<RoomGroup> getRoomGroupByGroupId(long groupId, int
start, int max, String orderby,
boolean asc) {
try {
SearchResult<RoomGroup> sResult = new
SearchResult<RoomGroup>();
sResult.setObjectName(RoomGroup.class.getName());
-
sResult.setRecords(this.selectMaxFromRoomsByOrganisation(
- organisation_id).longValue());
-
sResult.setResult(getRoomsOrganisationByOrganisationId(organisation_id, start,
max, orderby, asc));
+
sResult.setRecords(this.selectMaxFromRoomsByGroup(groupId).longValue());
+ sResult.setResult(getRoomGroupsByGroupId(groupId,
start, max, orderby, asc));
return sResult;
} catch (Exception ex2) {
- log.error("[getRoomsByOrganisation] ", ex2);
+ log.error("[getRoomGroupByGroupId] ", ex2);
}
return null;
}
- public Integer selectMaxFromRoomsByOrganisation(long organisation_id) {
+ public Integer selectMaxFromRoomsByGroup(long groupId) {
try {
// get all users
- TypedQuery<RoomGroup> q =
em.createNamedQuery("selectMaxFromRoomsByOrganisation", RoomGroup.class);
+ TypedQuery<RoomGroup> q =
em.createNamedQuery("selectMaxFromRoomsByGroup", RoomGroup.class);
- q.setParameter("organisation_id", organisation_id);
- q.setParameter("deleted", true);
+ q.setParameter("groupId", groupId);
List<RoomGroup> ll = q.getResultList();
return ll.size();
} catch (Exception ex2) {
- log.error("[selectMaxFromRooms] ", ex2);
+ log.error("[selectMaxFromRoomsByGroup] ", ex2);
}
return null;
}
/**
*
- * @param organisation_id
+ * @param groupId
* @param start
* @param max
* @param orderby
* @param asc
* @return
*/
- private List<RoomGroup> getRoomsOrganisationByOrganisationId(
- long organisation_id, int start, int max, String
orderby,
- boolean asc) {
+ private List<RoomGroup> getRoomGroupsByGroupId(long groupId, int start,
int max, String orderby, boolean asc) {
try {
- String hql = "select c from RoomOrganisation as c "
- + "where c.organisation.organisation_id
= :organisation_id "
- + "AND c.deleted = false";
+ String hql = "select c from RoomGroup as c where
c.group.id = :groupId AND c.deleted = false";
if (orderby.startsWith("c.")) {
hql += "ORDER BY " + orderby;
} else {
@@ -431,14 +420,14 @@ public class RoomManager {
TypedQuery<RoomGroup> q = em.createQuery(hql,
RoomGroup.class);
- q.setParameter("organisation_id", organisation_id);
+ q.setParameter("groupId", groupId);
q.setFirstResult(start);
q.setMaxResults(max);
List<RoomGroup> ll = q.getResultList();
return ll;
} catch (Exception ex2) {
- log.error("[getRoomsByOrganisation] ", ex2);
+ log.error("[getRoomsByGroup] ", ex2);
}
return null;
}
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1714149&r1=1714148&r2=1714149&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
Fri Nov 13 01:24:41 2015
@@ -29,10 +29,10 @@ import org.apache.commons.transaction.ut
import org.apache.openmeetings.core.converter.FlvExplorerConverter;
import org.apache.openmeetings.core.converter.GenerateImage;
import org.apache.openmeetings.core.converter.GenerateThumbs;
+import org.apache.openmeetings.core.documents.GeneratePDF;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
import org.apache.openmeetings.db.entity.file.FileItem.Type;
-import org.apache.openmeetings.core.documents.GeneratePDF;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.StoredFile;
@@ -59,7 +59,7 @@ public class FileProcessor {
@Autowired
private GeneratePDF generatePDF;
- public ConverterProcessResultList processFile(Long userId, Long
room_id,
+ public ConverterProcessResultList processFile(Long userId, Long roomId,
boolean isOwner, InputStream is, Long parentFolderId,
String fileSystemName,
Long externalFileId, String externalType) throws
Exception {
@@ -136,7 +136,7 @@ public class FileProcessor {
Long fileExplorerItemId = fileExplorerItemDao.add(
fileSystemName, fileHashName, // The Hashname of the file
- parentFolderId, ownerId, room_id, userId, false, // isFolder
+ parentFolderId, ownerId, roomId, userId, false, // isFolder
isImage, isPresentation, "", false, isChart,
externalFileId, externalType);
log.debug("fileExplorerItemId: " + fileExplorerItemId);
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java?rev=1714149&r1=1714148&r2=1714149&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
Fri Nov 13 01:24:41 2015
@@ -30,86 +30,72 @@ import org.apache.openmeetings.db.dao.fi
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
import org.apache.openmeetings.db.entity.file.FileItem.Type;
import org.apache.openmeetings.util.OmFileHelper;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class FileUtils {
- private static final Logger log = Red5LoggerFactory.getLogger(
- FileProcessor.class,
OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(FileProcessor.class, webAppRootKey);
@Autowired
private FileExplorerItemDao fileExplorerItemDao;
- public long getSizeOfDirectoryAndSubs(FileExplorerItem
fileExplorerItem) {
+ public long getSizeOfDirectoryAndSubs(FileExplorerItem file) {
try {
-
long fileSize = 0;
File base = OmFileHelper.getUploadFilesDir();
- if (Type.Image == fileExplorerItem.getType()) {
+ if (Type.Image == file.getType()) {
- File tFile = new File(base,
fileExplorerItem.getFileHash());
+ File tFile = new File(base, file.getFileHash());
if (tFile.exists()) {
fileSize += tFile.length();
}
- File thumbFile = new File(base,
thumbImagePrefix + fileExplorerItem.getFileHash());
+ File thumbFile = new File(base,
thumbImagePrefix + file.getFileHash());
if (thumbFile.exists()) {
fileSize += thumbFile.length();
}
-
}
- if (Type.Presentation == fileExplorerItem.getType()) {
-
- File tFolder = new File(base,
fileExplorerItem.getFileHash());
+ if (Type.Presentation == file.getType()) {
+ File tFolder = new File(base,
file.getFileHash());
if (tFolder.exists()) {
fileSize +=
OmFileHelper.getSize(tFolder);
}
-
}
log.debug("calling [1]
FileExplorerItemDaoImpl.updateFileOrFolder()");
- fileExplorerItemDao.update(fileExplorerItem);
+ fileExplorerItemDao.update(file);
- List<FileExplorerItem> childElements =
fileExplorerItemDao.getByParent(fileExplorerItem.getId());
+ List<FileExplorerItem> childElements =
fileExplorerItemDao.getByParent(file.getId());
for (FileExplorerItem childExplorerItem :
childElements) {
-
fileSize +=
this.getSizeOfDirectoryAndSubs(childExplorerItem);
-
}
return fileSize;
-
} catch (Exception err) {
log.error("[getSizeOfDirectoryAndSubs] ", err);
}
return 0;
}
- public void setFileToOwnerOrRoomByParent(FileExplorerItem
fileExplorerItem,
- Long users_id, Long roomId) {
+ public void setFileToOwnerOrRoomByParent(FileExplorerItem file, Long
userId, Long roomId) {
try {
-
- fileExplorerItem.setOwnerId(users_id);
- fileExplorerItem.setRoomId(roomId);
+ file.setOwnerId(userId);
+ file.setRoomId(roomId);
log.debug("calling [2]
FileExplorerItemDaoImpl.updateFileOrFolder()");
- fileExplorerItemDao.update(fileExplorerItem);
+ fileExplorerItemDao.update(file);
- List<FileExplorerItem> childElements =
fileExplorerItemDao.getByParent(fileExplorerItem.getId());
+ List<FileExplorerItem> childElements =
fileExplorerItemDao.getByParent(file.getId());
for (FileExplorerItem childExplorerItem :
childElements) {
-
-
this.setFileToOwnerOrRoomByParent(childExplorerItem, users_id,
- roomId);
-
+ setFileToOwnerOrRoomByParent(childExplorerItem,
userId, roomId);
}
-
} catch (Exception err) {
log.error("[setFileToOwnerOrRoomByParent] ", err);
}
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java?rev=1714149&r1=1714148&r2=1714149&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
Fri Nov 13 01:24:41 2015
@@ -53,10 +53,7 @@ public class BatikMethods {
public void paintTextByWidthHeight(SVGGraphics2D g2d, int x1, int y1,
int width, int height,
String text, int style, int size, Color fontColor)
throws Exception {
- //String default_export_font =
Configurationmanagement.getInstance().getConfKey(3,"default_export_font").getConf_value();
-
this.drawTextByJTextArea(g2d, x1, y1, width, height, text,
"Verdana", style, size, fontColor);
-
}
public void _paintTextByWidthHeight(SVGGraphics2D g2d, int x1, int y1,
int width, int height,
@@ -244,9 +241,6 @@ public class BatikMethods {
public void paintTextByWidthHeightAndDocument(SVGGraphics2D g2d, int
x1, int y1, int width, int height,
String text, int style, int size, Color fontColor,
Document document) throws Exception {
- // String default_export_font =
- //
Configurationmanagement.getInstance().getConfKey("default_export_font").getConf_value();
-
this.drawText(g2d, x1, y1, width, height, text, "Verdana",
style, size, fontColor, document);
}
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java?rev=1714149&r1=1714148&r2=1714149&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java
Fri Nov 13 01:24:41 2015
@@ -68,13 +68,13 @@ public class WhiteboardMapToSVG extends
List pointsList = (List) graphObject.get(1);
- Integer lineWidth =
Integer.valueOf(graphObject.get(3).toString()).intValue();
- Integer col =
Integer.valueOf(graphObject.get(4).toString()).intValue();
+ Integer lineWidth =
Integer.valueOf(graphObject.get(3).toString());
+ Integer col =
Integer.valueOf(graphObject.get(4).toString());
- Float alpha =
Float.valueOf(graphObject.get(5).toString()).floatValue();
+ Float alpha =
Float.valueOf(graphObject.get(5).toString());
- Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString()).doubleValue();
- Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString()).doubleValue();
+ Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString());
+ Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString());
//log.debug("x,y,width,height:
"+x+","+y+","+width+","+height);
@@ -95,60 +95,60 @@ public class WhiteboardMapToSVG extends
actionObject[5] = fillDis;
actionObject[6] = this.currentrectangleOpacity;*/
- Integer lineWidth =
Integer.valueOf(graphObject.get(2).toString()).intValue();
+ Integer lineWidth =
Integer.valueOf(graphObject.get(2).toString());
- Integer stroke =
Integer.valueOf(graphObject.get(1).toString()).intValue();
- Integer strokeDis=
Integer.valueOf(graphObject.get(4).toString()).intValue();
+ Integer stroke =
Integer.valueOf(graphObject.get(1).toString());
+ Integer strokeDis=
Integer.valueOf(graphObject.get(4).toString());
Color strokeColor = null;
if (strokeDis != -1) {
strokeColor = new Color(stroke);
}
- Integer fill =
Integer.valueOf(graphObject.get(3).toString()).intValue();
- Integer fillDis=
Integer.valueOf(graphObject.get(5).toString()).intValue();
+ Integer fill =
Integer.valueOf(graphObject.get(3).toString());
+ Integer fillDis=
Integer.valueOf(graphObject.get(5).toString());
Color fillColor = null;
if (fillDis != -1) {
fillColor = new Color(fill);
}
- Float alpha =
Float.valueOf(graphObject.get(6).toString()).floatValue();
+ Float alpha =
Float.valueOf(graphObject.get(6).toString());
- Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString()).doubleValue();
- Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString()).doubleValue();
- Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString()).doubleValue();
- Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString()).doubleValue();
+ Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString());
+ Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString());
+ Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString());
+ Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString());
SVGGraphics2D svgGenerator_temp = new
SVGGraphics2D(svgGenerator);
this.paintRect2D(svgGenerator_temp, x, y, width,
height, strokeColor, lineWidth, fillColor, alpha);
} else if (graphType.equals("ellipse")) {
- Integer lineWidth =
Integer.valueOf(graphObject.get(2).toString()).intValue();
+ Integer lineWidth =
Integer.valueOf(graphObject.get(2).toString());
- Integer stroke =
Integer.valueOf(graphObject.get(1).toString()).intValue();
- Integer strokeDis=
Integer.valueOf(graphObject.get(4).toString()).intValue();
+ Integer stroke =
Integer.valueOf(graphObject.get(1).toString());
+ Integer strokeDis=
Integer.valueOf(graphObject.get(4).toString());
Color strokeColor = null;
if (strokeDis != -1) {
strokeColor = new Color(stroke);
}
- Integer fill =
Integer.valueOf(graphObject.get(3).toString()).intValue();
- Integer fillDis=
Integer.valueOf(graphObject.get(5).toString()).intValue();
+ Integer fill =
Integer.valueOf(graphObject.get(3).toString());
+ Integer fillDis=
Integer.valueOf(graphObject.get(5).toString());
Color fillColor = null;
if (fillDis != -1) {
fillColor = new Color(fill);
}
- Float alpha =
Float.valueOf(graphObject.get(6).toString()).floatValue();
+ Float alpha =
Float.valueOf(graphObject.get(6).toString());
- Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString()).doubleValue();
- Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString()).doubleValue();
- Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString()).doubleValue();
- Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString()).doubleValue();
+ Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString());
+ Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString());
+ Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString());
+ Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString());
SVGGraphics2D svgGenerator_temp = new
SVGGraphics2D(svgGenerator);
this.paintEllipse2D(svgGenerator_temp, x, y, width,
height, strokeColor, lineWidth, fillColor, alpha);
@@ -156,8 +156,8 @@ public class WhiteboardMapToSVG extends
} else if (graphType.equals("letter")) {
String text = graphObject.get(1).toString();
- Color fontColor = new Color
(Integer.valueOf(graphObject.get(2).toString()).intValue());
- Integer fontSize =
Integer.valueOf(graphObject.get(3).toString()).intValue();
+ Color fontColor = new Color
(Integer.valueOf(graphObject.get(2).toString()));
+ Integer fontSize =
Integer.valueOf(graphObject.get(3).toString());
String fontStyle = graphObject.get(4).toString();
Integer style = null;
@@ -173,46 +173,46 @@ public class WhiteboardMapToSVG extends
log.debug("fontStyle,style "+style+" fs: "+fontStyle);
- Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString()).doubleValue();
- Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString()).doubleValue();
- Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString()).doubleValue();
- Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString()).doubleValue();
+ Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString());
+ Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString());
+ Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString());
+ Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString());
SVGGraphics2D svgGenerator_temp = new
SVGGraphics2D(svgGenerator);
- this.paintTextByWidthHeight(svgGenerator_temp, (int)
Math.round(x), (int) Math.round(y), (int) Math.round(width),
+ paintTextByWidthHeight(svgGenerator_temp, (int)
Math.round(x), (int) Math.round(y), (int) Math.round(width),
(int) Math.round(height), text,
style, fontSize, fontColor);
} else if (graphType.equals("drawarrow")) {
- Integer thickness =
Integer.valueOf(graphObject.get(2).toString()).intValue();
+ Integer thickness =
Integer.valueOf(graphObject.get(2).toString());
- Integer stroke =
Integer.valueOf(graphObject.get(1).toString()).intValue();
- Integer strokeDis=
Integer.valueOf(graphObject.get(4).toString()).intValue();
+ Integer stroke =
Integer.valueOf(graphObject.get(1).toString());
+ Integer strokeDis=
Integer.valueOf(graphObject.get(4).toString());
Color strokeColor = null;
if (strokeDis != -1) {
strokeColor = new Color(stroke);
}
- Integer fill =
Integer.valueOf(graphObject.get(3).toString()).intValue();
- Integer fillDis=
Integer.valueOf(graphObject.get(5).toString()).intValue();
+ Integer fill =
Integer.valueOf(graphObject.get(3).toString());
+ Integer fillDis=
Integer.valueOf(graphObject.get(5).toString());
Color fillColor = null;
if (fillDis != -1) {
fillColor = new Color(fill);
}
- Float alpha =
Float.valueOf(graphObject.get(6).toString()).floatValue();
+ Float alpha =
Float.valueOf(graphObject.get(6).toString());
- Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString()).doubleValue();
- Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString()).doubleValue();
+ Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString());
+ Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString());
//Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString()).doubleValue();
//Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString()).doubleValue();
- Double x1 =
Double.valueOf(graphObject.get(7).toString()).doubleValue();
- Double y1 =
Double.valueOf(graphObject.get(8).toString()).doubleValue();
- Double x2 =
Double.valueOf(graphObject.get(9).toString()).doubleValue();
- Double y2 =
Double.valueOf(graphObject.get(10).toString()).doubleValue();
+ Double x1 =
Double.valueOf(graphObject.get(7).toString());
+ Double y1 =
Double.valueOf(graphObject.get(8).toString());
+ Double x2 =
Double.valueOf(graphObject.get(9).toString());
+ Double y2 =
Double.valueOf(graphObject.get(10).toString());
GeomPoint start = new GeomPoint();
start.setLocation(x+x1,y+y1);
@@ -244,10 +244,10 @@ public class WhiteboardMapToSVG extends
Image myImage = ImageIO.read(myFile);
- int x = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-5).toString()).doubleValue());
- int y = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-4).toString()).doubleValue());
- int width = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-3).toString()).doubleValue());
- int height = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-2).toString()).doubleValue());
+ int x = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-5).toString()));
+ int y = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-4).toString()));
+ int width = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-3).toString()));
+ int height = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-2).toString()));
SVGGraphics2D svgGenerator_temp = new
SVGGraphics2D(svgGenerator);
svgGenerator_temp.drawImage(myImage, x, y,
width, height, null);
@@ -273,22 +273,22 @@ public class WhiteboardMapToSVG extends
// actionObject[12] = height;
// actionObject[13] = newName;
- Integer lineWidth =
Integer.valueOf(graphObject.get(2).toString()).intValue();
+ Integer lineWidth =
Integer.valueOf(graphObject.get(2).toString());
- Integer stroke =
Integer.valueOf(graphObject.get(1).toString()).intValue();
+ Integer stroke =
Integer.valueOf(graphObject.get(1).toString());
Color strokeColor = new Color(stroke);
- Float alpha =
Float.valueOf(graphObject.get(3).toString()).floatValue();
+ Float alpha =
Float.valueOf(graphObject.get(3).toString());
- Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString()).doubleValue();
- Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString()).doubleValue();
+ Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString());
+ Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString());
//Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString()).doubleValue();
//Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString()).doubleValue();
- Double x1 =
Double.valueOf(graphObject.get(4).toString()).doubleValue();
- Double y1 =
Double.valueOf(graphObject.get(5).toString()).doubleValue();
- Double x2 =
Double.valueOf(graphObject.get(6).toString()).doubleValue();
- Double y2 =
Double.valueOf(graphObject.get(7).toString()).doubleValue();
+ Double x1 =
Double.valueOf(graphObject.get(4).toString());
+ Double y1 =
Double.valueOf(graphObject.get(5).toString());
+ Double x2 =
Double.valueOf(graphObject.get(6).toString());
+ Double y2 =
Double.valueOf(graphObject.get(7).toString());
SVGGraphics2D svgGenerator_temp = new
SVGGraphics2D(svgGenerator);
this.drawLine(svgGenerator_temp, x1, y1, x2, y2,
strokeColor, lineWidth, x, y, alpha);
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java?rev=1714149&r1=1714148&r2=1714149&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java
Fri Nov 13 01:24:41 2015
@@ -32,15 +32,15 @@ public class InterviewConverterTask {
@Autowired
private TaskExecutor taskExecutor;
@Autowired
- private InterviewConverter flvInterviewConverter;
+ private InterviewConverter interviewConverter;
- public void startConversionThread(final Long flvRecordingId) {
+ public void startConversionThread(final Long recordingId) {
try {
log.debug("[-1-]" + taskExecutor);
taskExecutor.execute(new Runnable() {
public void run() {
-
flvInterviewConverter.startConversion(flvRecordingId);
+
interviewConverter.startConversion(recordingId);
}
});
} catch (Exception err) {
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/RecordingConverterTask.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/RecordingConverterTask.java?rev=1714149&r1=1714148&r2=1714149&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/RecordingConverterTask.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/RecordingConverterTask.java
Fri Nov 13 01:24:41 2015
@@ -32,15 +32,15 @@ public class RecordingConverterTask {
@Autowired
private TaskExecutor taskExecutor;
@Autowired
- private RecordingConverter flvRecorderConverter;
+ private RecordingConverter recordingConverter;
- public void startConversionThread(final Long flvRecordingId) {
+ public void startConversionThread(final Long recordingId) {
try {
log.debug("[-1-]" + taskExecutor);
taskExecutor.execute(new Runnable() {
public void run() {
-
flvRecorderConverter.startConversion(flvRecordingId);
+
recordingConverter.startConversion(recordingId);
}
});
} catch (Exception err) {
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java?rev=1714149&r1=1714148&r2=1714149&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java
Fri Nov 13 01:24:41 2015
@@ -35,25 +35,25 @@ public class WhiteBoardObjectListManager
private Long whiteboardId = 0L;
- public Long getNewWhiteboardId(Long room_id) throws Exception {
+ public Long getNewWhiteboardId(Long roomId) throws Exception {
whiteboardId++;
- this.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id, new
WhiteboardObject(), whiteboardId);
+ this.setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId, new
WhiteboardObject(), whiteboardId);
return whiteboardId;
}
/*
* Room items a Whiteboard
*/
- public synchronized WhiteboardObjectList
getWhiteBoardObjectListByRoomId(Long room_id){
- WhiteboardObjectList whiteboardObjectList =
whiteBoardObjectList.get(room_id);
+ public synchronized WhiteboardObjectList
getWhiteBoardObjectListByRoomId(Long roomId){
+ WhiteboardObjectList whiteboardObjectList =
whiteBoardObjectList.get(roomId);
if (whiteboardObjectList == null) {
whiteboardObjectList = new WhiteboardObjectList();
}
return whiteboardObjectList;
}
- public synchronized WhiteboardObject
getWhiteBoardObjectListByRoomIdAndWhiteboard(Long room_id, Long whiteBoardId){
- WhiteboardObjectList whiteboardObjectList =
whiteBoardObjectList.get(room_id);
+ public synchronized WhiteboardObject
getWhiteBoardObjectListByRoomIdAndWhiteboard(Long roomId, Long whiteBoardId){
+ WhiteboardObjectList whiteboardObjectList =
whiteBoardObjectList.get(roomId);
if (whiteboardObjectList == null) {
whiteboardObjectList = new WhiteboardObjectList();
}
@@ -69,18 +69,18 @@ public class WhiteBoardObjectListManager
*
*/
- public synchronized void setWhiteBoardObjectListRoomObj(Long room_id,
WhiteboardObjectList whiteboardObjectList){
- whiteBoardObjectList.put(room_id, whiteboardObjectList);
+ public synchronized void setWhiteBoardObjectListRoomObj(Long roomId,
WhiteboardObjectList whiteboardObjectList){
+ whiteBoardObjectList.put(roomId, whiteboardObjectList);
}
- public synchronized void
setWhiteBoardObjectListRoomObjAndWhiteboardId(Long room_id, WhiteboardObject
whiteboardObjects, Long whiteBoardId){
- WhiteboardObjectList whiteboardObjectList =
whiteBoardObjectList.get(room_id);
+ public synchronized void
setWhiteBoardObjectListRoomObjAndWhiteboardId(Long roomId, WhiteboardObject
whiteboardObjects, Long whiteBoardId){
+ WhiteboardObjectList whiteboardObjectList =
whiteBoardObjectList.get(roomId);
if (whiteboardObjectList == null) {
whiteboardObjectList = new WhiteboardObjectList();
- whiteboardObjectList.setRoom_id(room_id);
+ whiteboardObjectList.setRoomId(roomId);
}
whiteboardObjects.setWhiteBoardId(whiteBoardId);
whiteboardObjectList.getWhiteboardObjects().put(whiteBoardId,
whiteboardObjects);
- whiteBoardObjectList.put(room_id, whiteboardObjectList);
+ whiteBoardObjectList.put(roomId, whiteboardObjectList);
}
}
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java?rev=1714149&r1=1714148&r2=1714149&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
Fri Nov 13 01:24:41 2015
@@ -45,15 +45,12 @@ public class WhiteBoardObjectSyncManager
/*
* Initial Sync Process
*/
- public synchronized void setWhiteBoardSyncListByRoomid(Long room_id,
- Map<String, WhiteboardSyncLockObject> mapObject) {
- whiteBoardSyncList.put(room_id, mapObject);
+ public synchronized void setWhiteBoardSyncListByRoomid(Long roomId,
Map<String, WhiteboardSyncLockObject> mapObject) {
+ whiteBoardSyncList.put(roomId, mapObject);
}
- public synchronized Map<String, WhiteboardSyncLockObject>
getWhiteBoardSyncListByRoomid(
- Long room_id) {
- Map<String, WhiteboardSyncLockObject> roomList =
whiteBoardSyncList
- .get(room_id);
+ public synchronized Map<String, WhiteboardSyncLockObject>
getWhiteBoardSyncListByRoomid(Long roomId) {
+ Map<String, WhiteboardSyncLockObject> roomList =
whiteBoardSyncList.get(roomId);
if (roomList == null) {
roomList = new HashMap<String,
WhiteboardSyncLockObject>();
}
@@ -63,56 +60,53 @@ public class WhiteBoardObjectSyncManager
/*
* Image Sync Process
*/
- public synchronized void setWhiteBoardImagesSyncListByRoomid(Long
room_id,
+ public synchronized void setWhiteBoardImagesSyncListByRoomid(Long
roomId,
Map<String, Map<String, WhiteboardSyncLockObject>>
mapObject) {
- whiteBoardObjectSyncList.put(room_id, mapObject);
+ whiteBoardObjectSyncList.put(roomId, mapObject);
}
public synchronized void setWhiteBoardImagesSyncListByRoomAndObjectId(
- Long room_id, String object_id,
+ Long roomId, String objectId,
Map<String, WhiteboardSyncLockObject> imageSyncList) {
Map<String, Map<String, WhiteboardSyncLockObject>> roomList =
whiteBoardObjectSyncList
- .get(room_id);
+ .get(roomId);
if (roomList == null) {
roomList = new HashMap<String, Map<String,
WhiteboardSyncLockObject>>();
}
if (imageSyncList.size() == 0) {
- roomList.remove(object_id);
+ roomList.remove(objectId);
} else {
- roomList.put(object_id, imageSyncList);
+ roomList.put(objectId, imageSyncList);
}
- setWhiteBoardImagesSyncListByRoomid(room_id, roomList);
+ setWhiteBoardImagesSyncListByRoomid(roomId, roomList);
}
- public synchronized Map<String, Map<String, WhiteboardSyncLockObject>>
getWhiteBoardObjectSyncListByRoomid(
- Long room_id) {
- Map<String, Map<String, WhiteboardSyncLockObject>> roomList =
whiteBoardObjectSyncList
- .get(room_id);
+ public synchronized Map<String, Map<String, WhiteboardSyncLockObject>>
getWhiteBoardObjectSyncListByRoomid(Long roomId) {
+ Map<String, Map<String, WhiteboardSyncLockObject>> roomList =
whiteBoardObjectSyncList.get(roomId);
if (roomList == null) {
roomList = new HashMap<String, Map<String,
WhiteboardSyncLockObject>>();
}
return roomList;
}
- public synchronized Map<String, WhiteboardSyncLockObject>
getWhiteBoardObjectSyncListByRoomAndObjectId(
- Long room_id, String object_id) {
- log.debug("getWhiteBoardImagesSyncListByRoomAndImageid room_id:
"
- + room_id);
+ public synchronized Map<String, WhiteboardSyncLockObject>
getWhiteBoardObjectSyncListByRoomAndObjectId(Long roomId, String objectId) {
+ log.debug("getWhiteBoardImagesSyncListByRoomAndImageid roomId: "
+ + roomId);
Map<String, Map<String, WhiteboardSyncLockObject>> roomList =
whiteBoardObjectSyncList
- .get(room_id);
+ .get(roomId);
if (roomList == null) {
roomList = new HashMap<String, Map<String,
WhiteboardSyncLockObject>>();
}
log.debug("getWhiteBoardImagesSyncListByRoomAndImageid
roomList: "
+ roomList);
- log.debug("getWhiteBoardImagesSyncListByRoomAndImageid
object_id: "
- + object_id);
+ log.debug("getWhiteBoardImagesSyncListByRoomAndImageid
objectId: "
+ + objectId);
if (roomList.size() == 1) {
- log.debug("getWhiteBoardImagesSyncListByRoomAndImageid
roomList Key image_id: "
+ log.debug("getWhiteBoardImagesSyncListByRoomAndImageid
roomList Key imageId: "
+ roomList.keySet().iterator().next());
}
Map<String, WhiteboardSyncLockObject> imageSyncList = roomList
- .get(object_id);
+ .get(objectId);
if (imageSyncList == null) {
imageSyncList = new HashMap<String,
WhiteboardSyncLockObject>();
}
