Commit Graph

1231 Commits

Author SHA1 Message Date
Richard Alam
c66c180040 - make the flash client not attempt to reconnect when the user has been ejected from the meeting. 2016-01-19 16:16:12 +00:00
Ghazi Triki
058a2170ee Added request breakout rooms list feature. 2016-01-15 22:13:53 +01:00
Richard Alam
e58b527c0f - remove println 2016-01-14 20:08:36 +00:00
Anton Georgiev
7c6d954f2c hangle streampath with {} params 2016-01-13 22:54:03 +00:00
Ghazi Triki
48844648ee Send RequestBreakoutJoinUrl from client to server. 2016-01-12 20:18:23 +01:00
Pedro Beschorner Marin
96d30fc9c1 Fixed main reconnection 2016-01-12 18:40:34 +00:00
Richard Alam
838d6e0ad7 - merge Chad's closed caption work into Ghazi's breakout rooms work
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
2016-01-08 19:06:42 +00:00
Anton Georgiev
8ee6356b5a accommodate late joiners 2015-12-22 16:21:39 +00:00
Anton Georgiev
09a870296d reuse hover string from other ds method; skip chat notific on ds start/end 2015-12-14 20:45:46 +00:00
Anton Georgiev
5bf05161af Merge branch 'html5client-mod-verto-addition' of github.com:perroned/bigbluebutton into webrtc-desktop-temp-4
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
2015-12-11 17:23:27 +00:00
Chad Pilkey
71f8ff085f first try and adding caption ownership 2015-12-09 14:00:26 -08:00
Chad Pilkey
3036a9740b caption module now tracks TextArea updates 2015-11-23 12:56:52 -08:00
Ghazi Triki
6e9b95e347 BreakoutRoomStarted event finally arrives to the client. 2015-11-20 19:06:11 -02:00
Richard Alam
2a610c0704 Merge branch 'cancel-message-sending-task' into breakout-rooms-porto-algre-2015
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
2015-11-18 03:13:47 -05:00
Richard Alam
22b3a4e2a0 - cancel the message sending task when it takes a long time to complete. The thread
may have blocked when the rtmp connection was closed.
2015-11-17 20:44:15 -05:00
Richard Alam
6a85afa430 - format out message 2015-11-17 14:33:15 -05:00
Ghazi Triki
ef23cacefa Breakout room feature server updates. 2015-11-18 16:45:46 -02:00
Ghazi Triki
3c6586749f Updated gson library dependency to version 2.4 2015-11-18 14:35:32 -02:00
Richard Alam
364c8299d4 - build json message on red5 2015-11-17 04:49:03 -05:00
Richard Alam
39d9c5dd15 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/BreakoutRoomService.java
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
2015-11-17 02:19:48 -05:00
Ghazi Triki
69acc57f2d Breakout related requests are sent to the correct "meeting" redis channel. 2015-11-17 18:34:13 -02:00
Ghazi Triki
16d521c338 Implemented RTMP methods for ListenInOnBreakout and RequestBreakoutJoinURL actions. 2015-11-17 17:39:49 -02:00
Ghazi Triki
129764ece8 Rooms list is correctly set in the createBreakoutRooms request. 2015-11-17 15:07:19 -02:00
Richard Alam
bd8b38a22c - use spray json to decode messages 2015-11-17 02:11:14 -05:00
Ghazi Triki
402f337fd6 Handle CreateBreakoutRoomsRequest case in BigBlueButtonInGW.scala 2015-11-16 17:09:38 -02:00
Ghazi Triki
8b1f0d4bae Added EndAllBreakoutRoomsRequest broadcast from client to bigbluebutton-apps. 2015-11-12 22:24:10 +01:00
Ghazi Triki
f910e95a45 Added more implementations for Breakout Room messages: BreakoutRoomJoinURL, BreakoutRoomStarted, TimeRemainingUpdate and UpdateBreakoutUsers. 2015-11-11 16:47:49 +01:00
Ghazi Triki
091b50d67a Added missing setter top BreakoutRoomService.java 2015-11-06 10:39:12 +01:00
Ghazi Triki
0de3e3dd43 Added BreakoutRoomService with createBreakoutRooms method. 2015-11-05 21:44:24 +01:00
Ghazi Triki
5a11eeebe3 bbb-video/build.gradle and bigbluebutton-apps/build.gradle uses the latest SNAPSHOT version of bbb-common-message 2015-11-05 18:34:41 +01:00
Chad Pilkey
2d9d28f638 added a new caption message to push current line 2015-11-03 15:44:26 -08:00
Anton Georgiev
8e407df405 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bigbluebutton-apps/build.gradle
2015-10-22 20:46:30 +00:00
Chad Pilkey
ad3ba6677c first two initial caption module messages finished 2015-10-15 15:40:23 -07:00
Anton Georgiev
f08cd5262e temp changes 2015-10-13 19:00:50 +00:00
Richard Alam
e8e8eb8955 - clean up formatting 2015-10-08 19:10:43 +00:00
Richard Alam
e5ed0e4713 - add logging to trace messages in order to debug lost messages between server to client 2015-10-08 18:27:33 +00:00
Richard Alam
f4d094adc0 - allow changing the debug level without restarting red5 2015-10-08 18:26:22 +00:00
Ghazi Triki
f969b8c753 Implemented processPresentationConversionError method in PresentationClientMessageSender, this method was accidentally left empty after the messaging refactoring in 1.0. 2015-10-07 22:55:27 +01:00
Richard Alam
894b59b687 - log external user id 2015-10-06 22:26:47 +00:00
Chad Pilkey
993ac4df1a initial red5 caption message handlers and common messages 2015-09-29 13:15:13 -07:00
Richard Alam
57c8f21eb4 - clean up logging
- add remote address into log
2015-09-23 20:04:09 +00:00
Richard Alam
11fbefb5ef - make lock settings behave like in 0.9 2015-09-21 20:42:04 +00:00
Richard Alam
c13e17a7d4 Merge pull request #2770 from riadvice/chat-message-limit
Add a maximum allowed length to chat message
2015-09-16 15:04:26 -04:00
Richard Alam
2278ee01ec - upgrade bbb-commons-message version 2015-09-14 21:45:55 +00:00
Richard Alam
44763bf283 - try to fix lock settings 2015-09-14 20:18:27 +00:00
Chad Pilkey
51650fb998 made the init audio and permissions message payloads actually contain something and corrected chatpermission message names 2015-09-11 15:02:28 -07:00
Ghazi Triki
7fdccc4095 Throw a too long chat message and log it and its length. 2015-09-09 17:58:25 +01:00
Richard Alam
96f1717e46 - add a bit of logging so we can see if validate token succeeded or not 2015-09-04 19:21:28 +00:00
Anton Georgiev
eb57aa7da1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share-merging 2015-08-24 14:31:00 +00:00
Richard Alam
a63a211143 - change poll config for jedis
- attempt to reconnect redis pubsub subscriber if disconnected
2015-08-23 07:09:00 -04:00
Ghazi Triki
66a7f23146 Added userId to EmojiStatusEvent to able to send a request for a different user. 2015-08-28 11:08:18 +01:00
Ghazi Triki
2fb8296ff0 - Fixed emojiStatus not set correctly in server.
- Upgraded bbb-common-message version.
2015-08-26 18:51:05 +01:00
Ghazi Triki
988d8cf56c Removed lower hand methods in server applications and replace raise hand by emoji status. 2015-08-25 09:46:00 +01:00
Anton Georgiev
1939dac06c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingMessageHandler.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorders/WhiteboardEventRedisRecorder.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/WhiteboardKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/DeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/ViewerWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
2015-08-21 20:15:37 +00:00
Richard Alam
46ba98f737 - add ping/pong message between different components to verfiy that we have working path 2015-08-20 20:44:40 +00:00
Anton Georgiev
bcfbb7c33a Revert "attempt to accommodate late joiners for ds on flash"
This reverts commit 8cf051a262.
2015-08-20 18:06:53 +00:00
Anton Georgiev
8cf051a262 attempt to accommodate late joiners for ds on flash 2015-08-20 16:13:11 +00:00
Richard Alam
282fecf351 - ping/pong message between red5 and bbb-apps 2015-08-19 18:32:07 +00:00
Richard Alam
8be746b4ac - start implementing round-trip pubsub monitoring 2015-08-18 21:51:48 +00:00
Richard Alam
5472548118 - allow custom polling through chat message 2015-08-17 22:40:31 +00:00
Richard Alam
9302532be5 - start implementing custom poll 2015-08-13 22:33:51 +00:00
Richard Alam
4e4270912b - fix issue where deleting presentation doesn't remove the presentation from file upload window 2015-08-11 17:21:09 +00:00
Richard Alam
cacfbf7e35 - update jar to latest red5 2015-08-10 21:32:00 +00:00
Richard Alam
bc7aadcd22 - create new bbb-commons jar 2015-08-07 19:46:52 +00:00
Richard Alam
839e7ebf58 Merge branch 'svg-conversion' of https://github.com/gthacoder/bigbluebutton into gthacoder-svg-conversion 2015-08-07 18:28:16 +00:00
Maxim Khlobystov
5c0cb9c3d8 Merge branch 'meteor-client-pdf-conversion' of https://github.com/gthacoder/bigbluebutton into development
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala
2015-08-06 16:21:31 -04:00
Richard Alam
44c7d4ab77 - trying to determine why client isn't receiving timestamp data from the server 2015-08-06 17:54:08 +00:00
Richard Alam
fbc3dc54f3 - add timestamps on client side log to correlate webcam stopping 2015-08-06 15:11:41 +00:00
Richard Alam
1f3cff06b3 - add more information on the logs to track down webcam disconnections 2015-08-05 19:55:12 +00:00
Richard Alam
df71d8a689 - keep track of user's number of connections to red5 to manage auto-reconnect 2015-07-28 18:29:00 +00:00
Maxim Khlobystov
5f491bf43b Cleaning up. 2015-07-15 16:58:15 -04:00
Richard Alam
007a13d0e9 - add more logging to determine who detects the disconnect first 2015-07-13 20:50:38 +00:00
Richard Alam
822b319440 - add number of responders on poll result 2015-07-13 19:18:37 +00:00
Anton Georgiev
6560da3632 cleaning up 2015-07-10 15:33:27 +00:00
Anton Georgiev
15a9e670b8 forward videoWidth, videoHeight to flash client(rtmp) 2015-07-08 16:05:04 +00:00
Richard Alam
3ed524a34c - upgrade bbb-commons-message version 2015-07-07 21:36:01 +00:00
Maxim Khlobystov
ceb3a3911c Made sure the image served for HTML5 client is in SVG format. 2015-07-07 12:19:05 -04:00
Richard Alam
5060726035 - format poll result data correctly 2015-07-06 22:12:15 +00:00
Anton Georgiev
aec3f119b9 work on displaying rtmp stream in the client 2015-07-06 20:24:06 +00:00
Maxim Khlobystov
cf1c6390be Made SVG images accessible by HTML5 client. 2015-07-06 14:26:13 -04:00
Richard Alam
72659e62ac - try displaying poll result as whiteboard shape 2015-07-02 22:16:11 +00:00
Richard Alam
6d7b93e6a4 - upgrade bbb-common-message version 2015-07-02 19:23:36 +00:00
Anton Georgiev
766fea281d send rtmp broadcast notification to viewers(flash has to handle) 2015-07-02 16:24:53 +00:00
Richard Alam
d9295115c8 - handle voting, stop, and show result in the client 2015-06-23 21:50:38 +00:00
Richard Alam
dcfa4ee8fb - cleanup unneded polling events
- process start poll message
2015-06-23 19:34:58 +00:00
Richard Alam
acb8a8c89a - implement sending of polling messages thru redis 2015-06-22 21:27:44 +00:00
Richard Alam
b8128945f4 - add new polling messages 2015-06-22 21:13:11 +00:00
Richard Alam
468217200f - fix welcome message bug
- fix private chat bug
 - start implementing polling
2015-06-16 19:18:23 +00:00
Richard Alam
36b9dc0104 - use bbb-common-message 2015-06-10 19:11:31 +00:00
Richard Alam
d4663c2573 - use bbb-common-message instead of having own message classes 2015-06-10 17:58:26 +00:00
Richard Alam
198d45489f - remove messages from bbb-apps red5 2015-06-10 17:11:36 +00:00
Richard Alam
e72a828628 - get users in voice conference when meeting is started 2015-06-05 21:57:26 +00:00
Richard Alam
70f725ef93 - add keep alive monitoring of bbb-apps 2015-06-05 19:49:36 +00:00
Richard Alam
7f06d2a766 - fix switch presenter display in user's list 2015-06-04 20:50:38 +00:00
Richard Alam
7c173c1db6 - fix parsing of message 2015-06-04 20:47:49 +00:00
Richard Alam
f2a2e2d1ee - rename message publisher 2015-06-02 20:04:11 +00:00
Richard Alam
4929d261ce - cleanup 2015-06-02 19:38:38 +00:00
Richard Alam
1d177e65ba - fix merge issues 2015-06-02 19:17:41 +00:00
Richard Alam
151d790b17 Merge remote-tracking branch 'origin/extract-out-bbb-apps-after-upgrading-scala' into merge-with-akka-fs-and-akk-apps
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/CreateMeetingMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/DestroyMeetingMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/EndMeetingMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetAllMeetingsRequest.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/KeepAliveMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessageBuilder.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserConnectedToGlobalAudio.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserDisconnectedFromGlobalAudio.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/BroadcastClientMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ClientMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/DirectClientMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/DisconnectAllClientsMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/DisconnectClientMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/Constants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/CreateMeetingMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/DestroyMeetingMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/EndMeetingMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/GetAllMeetingsRequest.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/KeepAliveMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessageBuilder.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessageFromJsonConverter.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RegisterUserMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/UserConnectedToGlobalAudio.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/UserDisconnectedFromGlobalAudio.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/GenericObjectPoolConfigWrapper.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/api/MessageOutGateway.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/BroadcastClientMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ClientMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/DirectClientMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectAllClientsMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectClientMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/SharedObjectClientMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/meeting/messaging/red5/BroadcastClientMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/meeting/messaging/red5/ClientMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/meeting/messaging/red5/ConnectionInvokerService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/meeting/messaging/red5/DirectClientMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/meeting/messaging/red5/DisconnectAllClientsMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/meeting/messaging/red5/DisconnectClientMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/Constants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/CreateMeetingMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/DestroyMeetingMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/EndMeetingMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/GetAllMeetingsRequest.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/KeepAliveMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/MessageBuilder.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/MessageFromJsonConverter.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/MessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/RegisterUserMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/UserConnectedToGlobalAudio.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/UserDisconnectedFromGlobalAudio.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/ValidateAuthTokenMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/GenericObjectPoolConfigWrapper.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageReceiver.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ChatKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ChatService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/LayoutService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/LockService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/VoiceKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/VoiceService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/WhiteboardApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/WhiteboardKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/WhiteboardService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/chat/ChatKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/participants/ParticipantsListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/presentation/PreuploadedPresentation.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/voice/VoiceKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/voice/VoiceMessageListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/whiteboard/WhiteboardKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/whiteboard/WhiteboardListener.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IDispatcher.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IOutMessage.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/OutMessageListener2.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/RedisLpushDispatcher.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/PreuploadedPresentationsUtil.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/redis/GenericObjectPoolConfigWrapper.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/RecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/Recorder.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/RecorderApplication.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/RedisDispatcher.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/chat/AbstractChatRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/chat/PublicChatRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/participants/AbstractParticipantRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/participants/AssignPresenterRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/participants/ParticipantEndAndKickAllRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/participants/ParticipantJoinRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/participants/ParticipantLeftRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/participants/ParticipantStatusChangeRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/participants/RecordStatusRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/AbstractPresentationRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/ConversionCompletedPresentationRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/CursorUpdateRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/GenerateSlidePresentationRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/GotoSlidePresentationRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/RemovePresentationPresentationRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/ResizeAndMoveSlidePresentationRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/presentation/SharePresentationPresentationRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/AbstractVoiceRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/ParticipantJoinedVoiceRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/ParticipantLeftVoiceRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/ParticipantLockedVoiceRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/ParticipantMutedVoiceRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/ParticipantTalkingVoiceRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/StartRecordingVoiceRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/voice/VoiceEventRecorder.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/redis/AbstractWhiteboardRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/redis/AddShapeWhiteboardRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/redis/AddTextWhiteboardRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/redis/ClearPageWhiteboardRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/redis/ModifyTextWhiteboardRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/redis/ToggleGridWhiteboardRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/redis/UndoShapeWhiteboardRecordEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/ConferenceEventListener.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/UnknownConferenceEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/VoiceConferenceEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/VoiceStartRecordingEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/VoiceUserJoinedEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/VoiceUserLeftEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/VoiceUserLockedEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/VoiceUserMutedEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/VoiceUserTalkingEvent.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/service/recording/RecordMessage.java
	labs/akka-bbb-apps/src/main/java/org/bigbluebutton/service/recording/RedisListRecorder.java
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorGateway.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/User.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ConsoleDispatcher.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/TimestampGenerator.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/Versions.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatApp.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatInGateway.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/vo/ValueObjects.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/messaging/Util.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ChatEventRedisPublisher.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingEventRedisPublisher.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingMessageToJsonConverter.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PresentationEventRedisPublisher.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/WhiteboardEventRedisPublisher.scala
	labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/WhiteboardMessageToJsonConverter.scala
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/ConferenceServerListener.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/FreeswitchConferenceEventListener.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/commands/ConferenceCommand.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/commands/ConferenceCommandResult.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/commands/EjectUserCommand.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/commands/GetUsersCommand.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/commands/MuteUserCommand.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/BroadcastConferenceCommand.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/EjectAllUsersCommand.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/EjectUserCommand.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/FreeswitchCommand.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/GetAllUsersCommand.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/MuteUserCommand.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/RecordConferenceCommand.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/response/ConferenceMember.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/response/ConferenceMemberFlags.java
	labs/akka-bbb-fs/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/response/XMLResponseConferenceListParser.java
2015-06-02 18:39:18 +00:00
Richard Alam
a4af68377a - finish presentation messages 2015-06-02 17:52:18 +00:00