BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into breakout-rooms-porto-algre-2015

Browse Source
This commit is contained in:
Richard Alam 2015-11-17 14:33:57 -05:00
commit f7630bdc74
5 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
View File

@ -16,10 +16,7 @@ import org.bigbluebutton.common.messages.UserConnectedToGlobalAudio;
import org.bigbluebutton.common.messages.UserDisconnectedFromGlobalAudio;
import org.bigbluebutton.common.messages.ValidateAuthTokenMessage;
import org.bigbluebutton.core.api.IBigBlueButtonInGW;
import org.bigbluebutton.messages.CreateBreakoutRoomsRequest;
import org.bigbluebutton.messages.CreateMeetingRequest;
import org.bigbluebutton.messages.ListenInOnBreakout;
import org.bigbluebutton.messages.RequestBreakoutJoinURL;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

1
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
View File

@ -89,6 +89,7 @@ class BigBlueButtonInGW(
def forwardMessage(msg: InMessage) = {
msg match {
case m: CreateBreakoutRooms => eventBus.publish(BigBlueButtonEvent(m.meetingId, m))
case m: RequestBreakoutJoinURLInMessage => eventBus.publish(BigBlueButtonEvent(m.userId, m))
case _ => log.error("Unhandled message: {}", msg)
}
}

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageDecoder.scala
View File

@ -5,6 +5,7 @@ import spray.json.{ JsObject, JsonParser, DeserializationException }
import org.parboiled.errors.ParsingException
import org.bigbluebutton.core.api._
import org.bigbluebutton.messages.CreateBreakoutRoomsRequest
import org.bigbluebutton.messages.RequestBreakoutJoinURL
object JsonMessageDecoder {
import org.bigbluebutton.core.UserMessagesProtocol._
@ -60,6 +61,9 @@ object JsonMessageDecoder {
case CreateBreakoutRoomsRequest.NAME => {
msg.payload.convertTo[CreateBreakoutRooms]
}
case RequestBreakoutJoinURL.NAME => {
msg.payload.convertTo[RequestBreakoutJoinURL]
}
case _ => throw MessageProcessException("Cannot parse JSON message: [" + msg + "]")
}
}

20
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
View File

@ -19,25 +19,11 @@ import scala.collection.JavaConversions._
import org.bigbluebutton.core.apps.SimplePollResultOutVO
import org.bigbluebutton.core.apps.SimplePollOutVO
import org.bigbluebutton.core.pubsub.senders.UsersMessageToJsonConverter
import org.bigbluebutton.common.messages.GetUsersFromVoiceConfRequestMessage
import org.bigbluebutton.common.messages.MuteUserInVoiceConfRequestMessage
import org.bigbluebutton.common.messages.EjectUserFromVoiceConfRequestMessage
import org.bigbluebutton.common.messages.GetCurrentLayoutReplyMessage
import org.bigbluebutton.common.messages.BroadcastLayoutMessage
import org.bigbluebutton.common.messages.LockLayoutMessage
import org.bigbluebutton.common.messages._
import org.bigbluebutton.core.pubsub.senders.WhiteboardMessageToJsonConverter
import org.bigbluebutton.common.converters.ToJsonEncoder
import org.bigbluebutton.messages.payload.BreakoutRoomPayload
import org.bigbluebutton.messages.BreakoutRoomStarted
import org.bigbluebutton.messages.payload.CreateBreakoutRoomRequestPayload
import org.bigbluebutton.messages.CreateBreakoutRoomRequest
import org.bigbluebutton.messages.payload.BreakoutRoomJoinURLPayload
import org.bigbluebutton.messages.BreakoutRoomJoinURL
import org.bigbluebutton.messages.payload.UpdateBreakoutUsersPayload
import org.bigbluebutton.messages.payload.BreakoutUserPayload
import org.bigbluebutton.messages.UpdateBreakoutUsers
import org.bigbluebutton.messages.payload.MeetingTimeRemainingPayload
import org.bigbluebutton.messages.TimeRemainingUpdate
import org.bigbluebutton.messages.payload._
import org.bigbluebutton.messages._
object MessageSenderActor {
def props(msgSender: MessageSender): Props =

1
bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java
View File

@ -375,7 +375,6 @@ public class ParamsProcessorUtil {
return meeting;
}
public String getApiVersion() {
return apiVersion;
}