Commit Graph

1096 Commits

Author SHA1 Message Date
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
Richard Alam
00988e2da6 - remove apps from red5 2015-05-28 17:58:35 +00:00
Richard Alam
1f02d3ba06 - move messages into it's own package 2015-05-28 15:39:33 +00:00
Richard Alam
e05a7e4fcf - voice messages 2015-05-27 22:01:47 +00:00
Richard Alam
9d020b0e7d - start converting voice messages 2015-05-27 21:06:44 +00:00
Richard Alam
c083c14135 Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/PresentationClientMessageSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/Util.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
2015-05-27 15:31:25 +00:00
Anton Georgiev
18c828cb41 -whiteboard redis->red5 2015-05-27 10:41:20 -04:00
Richard Alam
b922fd3437 - start implementing presentation messages 2015-05-26 22:12:45 +00:00
Richard Alam
dd6d22ce94 Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/Util.java
2015-05-26 19:04:03 +00:00
Richard Alam
1f5bce2228 - implement layout messages 2015-05-26 18:49:53 +00:00
Richard Alam
9a28cbc516 - remote chat application (cleanup) 2015-05-26 16:58:52 +00:00
Richard Alam
3c14827c27 - initialize permissions messages 2015-05-26 16:51:04 +00:00
Anton Georgiev
0982e28449 accommodate for drawing text shapes 2015-05-26 11:58:37 -04:00
Anton Georgiev
1a7c0076a0 -whiteboard events red5->redis 2015-05-26 11:35:21 -04:00
Richard Alam
f4cbc0ef13 - finish users messages 2015-05-26 15:29:15 +00:00
Richard Alam
79d48df4cf - implement user messages from red5 to bbb-apps 2015-05-26 15:20:10 +00:00
Richard Alam
c603702259 Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/GetChatHistory.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/GetChatHistory.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/GetChatHistoryRequestMessage.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
2015-05-25 22:14:49 +00:00
Richard Alam
6a8dc89793 - determine if message is published or subscribed message type 2015-05-25 21:54:46 +00:00
Richard Alam
ee3280af44 - organize messages 2015-05-25 21:38:11 +00:00
Richard Alam
3619fd4bd9 - cleanup 2015-05-25 20:38:37 +00:00
Anton Georgiev
33f189c965 Merge branch 'upgrade-to-scala-2.11' of https://github.com/ritzalam/bigbluebutton into encode-decode-json
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/Constants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/messages/Util.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/chat/red5/ChatClientMessageSender.scala
2015-05-25 16:32:53 -04:00
Anton Georgiev
bb415779cb -chat reply to redis 2015-05-25 16:16:12 -04:00
Richard Alam
55449282b6 - split out the client message senders 2015-05-25 20:06:59 +00:00
Richard Alam
81cde8c9ff - finish converting users messages 2015-05-25 19:36:49 +00:00
Richard Alam
22acfdada1 - fix listen only 2015-05-25 19:08:16 +00:00
Richard Alam
2570b704d5 - get users reply message 2015-05-25 18:52:25 +00:00
Richard Alam
d345517482 - convert recording messages 2015-05-25 17:37:28 +00:00
Richard Alam
163d2ec552 - convert meeting state and meeting muted messages 2015-05-25 16:14:48 +00:00
Richard Alam
8ad21545b8 - convert more voice messages 2015-05-25 15:04:13 +00:00
Richard Alam
d52795f66b - add voice messages 2015-05-25 14:44:19 +00:00
Richard Alam
96a7bff10e - convert webcam messages 2015-05-25 14:08:29 +00:00
Richard Alam
b100862087 - convert raise hand messages 2015-05-22 22:12:58 +00:00
Anton Georgiev
f1b5fdda73 package moved 2015-05-22 17:21:37 -04:00
Anton Georgiev
12b8ecf0ac cleaning up 2015-05-22 16:45:10 -04:00
Richard Alam
6018ff2290 Merge branch 'encode-decode-json' of https://github.com/antobinary/bigbluebutton into upgrade-to-scala-2.11
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/Red5BBBInGw.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
2015-05-22 20:41:34 +00:00
Richard Alam
b542cd6382 - convert more messages 2015-05-22 20:17:57 +00:00