You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/06/23 10:47:11 UTC
svn commit: r1604715 [1/7] - in /openmeetings/trunk/singlewebapp: ./
openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/
openmeetings-core/src/main/java/org/ap...
Author: solomax
Date: Mon Jun 23 08:47:06 2014
New Revision: 1604715
URL: http://svn.apache.org/r1604715
Log:
[OPENMEETINGS-1030] entities are partially updated; WB is added to room; wicket version is updated; code clean-up
Removed:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.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/FlvInterviewConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.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/documents/CreateLibraryPresentation.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.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/FLVRecorderService.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/UserService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/ServerNotInitializedException.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestChatParsing.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestConvertGifs.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentCategoryDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.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/label/FieldLanguageDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguagesValuesDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogTypeDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingLogDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDeltaDao.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/room/RoomDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.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/PrivateMessagesDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingContainerData.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingObject.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/dto/user/UserDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/IDataProviderEntity.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/Configuration.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.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/calendar/Appointment.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderTyps.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.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/label/FieldLanguage.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/Fieldvalues.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLogType.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaDelta.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/Invitation.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/PollType.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/room/RoomOrganisation.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/RoomPollAnswers.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Whiteboard.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/WhiteboardItem.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/OAuthServer.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/AsteriskSipUser.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation_Users.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.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/entity/user/UserContact.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.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/backup/AppointmentCategoryConverter.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/BackupImport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/LanguageImport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OrganisationConverter.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/RoomConverter.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/UserConverter.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmOption.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/BlankArea.java
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/MouseListenerable.java
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/NumberSpinner.java
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/geom/GeomPoint.java
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/SearchableDataView.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.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/MessageResolver.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/common/AddFolderDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmCallListener.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxLink.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.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/common/HeaderPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/OmOrderByBorder.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.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/BasePage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.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/calendar/AppointmentModel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/PrivateRoomsWidget.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/PrivateRoomsWidgetDescriptor.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/PrivateRoomsWidgetView.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.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/user/profile/UserSearchPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingErrorsDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingItemPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/AviRecordingResourceReference.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FlvRecordingResourceReference.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/JpgRecordingResourceReference.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/Mp4RecordingResourceReference.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OggRecordingResourceReference.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.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/openmeetings-applicationContext.xml
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/TestDatabaseStructureCategory.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/poll/TestPollManagement.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java Mon Jun 23 08:47:06 2014
@@ -125,7 +125,7 @@ public abstract class BaseConverter {
List<String> listOfFullWaveFiles, File streamFolder)
{
stripAudioFirstPass(flvRecording, returnLog, listOfFullWaveFiles, streamFolder
- , metaDataDao.getAudioMetaDataByRecording(flvRecording.getFlvRecordingId()));
+ , metaDataDao.getAudioMetaDataByRecording(flvRecording.getId()));
}
private String[] addSoxPad(List<ConverterProcessResult> returnLog, String job, double length, double position, String inFile, String outFile) {
@@ -155,8 +155,8 @@ public abstract class BaseConverter {
public static void printMetaInfo(FlvRecordingMetaData metaData, String prefix) {
if (log.isDebugEnabled()) {
- log.debug(String.format("### %s:: recording id %s; stream with id %s; current status: %s ", prefix, metaData.getFlvRecording().getFlvRecordingId()
- , metaData.getFlvRecordingMetaDataId(), metaData.getStreamStatus()));
+ log.debug(String.format("### %s:: recording id %s; stream with id %s; current status: %s ", prefix, metaData.getFlvRecording().getId()
+ , metaData.getId(), metaData.getStreamStatus()));
File metaFlv = getMetaFlv(metaData);
File metaSer = getMetaFlvSer(metaData);
log.debug(String.format("### %s:: Flv file [%s] exists ? %s; size: %s, lastModified: %s ", prefix, metaFlv.getPath(), metaFlv.exists(), metaFlv.length(), metaFlv.lastModified()));
@@ -230,7 +230,7 @@ public abstract class BaseConverter {
log.debug("###################################################");
for (FlvRecordingMetaData metaData : metaDataList) {
- long metaId = metaData.getFlvRecordingMetaDataId();
+ long metaId = metaData.getId();
log.debug("### processing metadata: " + metaId);
if (metaData.getStreamStatus() == Status.NONE) {
log.debug("Stream has not been started, error in recording " + metaId);
@@ -294,7 +294,7 @@ public abstract class BaseConverter {
}
if (argv_sox != null) {
- log.debug("START fillGap ################# Delta-ID :: " + metaDelta.getFlvRecordingMetaDeltaId());
+ log.debug("START fillGap ################# Delta-ID :: " + metaDelta.getId());
metaDeltaDao.updateFlvRecordingMetaDelta(metaDelta);
counter++;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java Mon Jun 23 08:47:06 2014
@@ -61,7 +61,7 @@ public class FlvExplorerConverter extend
try {
FileExplorerItem fileExplorerItem = fileExplorerItemDaoImpl.getFileExplorerItemsById(fileExplorerItemId);
- log.debug("fileExplorerItem " + fileExplorerItem.getFileExplorerItemId());
+ log.debug("fileExplorerItem " + fileExplorerItem.getId());
// Convert to FLV
return convertToFLV(fileExplorerItem, moviePath);
@@ -80,7 +80,7 @@ public class FlvExplorerConverter extend
private List<ConverterProcessResult> convertToFLV(FileExplorerItem fileExplorerItem, String moviePath) {
List<ConverterProcessResult> returnLog = new ArrayList<ConverterProcessResult>();
try {
- String name = "UPLOADFLV_" + fileExplorerItem.getFileExplorerItemId();
+ String name = "UPLOADFLV_" + fileExplorerItem.getId();
File outputFullFlv = new File(getStreamsHibernateDir(), name + ".flv");
fileExplorerItem.setIsVideo(true);
@@ -92,7 +92,7 @@ public class FlvExplorerConverter extend
// "-s", flvWidth + "x" + flvHeight,
ConverterProcessResult returnMapConvertFLV = ProcessHelper.executeScript("uploadFLV ID :: "
- + fileExplorerItem.getFileExplorerItemId(), argv_fullFLV);
+ + fileExplorerItem.getId(), argv_fullFLV);
//Parse the width height from the FFMPEG output
FlvDimension flvDimension = getFlvDimension(returnMapConvertFLV.getError());
@@ -105,7 +105,7 @@ public class FlvExplorerConverter extend
returnLog.add(returnMapConvertFLV);
- String hashFileFullNameJPEG = "UPLOADFLV_" + fileExplorerItem.getFileExplorerItemId() + ".jpg";
+ String hashFileFullNameJPEG = "UPLOADFLV_" + fileExplorerItem.getId() + ".jpg";
File outPutJpeg = new File(getStreamsHibernateDir(), name + ".jpg");
fileExplorerItem.setPreviewImage(hashFileFullNameJPEG);
@@ -115,9 +115,7 @@ public class FlvExplorerConverter extend
"-f", "rawvideo", "-s", flvWidth + "x" + flvHeight,
outPutJpeg.getCanonicalPath() };
- returnLog.add(ProcessHelper.executeScript("previewUpload ID :: "
- + fileExplorerItem.getFileExplorerItemId(),
- argv_previewFLV));
+ returnLog.add(ProcessHelper.executeScript("previewUpload ID :: " + fileExplorerItem.getId(), argv_previewFLV));
fileExplorerItemDaoImpl.updateFileOrFolder(fileExplorerItem);
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java Mon Jun 23 08:47:06 2014
@@ -118,19 +118,19 @@ public class FlvInterviewConverter exten
FlvRecording flvRecording = null;
try {
flvRecording = recordingDao.get(flvRecordingId);
- log.debug("flvRecording " + flvRecording.getFlvRecordingId());
+ log.debug("flvRecording " + flvRecording.getId());
List<ConverterProcessResult> returnLog = new ArrayList<ConverterProcessResult>();
List<String> listOfFullWaveFiles = new LinkedList<String>();
File streamFolder = getStreamFolder(flvRecording);
- List<FlvRecordingMetaData> metaDataList = metaDataDao.getAudioMetaDataByRecording(flvRecording.getFlvRecordingId());
+ List<FlvRecordingMetaData> metaDataList = metaDataDao.getAudioMetaDataByRecording(flvRecording.getId());
stripAudioFirstPass(flvRecording, returnLog, listOfFullWaveFiles, streamFolder, metaDataList);
// Merge Wave to Full Length
File streamFolderGeneral = getStreamsHibernateDir();
- String hashFileFullName = "INTERVIEW_" + flvRecording.getFlvRecordingId() + "_FINAL_WAVE.wav";
+ String hashFileFullName = "INTERVIEW_" + flvRecording.getId() + "_FINAL_WAVE.wav";
String outputFullWav = streamFolder.getAbsolutePath() + File.separatorChar + hashFileFullName;
deleteFileIfExists(outputFullWav);
@@ -239,7 +239,7 @@ public class FlvInterviewConverter exten
args.add("-qmax"); args.add("1");
args.add("-qmin"); args.add("1");
args.add("-y");
- String hashFileFullNameFlv = "flvRecording_" + flvRecording.getFlvRecordingId() + ".flv";
+ String hashFileFullNameFlv = "flvRecording_" + flvRecording.getId() + ".flv";
String outputFullFlv = new File(streamFolderGeneral, hashFileFullNameFlv).getCanonicalPath();
args.add(outputFullFlv);
// TODO additional flag to 'quiet' output should be added
@@ -254,7 +254,7 @@ public class FlvInterviewConverter exten
// ffmpeg -i movie.flv -vcodec mjpeg -vframes 1 -an -f rawvideo -s
// 320x240 movie.jpg
- String hashFileFullNameJPEG = "flvRecording_" + flvRecording.getFlvRecordingId() + ".jpg";
+ String hashFileFullNameJPEG = "flvRecording_" + flvRecording.getId() + ".jpg";
String outPutJpeg = new File(streamFolderGeneral, hashFileFullNameJPEG).getCanonicalPath();
deleteFileIfExists(outPutJpeg);
@@ -271,7 +271,7 @@ public class FlvInterviewConverter exten
returnLog.add(ProcessHelper.executeScript("generateFullFLV", argv_previewFLV));
- String alternateDownloadName = "flvRecording_" + flvRecording.getFlvRecordingId() + ".avi";
+ String alternateDownloadName = "flvRecording_" + flvRecording.getId() + ".avi";
String alternateDownloadFullName = new File(streamFolderGeneral, alternateDownloadName).getCanonicalPath();
deleteFileIfExists(alternateDownloadFullName);
@@ -285,7 +285,7 @@ public class FlvInterviewConverter exten
convertToMp4(flvRecording, returnLog);
flvRecording.setStatus(FlvRecording.Status.PROCESSED);
- logDao.deleteByRecordingId(flvRecording.getFlvRecordingId());
+ logDao.deleteByRecordingId(flvRecording.getId());
for (ConverterProcessResult returnMap : returnLog) {
logDao.addFLVRecordingLog("generateFFMPEG", flvRecording, returnMap);
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java Mon Jun 23 08:47:06 2014
@@ -60,23 +60,23 @@ public class FlvRecorderConverter extend
}
flvRecording = recordingDao.get(flvRecordingId);
- log.debug("flvRecording " + flvRecording.getFlvRecordingId());
+ log.debug("flvRecording " + flvRecording.getId());
List<ConverterProcessResult> returnLog = new ArrayList<ConverterProcessResult>();
List<String> listOfFullWaveFiles = new LinkedList<String>();
File streamFolder = getStreamFolder(flvRecording);
- FlvRecordingMetaData screenMetaData = metaDataDao.getScreenMetaDataByRecording(flvRecording.getFlvRecordingId());
+ FlvRecordingMetaData screenMetaData = metaDataDao.getScreenMetaDataByRecording(flvRecording.getId());
if (screenMetaData == null) {
- throw new Exception("screenMetaData is Null FlvRecordingId " + flvRecording.getFlvRecordingId());
+ throw new Exception("screenMetaData is Null FlvRecordingId " + flvRecording.getId());
}
if (screenMetaData.getStreamStatus() == Status.NONE) {
throw new Exception("Stream has not been started, error in recording");
}
- screenMetaData = waitForTheStream(screenMetaData.getFlvRecordingMetaDataId());
+ screenMetaData = waitForTheStream(screenMetaData.getId());
stripAudioFirstPass(flvRecording, returnLog, listOfFullWaveFiles, streamFolder);
@@ -112,7 +112,7 @@ public class FlvRecorderConverter extend
String inputScreenFullFlv = new File(streamFolder, screenMetaData.getStreamName() + ".flv")
.getCanonicalPath();
- String hashFileFullNameFlv = "flvRecording_" + flvRecording.getFlvRecordingId() + ".flv";
+ String hashFileFullNameFlv = "flvRecording_" + flvRecording.getId() + ".flv";
String outputFullFlv = streamFolderGeneralName + hashFileFullNameFlv;
// ffmpeg -vcodec flv -qscale 9.5 -r 25 -ar 22050 -ab 32k -s 320x240
@@ -154,7 +154,7 @@ public class FlvRecorderConverter extend
// ffmpeg -i movie.flv -vcodec mjpeg -vframes 1 -an -f rawvideo -s
// 320x240 movie.jpg
- String hashFileFullNameJPEG = "flvRecording_" + flvRecording.getFlvRecordingId() + ".jpg";
+ String hashFileFullNameJPEG = "flvRecording_" + flvRecording.getId() + ".jpg";
String outPutJpeg = streamFolderGeneralName + hashFileFullNameJPEG;
flvRecording.setPreviewImage(hashFileFullNameJPEG);
@@ -170,7 +170,7 @@ public class FlvRecorderConverter extend
returnLog.add(ProcessHelper.executeScript("previewFullFLV", argv_previewFLV));
- String alternateDownloadName = "flvRecording_" + flvRecording.getFlvRecordingId() + ".avi";
+ String alternateDownloadName = "flvRecording_" + flvRecording.getId() + ".avi";
String alternateDownloadFullName = streamFolderGeneralName + alternateDownloadName;
String[] argv_alternateDownload = new String[] { getPathToFFMPEG(), "-y", "-i", outputFullFlv, "-vcodec",
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java Mon Jun 23 08:47:06 2014
@@ -35,7 +35,6 @@ import javax.persistence.criteria.Criter
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
-import org.apache.openmeetings.core.data.basic.FieldManager;
import org.apache.openmeetings.db.dao.room.IRoomManager;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.room.RoomModeratorsDao;
@@ -73,8 +72,6 @@ public class RoomManager implements IRoo
private UserDao usersDao;
@Autowired
private ISessionManager sessionManager;
- @Autowired
- private FieldManager fieldManager;
@Autowired
private RoomDao roomDao;
@Autowired
@@ -134,7 +131,7 @@ public class RoomManager implements IRoo
asc);
for (Room room : rooms) {
- room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id()));
+ room.setCurrentusers(sessionManager.getClientListByRoom(room.getId()));
}
sResult.setResult(rooms);
@@ -151,7 +148,7 @@ public class RoomManager implements IRoo
asc);
for (Room room : rooms) {
- room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id()));
+ room.setCurrentusers(sessionManager.getClientListByRoom(room.getId()));
}
return rooms;
@@ -167,7 +164,7 @@ public class RoomManager implements IRoo
orderby, asc, externalRoomType);
for (Room room : rooms) {
- room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id()));
+ room.setCurrentusers(sessionManager.getClientListByRoom(room.getId()));
}
return rooms;
@@ -321,7 +318,7 @@ public class RoomManager implements IRoo
public List<RoomOrganisation> getOrganisationsByRoom(long rooms_id) {
try {
String hql = "select c from RoomOrganisation as c "
- + "where c.room.rooms_id = :rooms_id "
+ + "where c.room.id = :rooms_id "
+ "AND c.deleted <> :deleted";
TypedQuery<RoomOrganisation> q = em.createQuery(hql, RoomOrganisation.class);
@@ -350,7 +347,7 @@ public class RoomManager implements IRoo
if (i != 0) {
queryString += " OR ";
}
- queryString += " r.rooms_id = " + room_id;
+ queryString += " r.id = " + room_id;
i++;
}
@@ -478,11 +475,11 @@ public class RoomManager implements IRoo
}
if (roomModerators != null) {
- r.setModerators(getModerators(roomModerators, r.getRooms_id()));
+ r.setModerators(getModerators(roomModerators, r.getId()));
r = roomDao.update(r, ownerId);
}
- return r.getRooms_id();
+ return r.getId();
} catch (Exception ex2) {
log.error("[addRoom] ", ex2);
}
@@ -543,7 +540,7 @@ public class RoomManager implements IRoo
r = em.merge(r);
- long returnId = r.getRooms_id();
+ long returnId = r.getId();
if (organisations != null) {
Long t = this.updateRoomOrganisations(organisations, r);
@@ -553,7 +550,7 @@ public class RoomManager implements IRoo
}
if (roomModerators != null) {
- r.setModerators(getModerators(roomModerators, r.getRooms_id()));
+ r.setModerators(getModerators(roomModerators, r.getId()));
r = roomDao.update(r, null);
}
@@ -583,7 +580,7 @@ public class RoomManager implements IRoo
rOrganisation.setDeleted(false);
rOrganisation = em.merge(rOrganisation);
- long returnId = rOrganisation.getRooms_organisation_id();
+ long returnId = rOrganisation.getId();
return returnId;
} catch (Exception ex2) {
log.error("[addRoomToOrganisation] ", ex2);
@@ -592,33 +589,6 @@ public class RoomManager implements IRoo
}
/**
- *
- * @param rooms_organisation_id
- * @return
- */
- public RoomOrganisation getRoomsOrganisationById(
- long rooms_organisation_id) {
- try {
- CriteriaBuilder cb = em.getCriteriaBuilder();
- CriteriaQuery<RoomOrganisation> cq = cb
- .createQuery(RoomOrganisation.class);
- Root<RoomOrganisation> c = cq.from(RoomOrganisation.class);
- Predicate condition = cb.equal(c.get("rooms_organisation_id"),
- rooms_organisation_id);
- cq.where(condition);
- TypedQuery<RoomOrganisation> q = em.createQuery(cq);
- List<RoomOrganisation> ll = q.getResultList();
-
- if (ll.size() > 0) {
- return ll.get(0);
- }
- } catch (Exception ex2) {
- log.error("[getRoomsByOrganisation] ", ex2);
- }
- return null;
- }
-
- /**
* get List of Rooms_Organisation by organisation and roomtype
*
* @param user_level
@@ -659,7 +629,6 @@ public class RoomManager implements IRoo
return ll;
} catch (Exception ex2) {
log.error("[getPublicRoomsWithoutType] ", ex2);
- ex2.printStackTrace();
}
return null;
}
@@ -708,9 +677,7 @@ public class RoomManager implements IRoo
long organisation_id, 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 <> :deleted";
+ String hql = "select c from RoomOrganisation as c where c.organisation.id = :organisation_id AND c.deleted <> :deleted";
if (orderby.startsWith("c.")) {
hql += "ORDER BY " + orderby;
} else {
@@ -837,11 +804,11 @@ public class RoomManager implements IRoo
}
}
if (roomModerators != null) {
- r.setModerators(getModerators(roomModerators, r.getRooms_id()));
+ r.setModerators(getModerators(roomModerators, r.getId()));
r = roomDao.update(r, null);
}
- return r.getRooms_id();
+ return r.getId();
} catch (Exception ex2) {
log.error("[updateRoom] ", ex2);
}
@@ -853,7 +820,7 @@ public class RoomManager implements IRoo
throws Exception {
for (Iterator it = organisations.iterator(); it.hasNext();) {
RoomOrganisation rOrganisation = (RoomOrganisation) it.next();
- if (rOrganisation.getOrganisation().getOrganisation_id()
+ if (rOrganisation.getOrganisation().getId()
.equals(orgid))
return true;
}
@@ -871,7 +838,7 @@ public class RoomManager implements IRoo
}
private Long updateRoomOrganisations(List<Integer> organisations, Room room) throws Exception {
- List<RoomOrganisation> roomOrganisations = getOrganisationsByRoom(room.getRooms_id());
+ List<RoomOrganisation> roomOrganisations = getOrganisationsByRoom(room.getId());
List<Long> roomsToAdd = new LinkedList<Long>();
List<Long> roomsToDel = new LinkedList<Long>();
@@ -886,7 +853,7 @@ public class RoomManager implements IRoo
for (Iterator<RoomOrganisation> it = roomOrganisations.iterator(); it.hasNext();) {
RoomOrganisation rOrganisation = it.next();
Long orgIdToDel = rOrganisation.getOrganisation()
- .getOrganisation_id();
+ .getId();
if (!this.checkRoomShouldByDeleted(orgIdToDel, organisations))
roomsToDel.add(orgIdToDel);
}
@@ -896,11 +863,11 @@ public class RoomManager implements IRoo
for (Iterator<Long> it = roomsToAdd.iterator(); it.hasNext();) {
Long orgIdToAdd = it.next();
- addRoomToOrganisation(room.getRooms_id(), orgIdToAdd);
+ addRoomToOrganisation(room.getId(), orgIdToAdd);
}
for (Iterator<Long> it = roomsToDel.iterator(); it.hasNext();) {
Long orgToDel = it.next();
- deleteRoomFromOrganisationByRoomAndOrganisation(room.getRooms_id(), orgToDel);
+ deleteRoomFromOrganisationByRoomAndOrganisation(room.getId(), orgToDel);
}
return new Long(1);
@@ -955,22 +922,6 @@ public class RoomManager implements IRoo
}
}
- /**
- * Delete a Rooms_Organisation by its id
- *
- * @param rooms_organisation_id
- */
- public Long deleteRoomsOrganisationByID(long rooms_organisation_id) {
- try {
- RoomOrganisation rOrg = this
- .getRoomsOrganisationById(rooms_organisation_id);
- return this.deleteRoomsOrganisation(rOrg);
- } catch (Exception ex2) {
- log.error("[deleteRoomsOrganisationByID] ", ex2);
- }
- return null;
- }
-
private Long deleteRoomFromOrganisationByRoomAndOrganisation(long rooms_id,
long organisation_id) {
try {
@@ -993,14 +944,14 @@ public class RoomManager implements IRoo
try {
rOrg.setDeleted(true);
rOrg.setUpdatetime(new Date());
- if (rOrg.getRooms_organisation_id() == null) {
+ if (rOrg.getId() == null) {
em.persist(rOrg);
} else {
if (!em.contains(rOrg)) {
em.merge(rOrg);
}
}
- return rOrg.getRooms_organisation_id();
+ return rOrg.getId();
} catch (Exception ex2) {
log.error("[deleteRoomsOrganisation] ", ex2);
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java Mon Jun 23 08:47:06 2014
@@ -74,8 +74,7 @@ public class FileUtils {
fileExplorerItemDao.updateFileOrFolder(fileExplorerItem);
FileExplorerItem[] childElements = fileExplorerItemDao
- .getFileExplorerItemsByParent(fileExplorerItem
- .getFileExplorerItemId());
+ .getFileExplorerItemsByParent(fileExplorerItem.getId());
for (FileExplorerItem childExplorerItem : childElements) {
@@ -102,8 +101,7 @@ public class FileUtils {
fileExplorerItemDao.updateFileOrFolder(fileExplorerItem);
FileExplorerItem[] childElements = fileExplorerItemDao
- .getFileExplorerItemsByParent(fileExplorerItem
- .getFileExplorerItemId());
+ .getFileExplorerItemsByParent(fileExplorerItem.getId());
for (FileExplorerItem childExplorerItem : childElements) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java Mon Jun 23 08:47:06 2014
@@ -19,6 +19,7 @@
package org.apache.openmeetings.core.documents;
import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
import java.io.FileOutputStream;
@@ -31,8 +32,12 @@ import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.io.XMLWriter;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
public class CreateLibraryPresentation {
+ private static final Logger log = Red5LoggerFactory.getLogger(CreateLibraryPresentation.class, webAppRootKey);
+
public static ConverterProcessResult generateXMLDocument(File targetDirectory, String originalDocument,
String pdfDocument, String swfDocument){
ConverterProcessResult returnMap = new ConverterProcessResult();
@@ -99,7 +104,7 @@ public class CreateLibraryPresentation {
return returnMap;
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error while generateXMLDocument", err);
returnMap.setError(err.getMessage());
returnMap.setExitValue("-1");
return returnMap;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java Mon Jun 23 08:47:06 2014
@@ -229,7 +229,6 @@ public class MailHandler {
m.setErrorCount(m.getErrorCount() + 1);
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
- e.printStackTrace(pw);
pw.close();
m.setLastError(sw.getBuffer().toString());
m.setStatus(m.getErrorCount() < MAXIMUM_ERROR_COUNT ? Status.NONE : Status.ERROR);
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java Mon Jun 23 08:47:06 2014
@@ -119,7 +119,7 @@ public class ConferenceService {
if (!orgRoom.getRoom().getAppointment()) {
orgRoom.getRoom().setCurrentusers(
this.getRoomClientsListByRoomId(orgRoom.getRoom()
- .getRooms_id()));
+ .getId()));
filtered.add(orgRoom);
}
}
@@ -140,7 +140,7 @@ public class ConferenceService {
List<RoomOrganisation> roomOrgsList = roomManager.getRoomsOrganisationByOrganisationId(organisation_id);
for (RoomOrganisation roomOrg : roomOrgsList) {
- roomOrg.getRoom().setCurrentusers(sessionManager.getClientListByRoom(roomOrg.getRoom().getRooms_id()));
+ roomOrg.getRoom().setCurrentusers(sessionManager.getClientListByRoom(roomOrg.getRoom().getId()));
}
return roomOrgsList;
@@ -196,7 +196,7 @@ public class ConferenceService {
if (!rooms.getAppointment()) {
rooms.setCurrentusers(this.getRoomClientsListByRoomId(rooms
- .getRooms_id()));
+ .getId()));
filtered.add(rooms);
}
}
@@ -218,7 +218,7 @@ public class ConferenceService {
List<Room> roomList = roomDao.getPublicRooms();
for (Room room : roomList) {
- room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id()));
+ room.setCurrentusers(sessionManager.getClientListByRoom(room.getId()));
}
return roomList;
@@ -339,7 +339,7 @@ public class ConferenceService {
for (int i = 0; i < points.size(); i++) {
Appointment ment = points.get(i);
- Long rooms_id = ment.getRoom().getRooms_id();
+ Long rooms_id = ment.getRoom().getId();
Room rooom = roomDao.get(rooms_id);
if (!rooom.getRoomtype().getRoomtypes_id()
@@ -347,7 +347,7 @@ public class ConferenceService {
continue;
rooom.setCurrentusers(getRoomClientsListByRoomId(rooom
- .getRooms_id()));
+ .getId()));
result.add(rooom);
}
}
@@ -377,11 +377,11 @@ public class ConferenceService {
for (int i = 0; i < appointments.size(); i++) {
Appointment ment = appointments.get(i);
- Long rooms_id = ment.getRoom().getRooms_id();
+ Long rooms_id = ment.getRoom().getId();
Room rooom = roomDao.get(rooms_id);
rooom.setCurrentusers(this
- .getRoomClientsListByRoomId(rooom.getRooms_id()));
+ .getRoomClientsListByRoomId(rooom.getId()));
result.add(rooom);
}
}
@@ -429,7 +429,7 @@ public class ConferenceService {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
room = roomDao.get(rooms_id);
- room.setCurrentusers(sessionManager.getClientListByRoom(room.getRooms_id()));
+ room.setCurrentusers(sessionManager.getClientListByRoom(room.getId()));
}
return room;
}
@@ -496,7 +496,6 @@ public class ConferenceService {
} catch (Exception err) {
log.error("[getRoomModeratorsByRoomId]", err);
- err.printStackTrace();
}
return null;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java Mon Jun 23 08:47:06 2014
@@ -136,7 +136,7 @@ public class FLVRecorderService implemen
flvRecording.setStatus(FlvRecording.Status.PROCESSING);
flvRecording = recordingDao.update(flvRecording);
// Receive flvRecordingId
- Long flvRecordingId = flvRecording.getFlvRecordingId();
+ Long flvRecordingId = flvRecording.getId();
log.debug("##REC:: recording created by USER: " + currentClient.getUser_id());
// Update Client and set Flag
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java Mon Jun 23 08:47:06 2014
@@ -163,9 +163,9 @@ public class MainService implements IPen
if (!u.getOrganisation_users().isEmpty()) {
u.setSessionData(sessiondataDao.getSessionByHash(wicketSID));
- currentClient.setUser_id(u.getUser_id());
+ currentClient.setUser_id(u.getId());
currentClient.setRoom_id(wicketroomid);
- SessionVariablesUtil.setUserId(current.getClient(), u.getUser_id());
+ SessionVariablesUtil.setUserId(current.getClient(), u.getId());
currentClient.setUsername(u.getLogin());
currentClient.setFirstname(u.getFirstname());
@@ -348,7 +348,7 @@ public class MainService implements IPen
, null, null, false, false, userObject.getExternalUserId()
, userObject.getExternalUserType(), null, userObject.getPictureUrl());
- long userId = u.getUser_id();
+ long userId = u.getId();
currentClient.setUser_id(userId);
SessionVariablesUtil.setUserId(current.getClient(), userId);
} else {
@@ -356,8 +356,8 @@ public class MainService implements IPen
userDao.update(user, users_id);
- currentClient.setUser_id(user.getUser_id());
- SessionVariablesUtil.setUserId(current.getClient(), user.getUser_id());
+ currentClient.setUser_id(user.getId());
+ SessionVariablesUtil.setUserId(current.getClient(), user.getId());
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java Mon Jun 23 08:47:06 2014
@@ -22,7 +22,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
-import org.apache.openmeetings.core.data.basic.FieldManager;
import org.apache.openmeetings.core.data.conference.RoomManager;
import org.apache.openmeetings.core.mail.MailHandler;
import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
@@ -84,8 +83,6 @@ public class UserService implements IUse
@Autowired
private UserDao userDao;
@Autowired
- private FieldManager fieldManager;
- @Autowired
private SalutationDao salutationmanagement;
@Autowired
private RoomManager roomManager;
@@ -307,7 +304,7 @@ public class UserService implements IUse
for (UserContact userContact : uList) {
- if (userContact.getContact().getUser_id().equals(user_id)) {
+ if (userContact.getContact().getId().equals(user_id)) {
return true;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Mon Jun 23 08:47:06 2014
@@ -22,7 +22,6 @@ import static org.apache.openmeetings.ut
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -1466,12 +1465,12 @@ public class ScopeApplicationAdapter ext
if (member.getUser() != null) {
log.debug("checking user " + member.getUser().getFirstname()
+ " for moderator role - ID : "
- + member.getUser().getUser_id());
+ + member.getUser().getId());
- if (member.getUser().getUser_id().equals(userIdInRoomClient)) {
+ if (member.getUser().getId().equals(userIdInRoomClient)) {
found = true;
- if (ment.getOwner().getUser_id() == member.getUser().getUser_id()) {
+ if (ment.getOwner().getId() == member.getUser().getId()) {
log.debug("User "
+ userIdInRoomClient
+ " is moderator due to flag in MeetingMember record");
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java Mon Jun 23 08:47:06 2014
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletResponse;
public abstract class BaseHttpServlet extends HttpServlet {
- private static final long serialVersionUID = -2713422496723115524L;
+ private static final long serialVersionUID = 1L;
private BeanUtil beanUtil = new BeanUtil();
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/ServerNotInitializedException.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/ServerNotInitializedException.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/ServerNotInitializedException.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/ServerNotInitializedException.java Mon Jun 23 08:47:06 2014
@@ -19,7 +19,7 @@
package org.apache.openmeetings.core.servlet;
public class ServerNotInitializedException extends Exception {
- private static final long serialVersionUID = -7771909924751249321L;
+ private static final long serialVersionUID = 1L;
public ServerNotInitializedException(String msg) {
super(msg);
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java Mon Jun 23 08:47:06 2014
@@ -47,7 +47,7 @@ import org.slf4j.Logger;
public class DownloadHandler extends BaseHttpServlet {
- private static final long serialVersionUID = 7243653203578587544L;
+ private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(
DownloadHandler.class, OpenmeetingsVariables.webAppRootKey);
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java Mon Jun 23 08:47:06 2014
@@ -56,7 +56,7 @@ import org.w3c.dom.Element;
public class ExportToImage extends BaseHttpServlet {
- private static final long serialVersionUID = -3535998254746084297L;
+ private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(
ExportToImage.class, OpenmeetingsVariables.webAppRootKey);
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java Mon Jun 23 08:47:06 2014
@@ -23,6 +23,8 @@ package org.apache.openmeetings.test;
* Intern, SETLabs, Infosys Technologies Ltd. May 2004 - Jul 2004
* Ecole des Mines de Nantes, France
*/
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
@@ -42,6 +44,9 @@ import javax.swing.text.html.HTMLEditorK
import javax.swing.text.html.StyleSheet;
import javax.swing.text.html.parser.ParserDelegator;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
/**
* A "HTML" JEditorPane embedded with a special HTMLDocument that detects urls
* and displays them as hyperlinks. When CTRL is pressed, the urls are
@@ -51,7 +56,8 @@ import javax.swing.text.html.parser.Pars
*
*/
public class EditorPaneLinkDetector extends JEditorPane {
- private static final long serialVersionUID = 2811878994346374017L;
+ private static final long serialVersionUID = 1L;
+ private static final Logger log = Red5LoggerFactory.getLogger(EditorPaneLinkDetector.class, webAppRootKey);
/**
* Creates a <code>EditorPaneLinkDetector</code>.
@@ -105,11 +111,13 @@ public class EditorPaneLinkDetector exte
public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_CONTROL) {
- if (isEditable())
+ if (isEditable()) {
setEditable(false);
+ }
} else {
- if (!isEditable())
+ if (!isEditable()) {
setEditable(true);
+ }
}
}
@@ -125,11 +133,7 @@ public class EditorPaneLinkDetector exte
}
protected class HTMLDocLinkDetector extends HTMLDocument {
-
- /**
- *
- */
- private static final long serialVersionUID = 1226244167782160437L;
+ private static final long serialVersionUID = 1L;
public HTMLDocLinkDetector(StyleSheet ss) {
super(ss);
@@ -170,7 +174,7 @@ public class EditorPaneLinkDetector exte
else
createLink(e);
} catch (IOException ex) {
- ex.printStackTrace();
+ log.error("Error", ex);
}
setCaretPosition(Math.min(caretPos, getLength()));
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java Mon Jun 23 08:47:06 2014
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.test.asf;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -27,7 +29,11 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.StringWriter;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
public class AsfCopyRightReplace {
+ private static final Logger log = Red5LoggerFactory.getLogger(AsfCopyRightReplace.class, webAppRootKey);
String asf_copyright = "/*\n"
+ " * Licensed to the Apache Software Foundation (ASF) under one\n"
@@ -166,7 +172,7 @@ public class AsfCopyRightReplace {
out.close();
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error while scanAndWriteXMLFile", err);
}
}
@@ -203,7 +209,7 @@ public class AsfCopyRightReplace {
out.close();
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error while scanAndWriteJavaFile", err);
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java Mon Jun 23 08:47:06 2014
@@ -18,14 +18,19 @@
*/
package org.apache.openmeetings.test.chat;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import junit.framework.TestCase;
import org.junit.Test;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
public class TestChatLinking extends TestCase {
+ private static final Logger log = Red5LoggerFactory.getLogger(TestChatLinking.class, webAppRootKey);
@Test
public void testChatParser(){
@@ -36,7 +41,7 @@ public class TestChatLinking extends Tes
System.out.println(link(text));
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error", err);
}
}
@@ -75,7 +80,7 @@ public class TestChatLinking extends Tes
return tReturn;
} catch (Exception e) {
- e.printStackTrace();
+ log.error("Error", e);
}
return "";
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java Mon Jun 23 08:47:06 2014
@@ -18,11 +18,15 @@
*/
package org.apache.openmeetings.test.derby;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.File;
import org.apache.openmeetings.cli.ConnectionProperties;
import org.apache.openmeetings.cli.ConnectionPropertiesPatcher;
import org.apache.openmeetings.util.OmFileHelper;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
/**
* This file is called from command line to patch the derby configuration
@@ -32,6 +36,7 @@ import org.apache.openmeetings.util.OmFi
*
*/
public class PrepareSystemFiles {
+ private static final Logger log = Red5LoggerFactory.getLogger(PrepareSystemFiles.class, webAppRootKey);
public static void main(String... args) {
try {
@@ -61,7 +66,7 @@ public class PrepareSystemFiles {
, "secret"
);
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error", err);
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestChatParsing.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestChatParsing.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestChatParsing.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestChatParsing.java Mon Jun 23 08:47:06 2014
@@ -18,14 +18,18 @@
*/
package org.apache.openmeetings.test.emotes;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.util.LinkedList;
import junit.framework.TestCase;
import org.junit.Test;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
public class TestChatParsing extends TestCase {
-
+ private static final Logger log = Red5LoggerFactory.getLogger(TestChatParsing.class, webAppRootKey);
public static LinkedList<LinkedList<String>> emotfilesList = new LinkedList<LinkedList<String>>();
@Test
@@ -37,7 +41,7 @@ public class TestChatParsing extends Tes
this.loadEmot(filePath);
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error", err);
}
}
@@ -61,8 +65,7 @@ public class TestChatParsing extends Tes
System.out.println("loadEmot completed");
} catch (Exception err) {
- System.out.println("[loadEmot]"+err);
- err.printStackTrace();
+ log.error("Error", err);
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestConvertGifs.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestConvertGifs.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestConvertGifs.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestConvertGifs.java Mon Jun 23 08:47:06 2014
@@ -71,7 +71,7 @@ public class TestConvertGifs extends Tes
System.out.println("batString "+batString);
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error", err);
}
}
@@ -119,7 +119,7 @@ public class TestConvertGifs extends Tes
System.out.println("batString "+batString);
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error", err);
}
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java Mon Jun 23 08:47:06 2014
@@ -55,8 +55,6 @@ public class TestInterpolation extends T
//
} catch (Exception er) {
log.error("ERROR ", er);
- System.out.println("Error exporting: " + er);
- er.printStackTrace();
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java Mon Jun 23 08:47:06 2014
@@ -98,11 +98,6 @@ public class TestSVGTextExporterArrow ex
svgGenerator.stream(out, useCSS);
} catch (Exception er) {
log.error("ERROR ", er);
- System.out.println("Error exporting: " + er);
- er.printStackTrace();
}
}
-
-
-
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java Mon Jun 23 08:47:06 2014
@@ -30,7 +30,7 @@ class WindowClosingAdapter extends Windo
}
public class KeyCodesTest extends Frame implements KeyListener {
- private static final long serialVersionUID = -1706968644784929402L;
+ private static final long serialVersionUID = 1L;
String msg1 = "";
String msg2 = "";
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java Mon Jun 23 08:47:06 2014
@@ -22,7 +22,7 @@ import java.awt.*;
import java.awt.event.*;
public class ReadKeyCodesTest extends Frame implements KeyListener {
- private static final long serialVersionUID = -1722917067803656922L;
+ private static final long serialVersionUID = 1L;
String msg1 = "";
String msg2 = "";