Author: solomax
Date: Tue Nov 10 02:59:26 2015
New Revision: 1713575
URL: http://svn.apache.org/viewvc?rev=1713575&view=rev
Log:
[OPENMEETINGS-1276] another wave of merge
Added:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
- copied, changed from r1713574,
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuPanel.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
- copied, changed from r1713478,
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuPanel.java
Removed:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuPanel.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/calendar/
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java
Modified:
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/remote/ChatService.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/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/servlet/outputhandler/ScreenController.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.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/entity/basic/Naviglobal.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.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/Invitation.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/user/User.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-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/backup/PollTypeConverter.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/branches/3.1.x/openmeetings-server/pom.xml
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/labels/LangPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
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/room/RoomBroadcaster.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/AviRecordingResourceReference.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FlvRecordingResourceReference.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/JpgRecordingResourceReference.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/Mp4RecordingResourceReference.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OggRecordingResourceReference.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.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/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.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/test/java/org/apache/openmeetings/test/navi/TestNavi.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSession.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
openmeetings/branches/3.1.x/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.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/RoomPoll.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.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/Userdata.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/StateConverter.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/conf/om_ldap.cfg
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
openmeetings/trunk/singlewebapp/pom.xml
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=1713575&r1=1713574&r2=1713575&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
Tue Nov 10 02:59:26 2015
@@ -104,7 +104,7 @@ public class GenerateImage extends BaseC
String pictureuri = destinationFile.getName();
User us = usersDao.get(users_id);
- us.setUpdatetime(new java.util.Date());
+ us.setUpdated(new java.util.Date());
us.setPictureuri(pictureuri);
usersDao.update(us, users_id);
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java
Tue Nov 10 02:59:26 2015
@@ -99,8 +99,8 @@ public class ChatService implements IPen
msg.add(client.getUsercolor());
msg.add(client.getPublicSID()); //om[6] =
parent.parent.isPrivate ? parent.parent.parent.refObj.publicSID :
canvas.publicSID;
msg.add("false");// canvas.isrtl;
- msg.add("" + client.getUser_id());
- Room room = roomDao.get(client.getRoom_id());
+ msg.add("" + client.getUserId());
+ Room room = roomDao.get(client.getRoomId());
msg.add("" + (room.isChatModerated() && !(client.getIsMod() ||
client.getIsSuperModerator())));
sendMessageWithClient(msg);
}
@@ -118,7 +118,7 @@ public class ChatService implements IPen
try {
IConnection current = Red5.getConnectionLocal();
Client currentClient =
sessionManager.getClientByStreamId(current.getClient().getId(), null);
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
log.debug("room_id: " + room_id);
if (room_id == null) {
@@ -206,7 +206,7 @@ public class ChatService implements IPen
try {
IConnection current = Red5.getConnectionLocal();
Client currentClient =
this.sessionManager.getClientByStreamId(current.getClient().getId(), null);
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
Room room = roomDao.get(room_id);
log.debug("room_id: " + room_id);
@@ -261,7 +261,7 @@ public class ChatService implements IPen
try {
IConnection current = Red5.getConnectionLocal();
Client currentClient =
this.sessionManager.getClientByStreamId(current.getClient().getId(), null);
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
Long chatroom = room_id;
log.debug("### GET CHATROOM: "+chatroom);
@@ -287,7 +287,7 @@ public class ChatService implements IPen
try {
IConnection current = Red5.getConnectionLocal();
Client currentClient =
this.sessionManager.getClientByStreamId(current.getClient().getId(), null);
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
log.debug("GET CHATROOM: " + room_id);
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
Tue Nov 10 02:59:26 2015
@@ -274,7 +274,7 @@ public class ConferenceLibrary implement
Client currentClient = this.sessionManager
.getClientByStreamId(streamid,
null);
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
if (room_id != null) {
File outputFullFlvFile = new
File(OmFileHelper.getStreamsHibernateDir()
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
Tue Nov 10 02:59:26 2015
@@ -22,13 +22,10 @@ import static org.apache.openmeetings.ut
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
import java.util.Date;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
-import java.util.Map;
import java.util.Set;
-import org.apache.openmeetings.core.data.conference.RoomManager;
import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.core.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
@@ -87,8 +84,6 @@ public class MainService implements IPen
@Autowired
private IUserManager userManager;
@Autowired
- private RoomManager roomManager;
- @Autowired
private ConferenceLogDao conferenceLogDao;
@Autowired
private UserDao userDao;
@@ -217,8 +212,8 @@ public class MainService implements IPen
if (!u.getOrganisation_users().isEmpty()) {
u.setSessionData(sessiondataDao.getSessionByHash(wicketSID));
- currentClient.setUser_id(u.getId());
- currentClient.setRoom_id(wicketroomid);
+ currentClient.setUserId(u.getId());
+ currentClient.setRoomId(wicketroomid);
SessionVariablesUtil.setUserId(current.getClient(), u.getId());
currentClient.setUsername(u.getLogin());
@@ -268,8 +263,8 @@ public class MainService implements IPen
String streamId = current.getClient().getId();
Client currentClient =
sessionManager.getClientByStreamId(streamId, null);
- if (currentClient.getUser_id() != null) {
- sessiondataDao.updateUser(SID,
currentClient.getUser_id());
+ if (currentClient.getUserId() != null) {
+ sessiondataDao.updateUser(SID,
currentClient.getUserId());
}
currentClient.setAllowRecording(soapLogin.isAllowRecording());
@@ -336,7 +331,7 @@ public class MainService implements IPen
// Log the User
conferenceLogDao.addConferenceLog(
- ConferenceLog.Type.nicknameEnter,
currentClient.getUser_id(), streamId,
+ ConferenceLog.Type.nicknameEnter,
currentClient.getUserId(), streamId,
null, currentClient.getUserip(),
currentClient.getScope());
sessionManager.updateClientByStreamId(streamId,
currentClient, false, null);
@@ -396,19 +391,19 @@ public class MainService implements IPen
, userObject.getExternalUserType(), null, userObject.getPictureUrl());
long userId = u.getId();
-
currentClient.setUser_id(userId);
+
currentClient.setUserId(userId);
SessionVariablesUtil.setUserId(current.getClient(), userId);
} else {
user.setPictureuri(userObject.getPictureUrl());
userDao.update(user,
users_id);
-
currentClient.setUser_id(user.getId());
+
currentClient.setUserId(user.getId());
SessionVariablesUtil.setUserId(current.getClient(), user.getId());
}
}
-
log.debug("userObject.getExternalUserId() -2- " + currentClient.getUser_id());
+
log.debug("userObject.getExternalUserId() -2- " + currentClient.getUserId());
currentClient.setUserObject(userObject.getUsername(),
userObject.getFirstname(), userObject.getLastname());
currentClient.setPicture_uri(userObject.getPictureUrl());
@@ -416,8 +411,8 @@ public class MainService implements IPen
log.debug("UPDATE USER BY STREAMID " +
streamId);
- if (currentClient.getUser_id() != null)
{
- sessiondataDao.updateUser(SID,
currentClient.getUser_id());
+ if (currentClient.getUserId() != null) {
+ sessiondataDao.updateUser(SID,
currentClient.getUserId());
}
sessionManager.updateClientByStreamId(streamId, currentClient, false, null);
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Tue Nov 10 02:59:26 2015
@@ -209,7 +209,7 @@ public class MobileService {
}
SessionVariablesUtil.initClient(conn.getClient(), false, c.getPublicSID());
- c.setUser_id(u.getId());
+ c.setUserId(u.getId());
c.setFirstname(u.getFirstname());
c.setLastname(u.getLastname());
c.setMobile(true);
@@ -240,7 +240,7 @@ public class MobileService {
Map<String, Object> map = new
Hashtable<String, Object>();
add(map, "streamId", c.getStreamid());
add(map, "broadCastId",
c.getBroadCastID());
- add(map, "userId", c.getUser_id());
+ add(map, "userId", c.getUserId());
add(map, "firstname", c.getFirstname());
add(map, "lastname", c.getLastname());
add(map, "publicSid", c.getPublicSID());
@@ -278,7 +278,7 @@ public class MobileService {
// FIXME duplicated code
IConnection current = Red5.getConnectionLocal();
Client c =
sessionManager.getClientByStreamId(current.getClient().getId(), null);
- User u = userDao.get(c.getUser_id());
+ User u = userDao.get(c.getUserId());
//my rooms
List<Room> myl = new ArrayList<Room>();
myl.add(roomDao.getUserRoom(u.getId(), Type.conference,
labelDao.getString(1306L, u.getLanguageId())));
@@ -312,7 +312,7 @@ public class MobileService {
//TODO check if we need anything here
long broadcastId = scopeAdapter.getBroadCastId();
c.setSipTransport(true);
- c.setRoom_id(Long.parseLong(c.getScope()));
+ c.setRoomId(Long.parseLong(c.getScope()));
c.setRoomEnter(new Date());
c.setBroadCastID(broadcastId);
c.setMobile(true);
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
Tue Nov 10 02:59:26 2015
@@ -93,7 +93,7 @@ public class RecordingService implements
try {
log.debug("##REC:: recordMeetingStream ::");
- Long room_id = client.getRoom_id();
+ Long room_id = client.getRoomId();
Date now = new Date();
@@ -101,7 +101,7 @@ public class RecordingService implements
recording.setFileHash("");
recording.setFileName(roomRecordingName);
- Long ownerId = client.getUser_id();
+ Long ownerId = client.getUserId();
if (ownerId != null && ownerId < 0) {
User c = userDao.get(-ownerId);
if (c != null) {
@@ -128,7 +128,7 @@ public class RecordingService implements
// Update Client and set Flag
client.setIsRecording(true);
- client.setFlvRecordingId(recordingId);
+ client.setRecordingId(recordingId);
sessionManager.updateClientByStreamId(client.getStreamid(), client, false,
null);
// get all stream and start recording them
@@ -144,7 +144,7 @@ public class RecordingService implements
// If its the recording client
we need another type of Meta Data
if (rcl.isScreenClient()) {
- if
(rcl.getFlvRecordingId() != null && rcl.isScreenPublishStarted()) {
+ if
(rcl.getRecordingId() != null && rcl.isScreenPublishStarted()) {
String
streamName_Screen = generateFileName(recordingId,
rcl.getStreamPublishName().toString());
Long metaDataId
= metaDataDao.add(
@@ -155,7 +155,7 @@ public class RecordingService implements
recordShow(conn, rcl.getStreamPublishName(), streamName_Screen, metaDataId,
true, isInterview);
// Add Meta Data
-
rcl.setFlvRecordingMetaDataId(metaDataId);
+
rcl.setRecordingMetaDataId(metaDataId);
sessionManager.updateClientByStreamId(rcl.getStreamid(), rcl, false, null);
}
@@ -181,7 +181,7 @@ public class RecordingService implements
rcl.getFirstname() + " " + rcl.getLastname(), now, isAudioOnly, isVideoOnly,
false, streamName,
rcl.getInterviewPodId());
-
rcl.setFlvRecordingMetaDataId(metaId);
+
rcl.setRecordingMetaDataId(metaId);
sessionManager.updateClientByStreamId(rcl.getStreamid(), rcl, false, null);
@@ -322,26 +322,26 @@ public class RecordingService implements
log.debug("is this users still
alive? stop it :" + rcl);
if (rcl.isScreenClient()) {
- if
(rcl.getFlvRecordingId() != null && rcl.isScreenPublishStarted()) {
+ if
(rcl.getRecordingId() != null && rcl.isScreenPublishStarted()) {
// Stop FLV
Recording
-
stopRecordingShow(conn, rcl.getStreamPublishName(),
rcl.getFlvRecordingMetaDataId());
+
stopRecordingShow(conn, rcl.getStreamPublishName(),
rcl.getRecordingMetaDataId());
// Update Meta
Data
-
metaDataDao.updateEndDate(rcl.getFlvRecordingMetaDataId(), new Date());
+
metaDataDao.updateEndDate(rcl.getRecordingMetaDataId(), new Date());
}
} else if ((rcl.isMobile() ||
rcl.isAvClient())
&&
(rcl.getAvsettings().equals("av") || rcl.getAvsettings().equals("a") ||
rcl.getAvsettings().equals("v"))) {
- stopRecordingShow(conn,
String.valueOf(rcl.getBroadCastID()).toString(),
rcl.getFlvRecordingMetaDataId());
+ stopRecordingShow(conn,
String.valueOf(rcl.getBroadCastID()).toString(), rcl.getRecordingMetaDataId());
// Update Meta Data
-
metaDataDao.updateEndDate(rcl.getFlvRecordingMetaDataId(), new Date());
+
metaDataDao.updateEndDate(rcl.getRecordingMetaDataId(), new Date());
}
}
}
}
// Store to database
- Long recordingId = currentClient.getFlvRecordingId();
+ Long recordingId = currentClient.getRecordingId();
// In the Case of an Interview the stopping client does
not mean
// that its actually the recording client
@@ -353,7 +353,7 @@ public class RecordingService implements
recordingDao.updateEndTime(recordingId, new
Date());
// Reset values
- currentClient.setFlvRecordingId(null);
+ currentClient.setRecordingId(null);
currentClient.setIsRecording(false);
sessionManager.updateClientByStreamId(currentClient.getStreamid(),
currentClient, false, null);
@@ -381,9 +381,9 @@ public class RecordingService implements
Client currentClient =
sessionManager.getClientByStreamId(streamid, null);
- log.debug("getCurrentRoomClient
-#########################- " + currentClient.getRoom_id());
+ log.debug("getCurrentRoomClient
-#########################- " + currentClient.getRoomId());
- for (Client rcl :
sessionManager.getClientListByRoomAll(currentClient.getRoom_id())) {
+ for (Client rcl :
sessionManager.getClientListByRoomAll(currentClient.getRoomId())) {
if (rcl.getIsRecording()) {
return rcl;
}
@@ -406,16 +406,16 @@ public class RecordingService implements
if (rcl.isScreenClient()) {
- if (rcl.getFlvRecordingId() != null &&
rcl.isScreenPublishStarted()) {
+ if (rcl.getRecordingId() != null &&
rcl.isScreenPublishStarted()) {
// Stop FLV Recording
// FIXME: Is there really a need to
stop it manually if the
// user just
// stops the stream?
- stopRecordingShow(conn,
rcl.getStreamPublishName(), rcl.getFlvRecordingMetaDataId());
+ stopRecordingShow(conn,
rcl.getStreamPublishName(), rcl.getRecordingMetaDataId());
// Update Meta Data
-
metaDataDao.updateEndDate(rcl.getFlvRecordingMetaDataId(), new Date());
+
metaDataDao.updateEndDate(rcl.getRecordingMetaDataId(), new Date());
}
} else if (rcl.isAvClient()
@@ -423,10 +423,10 @@ public class RecordingService implements
// FIXME: Is there really a need to stop it
manually if the user
// just stops the stream?
- stopRecordingShow(conn,
String.valueOf(rcl.getBroadCastID()), rcl.getFlvRecordingMetaDataId());
+ stopRecordingShow(conn,
String.valueOf(rcl.getBroadCastID()), rcl.getRecordingMetaDataId());
// Update Meta Data
-
metaDataDao.updateEndDate(rcl.getFlvRecordingMetaDataId(), new Date());
+
metaDataDao.updateEndDate(rcl.getRecordingMetaDataId(), new Date());
}
} catch (Exception err) {
@@ -442,7 +442,7 @@ public class RecordingService implements
// If its the recording client we need another type of
Meta Data
if (rcl.isScreenClient()) {
- if (rcl.getFlvRecordingId() != null &&
rcl.isScreenPublishStarted()) {
+ if (rcl.getRecordingId() != null &&
rcl.isScreenPublishStarted()) {
String streamName_Screen =
generateFileName(recordingId, rcl.getStreamPublishName().toString());
log.debug("############## ADD SCREEN
OF SHARER :: " + rcl.getStreamPublishName());
@@ -455,7 +455,7 @@ public class RecordingService implements
recording.getIsInterview());
// Add Meta Data
-
rcl.setFlvRecordingMetaDataId(metaDataId);
+ rcl.setRecordingMetaDataId(metaDataId);
sessionManager.updateClientByStreamId(rcl.getStreamid(), rcl, false, null);
}
@@ -483,7 +483,7 @@ public class RecordingService implements
recordShow(conn,
String.valueOf(rcl.getBroadCastID()).toString(), streamName, metaDataId, false,
recording.getIsInterview());
- rcl.setFlvRecordingMetaDataId(metaDataId);
+ rcl.setRecordingMetaDataId(metaDataId);
sessionManager.updateClientByStreamId(rcl.getStreamid(), rcl, false, null);
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
Tue Nov 10 02:59:26 2015
@@ -20,21 +20,15 @@ package org.apache.openmeetings.core.rem
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
-import java.util.TimeZone;
-import org.apache.openmeetings.core.mail.MailHandler;
import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
-import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.IUserService;
-import org.apache.openmeetings.db.dao.user.PrivateMessageDao;
import org.apache.openmeetings.db.dao.user.UserContactDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Client;
@@ -62,25 +56,17 @@ public class UserService implements IUse
@Autowired
private ScopeApplicationAdapter scopeApplicationAdapter;
@Autowired
- private AppointmentDao appointmentDao;
- @Autowired
private SessiondataDao sessiondataDao;
@Autowired
private UserDao userDao;
@Autowired
- private PrivateMessageDao privateMessagesDao;
- @Autowired
private UserContactDao userContactsDao;
@Autowired
- private MailHandler mailHandler;
- @Autowired
private TimezoneUtil timezoneUtil;
@Autowired
private ServerDao serverDao;
@Autowired
private ISlaveHTTPConnectionManager slaveHTTPConnectionManager;
- @Autowired
- private LabelDao labelDao;
/**
* get user by id, admin only
@@ -153,8 +139,8 @@ public class UserService implements IUse
return true;
}
String scopeName = "hibernate";
- if (rcl.getRoom_id() != null) {
- scopeName =
rcl.getRoom_id().toString();
+ if (rcl.getRoomId() != null) {
+ scopeName =
rcl.getRoomId().toString();
}
IScope currentScope =
scopeApplicationAdapter.getRoomScope(scopeName);
@@ -192,7 +178,7 @@ public class UserService implements IUse
us.setTimeZoneId(timezoneUtil.getTimezoneByInternalJName(jname).getID());
us.setForceTimeZoneCheck(false);
- us.setUpdatetime(new Date());
+ us.setUpdated(new Date());
userDao.update(us, users_id);
@@ -268,22 +254,6 @@ public class UserService implements IUse
return null;
}
- private Date createCalendarDate(TimeZone timezone, String dateOnly,
- String time) {
- Integer hour = Integer.valueOf(time.substring(0, 2)).intValue();
- Integer minute = Integer.valueOf(time.substring(3,
5)).intValue();
-
- log.info("createCalendar Hour: " + hour);
- log.info("createCalendar Minute: " + minute);
-
- Calendar cal = TimezoneUtil.getCalendarInTimezone(dateOnly,
timezone);
- cal.set(Calendar.HOUR_OF_DAY, hour);
- cal.set(Calendar.MINUTE, minute);
- cal.set(Calendar.SECOND, 0);
- cal.set(Calendar.MILLISECOND, 0);
-
- return cal.getTime();
- }
/* TODO FIXME should replaced by wicket component
public Long composeMail(String SID, List<String> recipients,
@@ -432,8 +402,8 @@ public class UserService implements IUse
return true;
}
String scopeName = "hibernate";
- if (rcl.getRoom_id() != null) {
- scopeName = rcl.getRoom_id().toString();
+ if (rcl.getRoomId() != null) {
+ scopeName = rcl.getRoomId().toString();
}
IScope currentScope =
this.scopeApplicationAdapter
.getRoomScope(scopeName);
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
Tue Nov 10 02:59:26 2015
@@ -80,7 +80,7 @@ public class WhiteBoardService implement
String streamid = current.getClient().getId();
Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
Long whiteBoardId = this.whiteBoardObjectListManagerById
.getNewWhiteboardId(room_id);
@@ -99,7 +99,7 @@ public class WhiteBoardService implement
String streamid = current.getClient().getId();
Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
WhiteboardObjectList whiteboardObjectList =
this.whiteBoardObjectListManagerById
.getWhiteBoardObjectListByRoomId(room_id);
@@ -141,7 +141,7 @@ public class WhiteBoardService implement
String streamid = current.getClient().getId();
Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
log.debug("getRoomItems: " + room_id);
WhiteboardObjectList whiteboardObjectList =
this.whiteBoardObjectListManagerById
@@ -340,7 +340,7 @@ public class WhiteBoardService implement
String streamid = current.getClient().getId();
Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
WhiteboardSyncLockObject wSyncLockObject = new
WhiteboardSyncLockObject();
wSyncLockObject.setAddtime(new Date());
@@ -375,7 +375,7 @@ public class WhiteBoardService implement
String streamid = current.getClient().getId();
Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
Map<String, WhiteboardSyncLockObject> syncListRoom =
this.whiteBoardObjectListManager
.getWhiteBoardSyncListByRoomid(room_id);
@@ -439,7 +439,7 @@ public class WhiteBoardService implement
String streamid = current.getClient().getId();
Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
WhiteboardSyncLockObject wSyncLockObject = new
WhiteboardSyncLockObject();
wSyncLockObject.setAddtime(new Date());
@@ -474,7 +474,7 @@ public class WhiteBoardService implement
String streamid = current.getClient().getId();
Client currentClient = this.sessionManager
.getClientByStreamId(streamid, null);
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
Map<String, WhiteboardSyncLockObject> syncListImage =
this.whiteBoardObjectListManager
.getWhiteBoardObjectSyncListByRoomAndObjectId(room_id,
@@ -527,7 +527,7 @@ public class WhiteBoardService implement
Client currentClient) {
try {
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
// TODO: Maybe we should also check all rooms,
independent from the
// current room_id if there is any user registered
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Tue Nov 10 02:59:26 2015
@@ -183,15 +183,15 @@ public class ScopeApplicationAdapter ext
if (map.containsKey("screenClient")) {
//TODO add check for room rights
String parentSid = (String)map.get("parentSid");
-
rcm.setRoom_id(Long.parseLong(conn.getScope().getName()));
+
rcm.setRoomId(Long.parseLong(conn.getScope().getName()));
rcm.setScreenClient(true);
SessionVariablesUtil.setIsScreenClient(conn.getClient());
-
rcm.setUser_id(((Integer)map.get("userId")).longValue());
- SessionVariablesUtil.setUserId(conn.getClient(),
rcm.getUser_id());
+ rcm.setUserId(((Integer)map.get("userId")).longValue());
+ SessionVariablesUtil.setUserId(conn.getClient(),
rcm.getUserId());
rcm.setStreamPublishName(parentSid);
- User u = usersDao.get(rcm.getUser_id() < 0 ?
-rcm.getUser_id() : rcm.getUser_id());
+ User u = usersDao.get(rcm.getUserId() < 0 ?
-rcm.getUserId() : rcm.getUserId());
rcm.setUsername(u.getLogin());
rcm.setFirstname(u.getFirstname());
rcm.setLastname(u.getLastname());
@@ -201,7 +201,7 @@ public class ScopeApplicationAdapter ext
// Log the User
conferenceLogDao.addConferenceLog(ConferenceLog.Type.clientConnect,
- rcm.getUser_id(), streamId, null,
rcm.getUserip(),
+ rcm.getUserId(), streamId, null,
rcm.getUserip(),
rcm.getScope());
return true;
}
@@ -273,7 +273,7 @@ public class ScopeApplicationAdapter ext
Client currentClient =
sessionManager.getClientByStreamId(streamid, null);
- for (Client rcl :
sessionManager.getClientListByRoomAll(currentClient.getRoom_id())) {
+ for (Client rcl :
sessionManager.getClientListByRoomAll(currentClient.getRoomId())) {
if (rcl.isStartStreaming()) {
screenSharerList.add(rcl);
}
@@ -304,7 +304,7 @@ public class ScopeApplicationAdapter ext
if (client != null) {
boolean startRecording = Boolean.valueOf("" +
map.get("startRecording"));
boolean startStreaming = Boolean.valueOf("" +
map.get("startStreaming"));
- boolean startPublishing = Boolean.valueOf("" +
map.get("startPublishing")) && (0 ==
sessionManager.getPublishingCount(client.getRoom_id()));
+ boolean startPublishing = Boolean.valueOf("" +
map.get("startPublishing")) && (0 ==
sessionManager.getPublishingCount(client.getRoomId()));
boolean alreadyStreaming =
client.isStartStreaming();
if (startStreaming) {
@@ -504,11 +504,11 @@ public class ScopeApplicationAdapter ext
public void roomLeaveByScope(Client currentClient, IScope currentScope,
boolean removeUserFromSessionList) {
try {
log.debug("currentClient " + currentClient);
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
// Log the User
conferenceLogDao.addConferenceLog(ConferenceLog.Type.roomLeave,
- currentClient.getUser_id(),
currentClient.getStreamid(),
+ currentClient.getUserId(),
currentClient.getStreamid(),
room_id, currentClient.getUserip(), "");
// Remove User from Sync List's
@@ -651,7 +651,7 @@ public class ScopeApplicationAdapter ext
}
if (rcl.getIsRecording()) {
log.debug("RCL getIsRecording
newStream SEND");
-
flvRecorderService.addRecordingByStreamId(current, streamid, currentClient,
rcl.getFlvRecordingId());
+
flvRecorderService.addRecordingByStreamId(current, streamid, currentClient,
rcl.getRecordingId());
}
if (rcl.isAvClient()) {
log.debug("RCL getIsAVClient
newStream SEND");
@@ -799,7 +799,7 @@ public class ScopeApplicationAdapter ext
if (currentClient == null) {
return -1L;
}
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
currentClient.setIsMod(true);
// Put the mod-flag to true for this client
@@ -841,7 +841,7 @@ public class ScopeApplicationAdapter ext
if (currentClient == null) {
return -1L;
}
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
currentClient.setIsMod(false);
// Put the mod-flag to true for this client
@@ -977,13 +977,13 @@ public class ScopeApplicationAdapter ext
Client currentClient =
sessionManager.getClientByPublicSID(publicSID, false, null);
- List<Client> currentModList =
sessionManager.getCurrentModeratorByRoom(currentClient.getRoom_id());
+ List<Client> currentModList =
sessionManager.getCurrentModeratorByRoom(currentClient.getRoomId());
if (currentModList.size() > 0) {
return 2L;
} else {
// No moderator in this room at the moment
- Room room =
roomDao.get(currentClient.getRoom_id());
+ Room room =
roomDao.get(currentClient.getRoomId());
return room.isModerated() ? 3L : 1L;
}
@@ -1042,12 +1042,12 @@ public class ScopeApplicationAdapter ext
Client parentClient =
sessionManager.getClientByPublicSID(publicSID, false, null);
Client currentClient =
sessionManager.getClientByStreamId(streamid, null);
currentClient.setAvsettings(avsettings);
- currentClient.setRoom_id(room_id);
+ currentClient.setRoomId(room_id);
currentClient.setPublicSID(publicSID);
currentClient.setVWidth(vWidth);
currentClient.setVHeight(vHeight);
currentClient.setInterviewPodId(interviewPodId);
- currentClient.setUser_id(parentClient.getUser_id());
+ currentClient.setUserId(parentClient.getUserId());
currentClient.setLastname(parentClient.getLastname());
currentClient.setFirstname(parentClient.getFirstname());
currentClient.setPicture_uri(parentClient.getPicture_uri());
@@ -1142,7 +1142,7 @@ public class ScopeApplicationAdapter ext
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
Client currentClient =
sessionManager.getClientByStreamId(streamid, null);
- currentClient.setRoom_id(roomId);
+ currentClient.setRoomId(roomId);
currentClient.setRoomEnter(new Date());
currentClient.setOrganization_id(organization_id);
@@ -1150,8 +1150,8 @@ public class ScopeApplicationAdapter ext
// Inject externalUserId if nothing is set yet
if (currentClient.getExternalUserId() == null) {
- if (currentClient.getUser_id() != null) {
- User us =
usersDao.get(currentClient.getUser_id());
+ if (currentClient.getUserId() != null) {
+ User us =
usersDao.get(currentClient.getUserId());
if (us != null) {
currentClient.setExternalUserId(us.getExternalId());
currentClient.setExternalUserType(us.getExternalType());
@@ -1171,7 +1171,7 @@ public class ScopeApplicationAdapter ext
// Log the User
conferenceLogDao.addConferenceLog(ConferenceLog.Type.roomEnter,
- currentClient.getUser_id(), streamid,
roomId,
+ currentClient.getUserId(), streamid,
roomId,
currentClient.getUserip(), "");
// Check for Moderation LogicalRoom ENTER
@@ -1207,7 +1207,7 @@ public class ScopeApplicationAdapter ext
// Update the Client List
sessionManager.updateClientByStreamId(streamid, currentClient, false, null);
- List<Client> modRoomList =
sessionManager.getCurrentModeratorByRoom(currentClient.getRoom_id());
+ List<Client> modRoomList =
sessionManager.getCurrentModeratorByRoom(currentClient.getRoomId());
//Sync message to everybody
sendMessageToCurrentScope("setNewModeratorByList", modRoomList, false);
@@ -1234,7 +1234,7 @@ public class ScopeApplicationAdapter ext
// Update the Client
List
sessionManager.updateClientByStreamId(streamid, currentClient, false, null);
- List<Client>
modRoomList =
sessionManager.getCurrentModeratorByRoom(currentClient.getRoom_id());
+ List<Client>
modRoomList =
sessionManager.getCurrentModeratorByRoom(currentClient.getRoomId());
// There is a need to
send an extra Event here,
// cause at this moment
there could be
@@ -1258,7 +1258,7 @@ public class ScopeApplicationAdapter ext
Appointment ment =
appointmentDao.getByRoom(roomId);
- Long userIdInRoomClient =
currentClient.getUser_id();
+ Long userIdInRoomClient =
currentClient.getUserId();
boolean found = false;
boolean moderator_set = false;
@@ -1274,7 +1274,7 @@ public class ScopeApplicationAdapter ext
// Update the Client List
sessionManager.updateClientByStreamId(streamid, currentClient, false, null);
- List<Client> modRoomList =
sessionManager.getCurrentModeratorByRoom(currentClient.getRoom_id());
+ List<Client> modRoomList =
sessionManager.getCurrentModeratorByRoom(currentClient.getRoomId());
// There is a need to send an extra
Event here, cause at this moment
// there could be already somebody in
the Room waiting
@@ -1319,7 +1319,7 @@ public class ScopeApplicationAdapter ext
// Update the Client List
sessionManager.updateClientByStreamId(streamid, currentClient, false, null);
- List<Client> modRoomList =
sessionManager.getCurrentModeratorByRoom(currentClient.getRoom_id());
+ List<Client> modRoomList =
sessionManager.getCurrentModeratorByRoom(currentClient.getRoomId());
// There is a need to send an
extra Event here, cause at
// this moment there could be
@@ -1424,7 +1424,7 @@ public class ScopeApplicationAdapter ext
Client currentClient =
sessionManager.getClientByStreamId(streamid, null);
currentClient.setUsername(username);
- currentClient.setUser_id(userId);
+ currentClient.setUserId(userId);
SessionVariablesUtil.setUserId(current.getClient(),
userId);
currentClient.setUserObject(userId, username,
firstname, lastname);
@@ -1492,7 +1492,7 @@ public class ScopeApplicationAdapter ext
try {
IConnection current = Red5.getConnectionLocal();
Client currentClient =
sessionManager.getClientByStreamId(current.getClient().getId(), null);
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
return
sessionManager.getCurrentModeratorByRoom(room_id);
} catch (Exception err) {
log.error("[getCurrentModerator]", err);
@@ -1529,7 +1529,7 @@ public class ScopeApplicationAdapter ext
return;
}
- Long room_id = currentClient.getRoom_id();
+ Long room_id = currentClient.getRoomId();
// log.debug("***** sendVars: " + whiteboardObj);
@@ -1949,8 +1949,8 @@ public class ScopeApplicationAdapter ext
}
// default Scope Name
String scopeName = "hibernate";
- if (currentClient.getRoom_id() != null) {
- scopeName =
currentClient.getRoom_id().toString();
+ if (currentClient.getRoomId() != null) {
+ scopeName =
currentClient.getRoomId().toString();
}
IScope scopeHibernate =
webAppKeyScope.getScope(scopeName);
@@ -2001,8 +2001,8 @@ public class ScopeApplicationAdapter ext
} else {
// default Scope Name
String scopeName = "hibernate";
- if (currentClient.getRoom_id() != null) {
- scopeName =
currentClient.getRoom_id().toString();
+ if (currentClient.getRoomId() != null) {
+ scopeName =
currentClient.getRoomId().toString();
}
IScope globalScope =
getContext().getGlobalScope();
@@ -2142,8 +2142,8 @@ public class ScopeApplicationAdapter ext
Client rcl =
sessionManager.getClientByStreamId(conn.getClient().getId(), null);
if (rcl != null && rcl.getIsRecording() != null &&
rcl.getIsRecording()) {
rcl.setIsRecording(false);
- flvRecordingId = rcl.getFlvRecordingId();
- rcl.setFlvRecordingId(null);
+ flvRecordingId = rcl.getRecordingId();
+ rcl.setRecordingId(null);
// Reset the Recording Flag to Record all
// Participants that enter later
@@ -2172,7 +2172,7 @@ public class ScopeApplicationAdapter ext
private Boolean _stopInterviewRecording(Client currentClient, IScope
currentScope) {
try {
log.debug("----------- stopInterviewRecording");
- Long flvRecordingId = currentClient.getFlvRecordingId();
+ Long flvRecordingId = currentClient.getRecordingId();
for (IConnection conn :
currentScope.getClientConnections()) {
Long recordingId = checkRecordingClient(conn);
@@ -2211,7 +2211,7 @@ public class ScopeApplicationAdapter ext
IConnection current = Red5.getConnectionLocal();
Client currentClient =
sessionManager.getClientByStreamId(current.getClient().getId(), null);
- return
sessionManager.getClientListByRoom(currentClient.getRoom_id());
+ return
sessionManager.getClientListByRoom(currentClient.getRoomId());
} catch (Exception err) {
log.debug("[getClientListScope]", err);
}
@@ -2285,7 +2285,7 @@ public class ScopeApplicationAdapter ext
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
Client client = sessionManager.getClientByStreamId(streamid, null);
- Long roomId = client.getRoom_id();
+ Long roomId = client.getRoomId();
Integer count = roomManager.getSipConferenceMembersNumber(roomId);
String newNumber = getSipTransportLastname(roomId, count);
log.debug("getSipConferenceMembersNumber: " + newNumber);
@@ -2293,7 +2293,7 @@ public class ScopeApplicationAdapter ext
client.setLastname(newNumber);
sessionManager.updateClientByStreamId(streamid, client, false,
null);
log.debug("updateSipTransport: {}, {}, {}, {}, {}", new
Object[]{client.getPublicSID(),
- client.getRoom_id(), client.getFirstname(),
client.getLastname(), client.getAvsettings()});
+ client.getRoomId(), client.getFirstname(),
client.getLastname(), client.getAvsettings()});
sendMessageWithClient(new
String[]{"personal",client.getFirstname(),client.getLastname()});
}
return count != null && count > 0 ? count - 1 : 0;
@@ -2308,7 +2308,7 @@ public class ScopeApplicationAdapter ext
String streamid = current.getClient().getId();
Client currentClient =
sessionManager.getClientByStreamId(streamid, null);
try {
- String sipNumber =
getSipNumber(currentClient.getRoom_id());
+ String sipNumber =
getSipNumber(currentClient.getRoomId());
log.debug("asterisk -rx \"originate Local/" + number +
"@rooms-out extension " + sipNumber + "@rooms-originate\"");
Runtime.getRuntime().exec(new String[] { "asterisk",
"-rx", "originate Local/" + number + "@rooms-out extension " + sipNumber +
"@rooms-originate" });
} catch (IOException e) {
@@ -2333,7 +2333,7 @@ public class ScopeApplicationAdapter ext
// Notify all clients of the same scope (room)
Client currentClient =
sessionManager.getClientByStreamId(streamid, null);
currentClient.setSipTransport(true);
- currentClient.setRoom_id(room_id);
+ currentClient.setRoomId(room_id);
currentClient.setRoomEnter(new Date());
currentClient.setFirstname("SIP Transport");
currentClient.setLastname(getSipTransportLastname(room_id));
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java
Tue Nov 10 02:59:26 2015
@@ -153,7 +153,7 @@ public class ScreenController {
if (rc == null) {
throw new Exception("Port is empty");
}
- Long roomId = rc.getRoom_id();
+ Long roomId = rc.getRoomId();
if (roomId == null) {
throw new Exception("Client has no room " + rc);
}
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java
Tue Nov 10 02:59:26 2015
@@ -327,7 +327,7 @@ public class UploadController extends Ab
String pictureuri = completeName.getName();
User us = usersDao.get(userId);
- us.setUpdatetime(new java.util.Date());
+ us.setUpdated(new java.util.Date());
us.setPictureuri(pictureuri);
usersDao.update(us, userId);
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java
Tue Nov 10 02:59:26 2015
@@ -109,7 +109,7 @@ public class HashMapStore implements ICl
public List<Client> getClientsByUserId(Server server, Long userId) {
List<Client> clientList = new ArrayList<Client>();
for (Client cl : clientsByStreamId.values()) {
- if (cl.getUser_id().equals(userId)) {
+ if (cl.getUserId().equals(userId)) {
clientList.add(cl);
}
}
@@ -119,7 +119,7 @@ public class HashMapStore implements ICl
public List<Client> getClientsByRoomId(Long roomId) {
List<Client> clientList = new ArrayList<Client>();
for (Client cl : clientsByStreamId.values()) {
- if (cl.getRoom_id() != null &&
cl.getRoom_id().equals(roomId)) {
+ if (cl.getRoomId() != null &&
cl.getRoomId().equals(roomId)) {
clientList.add(cl);
}
}
@@ -177,7 +177,7 @@ public class HashMapStore implements ICl
public List<Long> getRoomsIdsByServer(Server server) {
HashSet<Long> rooms = new HashSet<Long>();
for (Client cl : clientsByStreamId.values()) {
- Long roomId = cl.getRoom_id();
+ Long roomId = cl.getRoomId();
if (roomId != null && roomId > 0 &&
!rooms.contains(roomId)) {
rooms.add(roomId);
}
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java
Tue Nov 10 02:59:26 2015
@@ -44,7 +44,7 @@ public class NavigationDao {
public Naviglobal getGlobalMenuEntry(long globalId) {
try {
TypedQuery<Naviglobal> query =
em.createNamedQuery("getNavigationById", Naviglobal.class);
- query.setParameter("global_id", globalId);
+ query.setParameter("id", globalId);
return query.getSingleResult();
} catch (Exception ex2) {
log.error("getGlobalMenuEntry", ex2);
@@ -53,68 +53,58 @@ public class NavigationDao {
}
- public List<Naviglobal> getMainMenu(boolean admin, long USER_ID) {
+ public List<Naviglobal> getMainMenu(boolean admin) {
return em.createNamedQuery("getNavigation", Naviglobal.class)
- .setParameter("level_id", admin ? 3L : 1L)
+ .setParameter("levelId", admin ? 3L : 1L)
.getResultList();
}
- public void addGlobalStructure(String action, int naviorder, long
fieldvalues_id, boolean isleaf, boolean isopen, long level_id,
- String name, boolean deleted, Long
tooltip_fieldvalues_id) {
- try {
- Naviglobal ng = new Naviglobal();
- ng.setAction(action);
- ng.setComment("");
- ng.setIcon("");
- ng.setNaviorder(naviorder);
- ng.setFieldvalues_id(fieldvalues_id);
- ng.setIsleaf(isleaf);
- ng.setIsopen(isopen);
- ng.setDeleted(deleted);
- ng.setLevel_id(level_id);
- ng.setName(name);
- ng.setStarttime(new Date());
- ng.setTooltip_fieldvalues_id(tooltip_fieldvalues_id);
- // CriteriaBuilder crit = em.getCriteriaBuilder();
-
- em.merge(ng);
+ public void addGlobalStructure(String action, int naviorder, long
labelId, boolean isleaf, boolean isopen, long levelId,
+ String name, boolean deleted, Long tooltipLabelId) {
+ Naviglobal ng = new Naviglobal();
+ ng.setAction(action);
+ ng.setComment("");
+ ng.setIcon("");
+ ng.setNaviorder(naviorder);
+ ng.setLabelId(labelId);
+ ng.setIsleaf(isleaf);
+ ng.setIsopen(isopen);
+ ng.setDeleted(deleted);
+ ng.setLevelId(levelId);
+ ng.setName(name);
+ ng.setInserted(new Date());
+ ng.setTooltipLabelId(tooltipLabelId);
+ // CriteriaBuilder crit = em.getCriteriaBuilder();
- } catch (Exception ex2) {
- log.error("addGlobalStructure", ex2);
- }
+ em.persist(ng);
}
- public void addMainStructure(String action, String params, int
naviorder, long fieldvalues_id, boolean isleaf, boolean isopen,
- long level_id, String name, long global_id, boolean
deleted, Long tooltip_fieldvalues_id) {
- try {
- Naviglobal ng = getGlobalMenuEntry(global_id);
- List<Navimain> mainEntries = ng.getMainnavi();
- mainEntries = (mainEntries == null) ? new
ArrayList<Navimain>() : mainEntries;
-
- Navimain nm = new Navimain();
- nm.setAction(action);
- nm.setParams(params);
- nm.setComment("");
- nm.setIcon("");
- nm.setFieldvalues_id(fieldvalues_id);
- nm.setIsleaf(isleaf);
- nm.setNaviorder(naviorder);
- nm.setIsopen(isopen);
- nm.setLevel_id(level_id);
- nm.setName(name);
- nm.setDeleted(deleted);
- nm.setGlobal_id(global_id);
- nm.setStarttime(new Date());
- nm.setTooltip_fieldvalues_id(tooltip_fieldvalues_id);
-
- mainEntries.add(nm);
- ng.setMainnavi(mainEntries);
+ public void addMainStructure(String action, String params, int
naviorder, long labelId, boolean isleaf, boolean isopen,
+ long levelId, String name, long globalId, boolean
deleted, Long tooltipLabelId) {
+ Naviglobal ng = getGlobalMenuEntry(globalId);
+ List<Navimain> mainEntries = ng.getMainnavi();
+ mainEntries = (mainEntries == null) ? new ArrayList<Navimain>()
: mainEntries;
+
+ Navimain nm = new Navimain();
+ nm.setAction(action);
+ nm.setParams(params);
+ nm.setComment("");
+ nm.setIcon("");
+ nm.setLabelId(labelId);
+ nm.setIsleaf(isleaf);
+ nm.setNaviorder(naviorder);
+ nm.setIsopen(isopen);
+ nm.setLevelId(levelId);
+ nm.setName(name);
+ nm.setDeleted(deleted);
+ nm.setGlobalId(globalId);
+ nm.setInserted(new Date());
+ nm.setTooltipLabelId(tooltipLabelId);
- em.merge(ng);
+ mainEntries.add(nm);
+ ng.setMainnavi(mainEntries);
- } catch (Exception ex2) {
- log.error("addMainStructure", ex2);
- }
+ em.persist(ng);
}
}
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
Tue Nov 10 02:59:26 2015
@@ -29,14 +29,10 @@ import javax.persistence.PersistenceCont
import javax.persistence.Query;
import javax.persistence.TypedQuery;
-import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.room.Client;
-import org.apache.openmeetings.db.entity.room.PollType;
import org.apache.openmeetings.db.entity.room.RoomPoll;
import org.apache.openmeetings.db.entity.room.RoomPollAnswer;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@Transactional
@@ -45,87 +41,52 @@ public class PollDao {
@PersistenceContext
private EntityManager em;
- @Autowired
- private UserDao userDao;
- @Autowired
- private RoomDao roomDao;
-
- public Long addPollType(Long labelId, Boolean isNumeric) {
- log.debug("Adding poll type: " + labelId + ", " + isNumeric);
- PollType pt = new PollType();
- pt.setLabel(labelId);
- pt.setIsNumericAnswer(isNumeric);
-
- em.persist(pt);
-
- return pt.getPollTypesId();
- }
-
- public List<PollType> getPollTypes() {
- return em.createNamedQuery("getPollTypes", PollType.class)
- .getResultList();
- }
-
- public PollType getPollType(Long typeId) {
- TypedQuery<PollType> q = em.createNamedQuery("getPollType",
PollType.class);
- q.setParameter("pollTypesId", typeId);
- return q.getSingleResult();
- }
-
- public RoomPoll createPoll(Client rc, String pollName, String
pollQuestion, Long pollTypeId) {
- RoomPoll roomP = new RoomPoll();
-
- roomP.setCreatedBy(userDao.get(rc.getUser_id()));
- roomP.setCreated(new Date());
- roomP.setPollName(pollName);
- roomP.setPollQuestion(pollQuestion);
- roomP.setPollType(getPollType(pollTypeId));
- roomP.setRoom(roomDao.get(rc.getRoom_id()));
-
- em.persist(roomP);
- return roomP;
- }
-
- public void savePollBackup(RoomPoll rp) {
- em.persist(rp);
- }
-
- public RoomPoll updatePoll(RoomPoll rp) {
- return em.merge(rp);
+ public RoomPoll update(RoomPoll p) {
+ if (p.getId() == null) {
+ p.setCreated(new Date());
+ em.persist(p);
+ } else {
+ p = em.merge(p);
+ }
+ return p;
}
- public boolean closePoll(Long room_id){
+ public boolean close(Long roomId) {
try {
- log.debug(" :: closePoll :: ");
+ log.debug(" :: close :: ");
Query q = em.createNamedQuery("closePoll");
- q.setParameter("rooms_id", room_id);
+ q.setParameter("roomId", roomId);
q.setParameter("archived", true);
return q.executeUpdate() > 0;
} catch (Exception err) {
- log.error("[closePoll]", err);
+ log.error("[close]", err);
}
return false;
}
- public boolean deletePoll(Long poll_id){
+ public boolean delete(RoomPoll p) {
try {
- log.debug(" :: deletePoll :: ");
+ log.debug(" :: delete :: ");
Query q = em.createNamedQuery("deletePoll");
- q.setParameter("roomPollId", poll_id);
+ q.setParameter("id", p.getId());
return q.executeUpdate() > 0;
} catch (Exception err) {
- log.error("[deletePoll]", err);
+ log.error("[delete]", err);
}
return false;
}
- public RoomPoll getPoll(Long room_id) {
+ public RoomPoll get(Long id) {
+ List<RoomPoll> list = em.createNamedQuery("getPollById",
RoomPoll.class).setParameter("id", id).getResultList();
+ return list.isEmpty() ? null : list.get(0);
+ }
+
+ public RoomPoll getByRoom(Long roomId) {
try {
- log.debug(" :: getPoll :: " + room_id);
+ log.debug(" :: getPoll :: " + roomId);
TypedQuery<RoomPoll> q = em.createNamedQuery("getPoll",
RoomPoll.class);
- q.setParameter("room_id", room_id);
- q.setParameter("archived", false);
+ q.setParameter("roomId", roomId);
return q.getSingleResult();
} catch (NoResultException nre) {
//expected
@@ -135,38 +96,37 @@ public class PollDao {
return null;
}
- public List<RoomPoll> getPollListBackup() {
+ public List<RoomPoll> get() {
try {
TypedQuery<RoomPoll> q =
em.createNamedQuery("getPollListBackup", RoomPoll.class);
return q.getResultList();
} catch (NoResultException nre) {
//expected
} catch (Exception err) {
- log.error("[getPollListBackup]", err);
+ log.error("[get]", err);
}
return null;
}
- public List<RoomPoll> getArchivedPollList(Long room_id) {
+ public List<RoomPoll> getArchived(Long roomId) {
try {
- log.debug(" :: getArchivedPollList :: " + room_id);
+ log.debug(" :: getArchived :: " + roomId);
TypedQuery<RoomPoll> q =
em.createNamedQuery("getArchivedPollList",RoomPoll.class);
- q.setParameter("room_id", room_id);
- q.setParameter("archived", true);
+ q.setParameter("roomId", roomId);
return q.getResultList();
} catch (NoResultException nre) {
//expected
} catch (Exception err) {
- log.error("[getArchivedPollList]", err);
+ log.error("[getArchived]", err);
}
return null;
}
- public boolean hasPoll(Long room_id) {
+ public boolean hasPoll(Long roomId) {
try {
- log.debug(" :: hasPoll :: " + room_id);
+ log.debug(" :: hasPoll :: " + roomId);
TypedQuery<Long> q = em.createNamedQuery("hasPoll",
Long.class);
- q.setParameter("room_id", room_id);
+ q.setParameter("roomId", roomId);
q.setParameter("archived", false);
return q.getSingleResult() > 0;
} catch (NoResultException nre) {
@@ -177,13 +137,12 @@ public class PollDao {
return false;
}
- public boolean hasVoted(Long room_id, Long userid) {
+ public boolean hasVoted(Long roomId, Long userid) {
try {
- log.debug(" :: hasVoted :: " + room_id + ", " + userid);
+ log.debug(" :: hasVoted :: " + roomId + ", " + userid);
TypedQuery<RoomPollAnswer> q =
em.createNamedQuery("hasVoted", RoomPollAnswer.class);
- q.setParameter("room_id", room_id);
+ q.setParameter("roomId", roomId);
q.setParameter("userid", userid);
- q.setParameter("archived", false);
q.getSingleResult();
return true;
} catch (NoResultException nre) {
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
Tue Nov 10 02:59:26 2015
@@ -48,6 +48,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.Organisation_Users;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
+import org.apache.openmeetings.db.entity.user.User.Salutation;
import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.openmeetings.db.util.UserHelper;
@@ -99,7 +100,7 @@ public class UserDao implements IDataPro
*/
public User getNewUserInstance(User currentUser) {
User user = new User();
- user.setSalutations_id(1L); // TODO: Fix default selection to
be configurable
+ user.setSalutation(Salutation.mr); // TODO: Fix default
selection to be configurable
user.setRights(getDefaultRights());
user.setLanguageId(cfgDao.getConfValue(CONFIG_DEFAULT_LANG_KEY,
Long.class, "1"));
user.setTimeZoneId(timezoneUtil.getTimeZone(currentUser).getID());
@@ -211,10 +212,10 @@ public class UserDao implements IDataPro
if (u.getRegdate() == null) {
u.setRegdate(new Date());
}
- u.setStarttime(new Date());
+ u.setInserted(new Date());
em.persist(u);
} else {
- u.setUpdatetime(new Date());
+ u.setUpdated(new Date());
u = em.merge(u);
}
//this is necessary due to organisation details are lost on
update
@@ -281,7 +282,7 @@ public class UserDao implements IDataPro
}
us.setOrganisation_users(null);
us.setDeleted(true);
- us.setUpdatetime(new Date());
+ us.setUpdated(new Date());
us.setSipUser(null);
Address adr = us.getAddress();
if (adr != null) {
@@ -655,8 +656,8 @@ public class UserDao implements IDataPro
u.setRights(rights);
u.setLastlogin(new Date());
u.setLasttrans(new Long(0));
- u.setSalutations_id(1L);
- u.setStarttime(new Date());
+ u.setSalutation(Salutation.mr);
+ u.setInserted(new Date());
u.setActivatehash(hash);
u.setTimeZoneId(timezone.getID());
u.setForceTimeZoneCheck(forceTimeZoneCheck);
