This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from efd2444 [OPENMEETINGS-1840] add room to group is fixed
add 39190c4 [OPENMEETINGS-1649] red5-server is removed as dependency
add 457ea12 Merge branch 'master' into OPENMEETINGS-1649-kurento
add 2a553a2 [OPENMEETINGS-1649] local run with jetty is fixed
add 9fad861 [OPENMEETINGS-1649] video broadcast based on kurento example
is added, play is not working
add 3e5ba2b Merge branch 'master' into OPENMEETINGS-1649-kurento
add 9228be1 Merge branch 'OPENMEETINGS-1649-kurento' of
github.com:apache/openmeetings into OPENMEETINGS-1649-kurento
add 5afa80f [OPENMEETINGS-1649] JS errors during broadcast are fixed
add 92877b3 [OPENMEETINGS-1649] video sending code is improved, receiving
is still broken
add 2390579 [OPENMEETINGS-1836] initial attempt to fix performance
add ad0ed66 [OPENMEETINGS-1836] more work on performance
add 21dc9b9 [OPENMEETINGS-1836] some NPEs are fixed
add 82951c0 [OPENMEETINGS-1836] more NPEs are fixed
add 52f2fa3 [OPENMEETINGS-1836] condition is fixed
add b0d77a6 [OPENMEETINGS-1836] basic video send/receive is implemented
add 2b75a61 [OPENMEETINGS-1837] audio-only steams are being recorded as
expected
add 1551a65 [OPENMEETINGS-1841] list groups method is fixed
add 03a6600 [OPENMEETINGS-1840] add room to group is fixed
add 14db49f [OPENMEETINGS-1649] settings dialog is partially converted
add b01521b [OPENMEETINGS-1649] build seems to be fixed
new 553e365 Merge branch 'OPENMEETINGS-1649-kurento'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 2 +-
openmeetings-core/pom.xml | 18 +-
.../openmeetings/core/converter/BaseConverter.java | 8 +-
.../core/converter/DocumentConverter.java | 5 +-
.../core/converter/ImageConverter.java | 5 +-
.../core/converter/InterviewConverter.java | 5 +-
.../core/converter/RecordingConverter.java | 5 +-
.../core/converter/VideoConverter.java | 5 +-
.../openmeetings/core/data/file/FileProcessor.java | 5 +-
.../record/converter/InterviewConverterTask.java | 6 +-
.../record/converter/RecordingConverterTask.java | 6 +-
.../core/data/record/listener/StreamListener.java | 21 +-
.../record/listener/async/BaseStreamWriter.java | 40 +-
.../data/record/listener/async/CachedEvent.java | 8 +-
.../record/listener/async/StreamAudioWriter.java | 23 +-
.../record/listener/async/StreamVideoWriter.java | 15 +-
.../core/documents/LibraryChartLoader.java | 5 +-
.../openmeetings/core/ldap/LdapLoginManager.java | 5 +-
.../apache/openmeetings/core/ldap/LdapOptions.java | 5 +-
.../apache/openmeetings/core/mail/MailHandler.java | 5 +-
.../core/notifier/NotifierService.java | 6 +-
.../org/apache/openmeetings/core/remote/KRoom.java | 137 +
.../org/apache/openmeetings/core/remote/KUser.java | 246 ++
.../openmeetings/core/remote/KurentoHandler.java | 142 +
.../openmeetings/core/remote/MobileService.java | 41 +-
.../core/remote/ScopeApplicationAdapter.java | 119 +-
.../openmeetings/core/rss/LoadAtomRssFeed.java | 6 +-
.../openmeetings/core/service/MainService.java | 5 +-
.../core/service/RecordingService.java | 36 +-
.../apache/openmeetings/core/util/IClientUtil.java | 8 +-
.../core/util/StrongPasswordValidator.java | 6 +-
.../openmeetings/core/util/WebSocketHelper.java | 17 +-
.../openmeetings/EditorPaneLinkDetector.java | 319 --
.../apache/openmeetings/jai/TestInterpolation.java | 61 -
.../openmeetings/rdc/TestKeyCodesNumber.java | 6 +-
.../openmeetings/rdc/TestReadKeyCodesNumber.java | 6 +-
.../openmeetings/rtmp/LoadTestRtmpClient.java | 163 -
.../org/apache/openmeetings/rtmp/SimulateLoad.java | 92 -
.../apache/openmeetings/rtmp/SimulateLoadTest.java | 111 -
.../apache/openmeetings/user/TestMailSending.java | 5 +-
.../db/dao/basic/ConfigurationDao.java | 53 +-
.../db/dao/calendar/AppointmentDao.java | 5 +-
.../db/dao/calendar/MeetingMemberDao.java | 6 +-
.../openmeetings/db/dao/file/BaseFileItemDao.java | 6 +-
.../openmeetings/db/dao/file/FileItemDao.java | 6 +-
.../openmeetings/db/dao/file/FileItemLogDao.java | 6 +-
.../apache/openmeetings/db/dao/label/LabelDao.java | 5 +-
.../openmeetings/db/dao/log/ConferenceLogDao.java | 6 +-
.../openmeetings/db/dao/record/RecordingDao.java | 5 +-
.../db/dao/record/RecordingMetaDataDao.java | 6 +-
.../db/dao/record/RecordingMetaDeltaDao.java | 6 +-
.../openmeetings/db/dao/room/InvitationDao.java | 5 +-
.../apache/openmeetings/db/dao/room/PollDao.java | 5 +-
.../apache/openmeetings/db/dao/room/RoomDao.java | 5 +-
.../apache/openmeetings/db/dao/room/SipDao.java | 4 +-
.../openmeetings/db/dao/server/LdapConfigDao.java | 6 +-
.../openmeetings/db/dao/server/SOAPLoginDao.java | 6 +-
.../openmeetings/db/dao/server/SessiondataDao.java | 6 +-
.../db/dao/user/PrivateMessageDao.java | 5 +-
.../db/dao/user/PrivateMessageFolderDao.java | 5 +-
.../openmeetings/db/dao/user/UserContactDao.java | 5 +-
.../apache/openmeetings/db/dao/user/UserDao.java | 5 +-
.../openmeetings/db/dto/room/InvitationDTO.java | 6 +-
.../openmeetings/db/dto/room/Whiteboard.java | 6 +-
.../apache/openmeetings/db/dto/user/OAuthUser.java | 6 +-
.../db/entity/server/RemoteSessionObject.java | 6 +-
.../openmeetings/db/util/ApplicationHelper.java | 5 +-
.../apache/openmeetings/db/util/AuthLevelUtil.java | 6 +-
.../apache/openmeetings/db/util/LocaleHelper.java | 6 +-
.../apache/openmeetings/db/util/RoomHelper.java | 16 -
openmeetings-flash/pom.xml | 126 -
openmeetings-flash/src/main/flex/assets/cursor.png | Bin 354 -> 0 bytes
.../src/main/flex/assets/edit-copy.png | Bin 498 -> 0 bytes
openmeetings-flash/src/main/flex/assets/failed.png | Bin 7193 -> 0 bytes
openmeetings-flash/src/main/flex/assets/micro.png | Bin 473 -> 0 bytes
openmeetings-flash/src/main/flex/assets/notrun.png | Bin 5853 -> 0 bytes
openmeetings-flash/src/main/flex/assets/passed.png | Bin 8809 -> 0 bytes
.../src/main/flex/assets/passed_result.png | Bin 8036 -> 0 bytes
.../src/main/flex/assets/running.swf | Bin 65877 -> 0 bytes
openmeetings-flash/src/main/flex/main.mxml | 669 ----
openmeetings-flash/src/main/flex/nettest.mxml | 123 -
.../main/flex/org/apache/openmeetings/OmVideo.as | 360 --
.../flex/org/apache/openmeetings/net/RestCall.as | 95 -
.../apache/openmeetings/net/UploadPostHelper.as | 157 -
.../openmeetings/nettest/BaseURLLoadTest.mxml | 129 -
.../openmeetings/nettest/DownloadSpeedTest.mxml | 47 -
.../apache/openmeetings/nettest/JitterTest.mxml | 52 -
.../apache/openmeetings/nettest/NetworkTest.mxml | 179 -
.../org/apache/openmeetings/nettest/PingTest.mxml | 41 -
.../openmeetings/nettest/PortAvailabilityTest.mxml | 79 -
.../openmeetings/nettest/UploadSpeedTest.mxml | 110 -
openmeetings-flash/src/site/site.xml | 38 -
openmeetings-install/pom.xml | 4 +
.../apache/openmeetings/backup/BackupExport.java | 5 +-
.../apache/openmeetings/backup/BackupImport.java | 5 +-
.../backup/converter/RecordingStatusConverter.java | 6 +-
.../openmeetings/backup/converter/WbConverter.java | 5 +-
.../java/org/apache/openmeetings/cli/Admin.java | 4 +-
.../org/apache/openmeetings/cli/CleanupHelper.java | 4 +-
.../installation/ImportInitvalues.java | 5 +-
openmeetings-server/pom.xml | 27 +-
.../src/main/assembly/conf/jee-container.xml | 133 -
.../src/main/assembly/jrebel/red5-debug.bat | 19 -
.../src/main/assembly/jrebel/red5-debug.sh | 22 -
openmeetings-server/src/site/site.xml | 1 -
.../src/site/xdoc/BuildInstructions.xml | 13 +-
.../src/site/xdoc/BuildInstructions_3.0.x.xml | 305 --
.../service/calendar/AppointmentLogic.java | 5 +-
.../calendar/caldav/AppointmentManager.java | 5 +-
.../service/calendar/caldav/IcalUtils.java | 5 +-
.../caldav/handler/AbstractCalendarHandler.java | 6 +-
.../calendar/caldav/handler/CtagHandler.java | 5 +-
.../calendar/caldav/handler/EtagsHandler.java | 5 +-
.../calendar/caldav/handler/MultigetHandler.java | 5 +-
.../calendar/caldav/handler/WebDAVSyncHandler.java | 5 +-
.../calendar/caldav/methods/SyncMethod.java | 6 +-
.../openmeetings/service/mail/EmailManager.java | 5 +-
.../service/notifier/TextNotifier.java | 5 +-
.../service/quartz/scheduler/AbstractJob.java | 5 +-
.../service/quartz/scheduler/CleanupJob.java | 5 +-
.../service/quartz/scheduler/ReminderJob.java | 5 +-
.../service/room/InvitationManager.java | 5 +-
.../openmeetings/service/user/UserManager.java | 14 +-
openmeetings-util/pom.xml | 21 +-
.../apache/openmeetings/util/CalendarPatterns.java | 6 +-
.../openmeetings/util/OMContextListener.java | 42 +-
.../openmeetings/util/OpenmeetingsVariables.java | 9 -
.../org/apache/openmeetings/util/StoredFile.java | 5 +-
.../java/org/apache/openmeetings/util/Version.java | 4 +-
.../openmeetings/util/crypt/CryptProvider.java | 5 +-
.../openmeetings/util/crypt/MD5Implementation.java | 6 +-
.../util/crypt/SCryptImplementation.java | 5 +-
.../apache/openmeetings/util/mail/IcalHandler.java | 6 +-
.../openmeetings/util/process/ProcessHelper.java | 5 +-
openmeetings-web/pom.xml | 123 +-
.../openmeetings/web/admin/backup/BackupPanel.java | 5 +-
.../openmeetings/web/admin/labels/LangPanel.java | 5 +-
.../openmeetings/web/admin/users/UserForm.java | 5 +-
.../apache/openmeetings/web/app/Application.java | 50 +-
.../web/app/Application_uk.properties.xml | 1 -
.../apache/openmeetings/web/app/ClientManager.java | 16 +-
.../openmeetings/web/app/QuickPollManager.java | 5 +-
.../openmeetings/web/app/StreamClientManager.java | 6 +-
.../apache/openmeetings/web/app/WebSession.java | 5 +-
.../openmeetings/web/common/ErrorMessagePanel.java | 6 +-
.../openmeetings/web/common/InvitationForm.java | 5 +-
.../apache/openmeetings/web/common/MainPanel.java | 21 +-
.../web/common/UploadableImagePanel.java | 5 +-
.../web/pages/auth/ForgetPasswordDialog.java | 5 +-
.../web/pages/auth/RegisterDialog.java | 5 +-
.../openmeetings/web/pages/auth/SignInDialog.java | 9 +-
.../openmeetings/web/pages/auth/SignInPage.java | 5 +-
.../web/pages/install/InstallWizard.java | 5 +-
.../openmeetings/web/room/RoomBroadcaster.java | 5 +-
.../apache/openmeetings/web/room/RoomPanel.java | 71 +-
.../org/apache/openmeetings/web/room/SwfPanel.java | 5 +-
.../openmeetings/web/room/VideoSettings.html | 2 +-
.../openmeetings/web/room/VideoSettings.java | 32 +-
.../web/room/activities/ActivitiesPanel.java | 5 +-
.../apache/openmeetings/web/room/kurento-utils.js | 4206 ++++++++++++++++++++
.../openmeetings/web/room/menu/PollsSubMenu.java | 5 +-
.../web/room/menu/RoomInvitationForm.java | 5 +-
.../web/room/menu/StartSharingButton.java | 5 +-
.../org/apache/openmeetings/web/room/room-base.js | 8 +-
.../org/apache/openmeetings/web/room/settings.js | 164 +-
.../openmeetings/web/room/sidebar/RoomSidebar.java | 17 +-
.../apache/openmeetings/web/room/swf-functions.js | 17 -
.../apache/openmeetings/web/room/video-manager.js | 113 +-
.../org/apache/openmeetings/web/room/video-util.js | 10 +-
.../java/org/apache/openmeetings/web/room/video.js | 67 +-
.../openmeetings/web/room/wb/AbstractWbPanel.java | 5 +-
.../openmeetings/web/room/wb/InterviewWbPanel.java | 8 +-
.../apache/openmeetings/web/room/wb/WbPanel.java | 5 +-
.../openmeetings/web/room/wb/interview-area.js | 5 +-
.../org/apache/openmeetings/web/room/wb/wb-all.js | 13 +
.../org/apache/openmeetings/web/room/wb/wb-area.js | 17 +-
.../web/user/calendar/AppointmentDialog.java | 5 +-
.../web/user/calendar/CalendarPanel.java | 5 +-
.../apache/openmeetings/web/user/chat/Chat.java | 15 +-
.../openmeetings/web/user/chat/ChatForm.java | 13 +-
.../openmeetings/web/user/chat/ChatToolbar.java | 13 +-
.../web/user/profile/ChangePasswordDialog.java | 5 +-
.../openmeetings/web/user/profile/ProfileForm.java | 5 +-
.../web/util/FileItemResourceReference.java | 6 +-
.../web/util/GroupLogoResourceReference.java | 5 +-
.../web/util/ProfileImageResourceReference.java | 5 +-
.../web/util/UserDashboardPersister.java | 5 +-
.../main/webapp/WEB-INF/classes/logback-config.xml | 33 +-
.../main/webapp/WEB-INF/classes/rebel-remote.xml | 24 -
.../src/main/webapp/WEB-INF/classes/rebel.xml | 33 -
.../src/main/webapp/WEB-INF/red5-web.properties | 17 -
.../src/main/webapp/WEB-INF/red5-web.xml | 42 -
openmeetings-web/src/main/webapp/WEB-INF/web.xml | 45 +-
.../apache/openmeetings/AbstractJUnitDefaults.java | 4 +-
.../apache/openmeetings/AbstractSpringTest.java | 3 +-
.../apache/openmeetings/AbstractWicketTester.java | 5 +-
.../apache/openmeetings/backup/TestOldBackups.java | 5 +-
.../calendar/TestAppointmentAddAppointment.java | 5 +-
.../calendar/TestAppointmentSchedulerTask.java | 5 +-
.../calendar/TestDatabaseStructureAppointment.java | 6 +-
...TestDatabaseStructureGetAppointmentByRange.java | 5 +-
.../TestDatabaseStructureGetUserStart.java | 6 +-
.../calendar/TestDatabaseStructureUsersSearch.java | 6 +-
.../openmeetings/calendar/TestGetAppointment.java | 5 +-
.../openmeetings/calendar/TestSendIcalMessage.java | 6 +-
.../org/apache/openmeetings/config/TestConfig.java | 5 +-
.../apache/openmeetings/db/dao/TestRoomDao.java | 5 +-
.../openmeetings/derby/PrepareSystemFiles.java | 6 +-
.../apache/openmeetings/domain/TestAddGroup.java | 5 +-
.../domain/TestUserGroupAggregation.java | 5 +-
.../openmeetings/test/selenium/SeleniumUtils.java | 6 +-
.../org/apache/openmeetings/web/TestMainAreas.java | 5 +-
.../web/pages/install/TestInstall.java | 5 +-
openmeetings-web/src/test/jetty/jetty-http.xml | 54 +
openmeetings-web/src/test/jetty/jetty-https.xml | 61 +
openmeetings-web/src/test/jetty/jetty-ssl.xml | 52 +
openmeetings-web/src/test/jetty/jetty.xml | 39 +
openmeetings-web/src/test/resources/keystore | Bin 0 -> 1821 bytes
.../src/test/resources/logback-test.xml | 35 +-
.../openmeetings/webservice/BaseWebService.java | 5 +-
.../webservice/CalendarWebService.java | 5 +-
.../openmeetings/webservice/ErrorWebService.java | 5 +-
.../openmeetings/webservice/FileWebService.java | 5 +-
.../openmeetings/webservice/GroupWebService.java | 5 +-
.../openmeetings/webservice/NetTestWebService.java | 5 +-
.../webservice/RecordingWebService.java | 5 +-
.../openmeetings/webservice/RoomWebService.java | 5 +-
.../openmeetings/webservice/UserWebService.java | 5 +-
pom.xml | 83 +-
229 files changed, 6074 insertions(+), 4672 deletions(-)
create mode 100644
openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
create mode 100644
openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KUser.java
create mode 100644
openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
delete mode 100644
openmeetings-core/src/test/java/org/apache/openmeetings/EditorPaneLinkDetector.java
delete mode 100644
openmeetings-core/src/test/java/org/apache/openmeetings/jai/TestInterpolation.java
delete mode 100644
openmeetings-core/src/test/java/org/apache/openmeetings/rtmp/LoadTestRtmpClient.java
delete mode 100644
openmeetings-core/src/test/java/org/apache/openmeetings/rtmp/SimulateLoad.java
delete mode 100644
openmeetings-core/src/test/java/org/apache/openmeetings/rtmp/SimulateLoadTest.java
delete mode 100644 openmeetings-flash/pom.xml
delete mode 100644 openmeetings-flash/src/main/flex/assets/cursor.png
delete mode 100644 openmeetings-flash/src/main/flex/assets/edit-copy.png
delete mode 100644 openmeetings-flash/src/main/flex/assets/failed.png
delete mode 100644 openmeetings-flash/src/main/flex/assets/micro.png
delete mode 100644 openmeetings-flash/src/main/flex/assets/notrun.png
delete mode 100644 openmeetings-flash/src/main/flex/assets/passed.png
delete mode 100644 openmeetings-flash/src/main/flex/assets/passed_result.png
delete mode 100644 openmeetings-flash/src/main/flex/assets/running.swf
delete mode 100644 openmeetings-flash/src/main/flex/main.mxml
delete mode 100644 openmeetings-flash/src/main/flex/nettest.mxml
delete mode 100644
openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
delete mode 100644
openmeetings-flash/src/main/flex/org/apache/openmeetings/net/RestCall.as
delete mode 100644
openmeetings-flash/src/main/flex/org/apache/openmeetings/net/UploadPostHelper.as
delete mode 100755
openmeetings-flash/src/main/flex/org/apache/openmeetings/nettest/BaseURLLoadTest.mxml
delete mode 100755
openmeetings-flash/src/main/flex/org/apache/openmeetings/nettest/DownloadSpeedTest.mxml
delete mode 100755
openmeetings-flash/src/main/flex/org/apache/openmeetings/nettest/JitterTest.mxml
delete mode 100644
openmeetings-flash/src/main/flex/org/apache/openmeetings/nettest/NetworkTest.mxml
delete mode 100755
openmeetings-flash/src/main/flex/org/apache/openmeetings/nettest/PingTest.mxml
delete mode 100644
openmeetings-flash/src/main/flex/org/apache/openmeetings/nettest/PortAvailabilityTest.mxml
delete mode 100755
openmeetings-flash/src/main/flex/org/apache/openmeetings/nettest/UploadSpeedTest.mxml
delete mode 100644 openmeetings-flash/src/site/site.xml
delete mode 100644 openmeetings-server/src/main/assembly/conf/jee-container.xml
delete mode 100644 openmeetings-server/src/main/assembly/jrebel/red5-debug.bat
delete mode 100644 openmeetings-server/src/main/assembly/jrebel/red5-debug.sh
delete mode 100644
openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml
create mode 100644
openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
delete mode 100644
openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
delete mode 100644
openmeetings-web/src/main/webapp/WEB-INF/classes/rebel-remote.xml
delete mode 100644 openmeetings-web/src/main/webapp/WEB-INF/classes/rebel.xml
delete mode 100644 openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties
delete mode 100644 openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml
create mode 100644 openmeetings-web/src/test/jetty/jetty-http.xml
create mode 100644 openmeetings-web/src/test/jetty/jetty-https.xml
create mode 100644 openmeetings-web/src/test/jetty/jetty-ssl.xml
create mode 100644 openmeetings-web/src/test/jetty/jetty.xml
create mode 100644 openmeetings-web/src/test/resources/keystore
--
To stop receiving notification emails like this one, please contact
[email protected].
