Skip to content

Commit

Permalink
- move messages into different package
Browse files Browse the repository at this point in the history
  • Loading branch information
ritzalam committed Jun 28, 2017
1 parent a32193b commit 30827f6
Show file tree
Hide file tree
Showing 103 changed files with 737 additions and 744 deletions.
Expand Up @@ -6,15 +6,12 @@ import akka.actor._
import akka.actor.ActorLogging
import akka.actor.SupervisorStrategy.Resume
import akka.util.Timeout

import scala.concurrent.duration._
import org.bigbluebutton.core.bus._
import org.bigbluebutton.core.api._
import org.bigbluebutton.SystemConfiguration
import java.util.concurrent.TimeUnit

import org.bigbluebutton.common2.messages.Users.RegisterUserReqMsg
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.running.RunningMeeting
import org.bigbluebutton.core2.RunningMeetings

Expand Down
Expand Up @@ -2,9 +2,7 @@ package org.bigbluebutton.core

import org.bigbluebutton.core.bus._
import org.bigbluebutton.core.api._

import scala.collection.JavaConversions._
import org.bigbluebutton.core.apps.Page
import org.bigbluebutton.core.apps.Presentation
import akka.actor.ActorSystem
import org.bigbluebutton.common.messages.IBigBlueButtonMessage
Expand Down
@@ -1,6 +1,6 @@
package org.bigbluebutton.core

import org.bigbluebutton.common2.messages.BbbCoreMsg
import org.bigbluebutton.common2.msgs.BbbCoreMsg

object MessageRecorder {
def record(outGW: OutMessageGateway, record: Boolean, msg: BbbCoreMsg): Unit = {
Expand Down
@@ -1,7 +1,7 @@
package org.bigbluebutton.core

import org.bigbluebutton.SystemConfiguration
import org.bigbluebutton.common2.messages.{ BbbCommonEnvCoreMsg, BbbCoreMsg }
import org.bigbluebutton.common2.msgs.{ BbbCommonEnvCoreMsg, BbbCoreMsg }
import org.bigbluebutton.core.bus._
import org.bigbluebutton.core.api.IOutMessage

Expand Down
@@ -1,10 +1,9 @@
package org.bigbluebutton.core.api

import org.bigbluebutton.common2.messages.BreakoutRooms.BreakoutUserVO
import org.bigbluebutton.common2.msgs.BreakoutUserVO
import org.bigbluebutton.core.api.SharedNotesOperation.SharedNotesOperation
import org.bigbluebutton.core.apps.Presentation
import spray.json.JsObject

case class InMessageHeader(name: String)
case class InHeaderAndJsonPayload(header: InMessageHeader, payload: JsObject)
case class MessageProcessException(message: String) extends Exception(message)
Expand Down
Expand Up @@ -3,7 +3,7 @@ package org.bigbluebutton.core.api
import org.bigbluebutton.core.apps._
import org.bigbluebutton.core.models._
import org.bigbluebutton.common2.domain.UserVO
import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomInfo, BreakoutUserVO }
import org.bigbluebutton.common2.msgs.{ BreakoutRoomInfo, BreakoutUserVO }

case class VoiceRecordingStarted(meetingID: String, recorded: Boolean, recordingFile: String, timestamp: String, confNum: String) extends IOutMessage
case class VoiceRecordingStopped(meetingID: String, recorded: Boolean, recordingFile: String, timestamp: String, confNum: String) extends IOutMessage
Expand Down
Expand Up @@ -6,7 +6,7 @@ import scala.collection.SortedSet
import scala.collection.mutable
import org.apache.commons.codec.digest.DigestUtils
import org.bigbluebutton.SystemConfiguration
import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomInfo, BreakoutUserVO }
import org.bigbluebutton.common2.msgs.{ BreakoutRoomInfo, BreakoutUserVO }
import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.core.api._
import org.bigbluebutton.core.bus.BigBlueButtonEvent
Expand All @@ -23,7 +23,10 @@ trait BreakoutRoomApp extends SystemConfiguration {
val eventBus: IncomingEventBus

def handleBreakoutRoomsList(msg: BreakoutRoomsListMessage) {
val breakoutRooms = BreakoutRooms.getRooms(liveMeeting.breakoutRooms).toVector map { r => new BreakoutRoomInfo(r.name, r.externalMeetingId, r.id, r.sequence) }
val breakoutRooms = BreakoutRooms.getRooms(liveMeeting.breakoutRooms).toVector map { r =>
new BreakoutRoomInfo(r.name, r.externalMeetingId, r.id, r.sequence)
}

val roomsReady = liveMeeting.breakoutRooms.pendingRoomsNumber == 0 && breakoutRooms.length > 0
log.info("Sending breakout rooms list to {} with containing {} room(s)", props.meetingProp.intId, breakoutRooms.length)
outGW.send(new BreakoutRoomsListOutMessage(props.meetingProp.intId, breakoutRooms, roomsReady))
Expand Down
@@ -1,8 +1,7 @@
package org.bigbluebutton.core.apps

import org.bigbluebutton.common2.domain.UserVO
import org.bigbluebutton.common2.messages.Presentation.{ PresenterAssignedEvtMsg, PresenterAssignedEvtMsgBody }
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.api._
import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.core.models._
Expand Down
@@ -1,9 +1,8 @@
package org.bigbluebutton.core.apps.presentation

import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.common2.domain.PresentationVO
import org.bigbluebutton.common2.messages.Presentation.{ GetPresentationInfoReqMsg, GetPresentationInfoRespMsg, GetPresentationInfoRespMsgBody }
import org.bigbluebutton.core.apps.Presentation

trait GetPresentationInfoReqMsgHdlr {
Expand Down
@@ -1,9 +1,8 @@
package org.bigbluebutton.core.apps.presentation

import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.common2.domain.PresentationVO
import org.bigbluebutton.common2.messages.Presentation.{ NewPresentationEvtMsg, NewPresentationEvtMsgBody }

trait NewPresentationMsgHdlr {
this: PresentationApp2x =>
Expand All @@ -22,4 +21,4 @@ trait NewPresentationMsgHdlr {

//record(event)
}
}
}
@@ -1,9 +1,8 @@
package org.bigbluebutton.core.apps.presentation

import org.bigbluebutton.common2.domain.PageVO
import org.bigbluebutton.common2.messages.Presentation.{ PresentationConversionCompletedEvtMsg, PresentationConversionCompletedEvtMsgBody, PresentationConversionCompletedPubMsg }
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.core.apps.Presentation

trait PresentationConversionCompletedPubMsgHdlr {
Expand Down
@@ -1,8 +1,7 @@
package org.bigbluebutton.core.apps.presentation

import org.bigbluebutton.common2.messages.Presentation.{ PresentationConversionUpdateEvtMsg, PresentationConversionUpdateEvtMsgBody, PresentationConversionUpdatePubMsg }
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.common2.messages._

trait PresentationConversionUpdatePubMsgHdlr {
this: PresentationApp2x =>
Expand All @@ -26,4 +25,4 @@ trait PresentationConversionUpdatePubMsgHdlr {

broadcastEvent(msg)
}
}
}
@@ -1,8 +1,7 @@
package org.bigbluebutton.core.apps.presentation

import org.bigbluebutton.common2.messages.Presentation.{ PresentationPageCountErrorEvtMsg, PresentationPageCountErrorEvtMsgBody, PresentationPageCountErrorPubMsg }
import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._

trait PresentationPageCountErrorPubMsgHdlr {
this: PresentationApp2x =>
Expand All @@ -26,4 +25,4 @@ trait PresentationPageCountErrorPubMsgHdlr {

broadcastEvent(msg)
}
}
}
@@ -1,8 +1,7 @@
package org.bigbluebutton.core.apps.presentation

import org.bigbluebutton.common2.messages.Presentation.{ PresentationPageGeneratedEvtMsg, PresentationPageGeneratedEvtMsgBody, PresentationPageGeneratedPubMsg }
import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._

trait PresentationPageGeneratedPubMsgHdlr {
this: PresentationApp2x =>
Expand All @@ -26,4 +25,4 @@ trait PresentationPageGeneratedPubMsgHdlr {

broadcastEvent(msg)
}
}
}
@@ -1,7 +1,7 @@
package org.bigbluebutton.core.apps.presentation

import org.bigbluebutton.common2.domain.PageVO
import org.bigbluebutton.common2.messages.Presentation.PreuploadedPresentationsPubMsg
import org.bigbluebutton.common2.msgs.PreuploadedPresentationsPubMsg
import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.core.apps.Presentation

Expand Down
@@ -1,8 +1,7 @@
package org.bigbluebutton.core.apps.presentation

import org.bigbluebutton.common2.messages.Presentation.{ RemovePresentationEvtMsg, RemovePresentationEvtMsgBody, RemovePresentationPubMsg }
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.common2.messages._

trait RemovePresentationPubMsgHdlr {
this: PresentationApp2x =>
Expand Down Expand Up @@ -30,4 +29,4 @@ trait RemovePresentationPubMsgHdlr {
broadcastEvent(msg)
}
}
}
}
@@ -1,9 +1,8 @@
package org.bigbluebutton.core.apps.presentation

import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.common2.domain.PageVO
import org.bigbluebutton.common2.messages.Presentation.{ ResizeAndMovePageEvtMsg, ResizeAndMovePageEvtMsgBody, ResizeAndMovePagePubMsg }

trait ResizeAndMovePagePubMsgHdlr {
this: PresentationApp2x =>
Expand Down Expand Up @@ -31,4 +30,4 @@ trait ResizeAndMovePagePubMsgHdlr {
broadcastEvent(msg, page)
}
}
}
}
@@ -1,8 +1,7 @@
package org.bigbluebutton.core.apps.presentation

import org.bigbluebutton.common2.messages.Presentation.{ SetCurrentPageEvtMsg, SetCurrentPageEvtMsgBody, SetCurrentPagePubMsg }
import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._

trait SetCurrentPagePubMsgHdlr {
this: PresentationApp2x =>
Expand All @@ -28,4 +27,4 @@ trait SetCurrentPagePubMsgHdlr {
broadcastEvent(msg)
}
}
}
}
@@ -1,8 +1,7 @@
package org.bigbluebutton.core.apps.presentation

import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.common2.messages.Presentation.{ SetCurrentPresentationEvtMsg, SetCurrentPresentationEvtMsgBody, SetCurrentPresentationPubMsg }
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._

trait SetCurrentPresentationPubMsgHdlr {
this: PresentationApp2x =>
Expand Down Expand Up @@ -30,4 +29,4 @@ trait SetCurrentPresentationPubMsgHdlr {
broadcastEvent(msg)
}
}
}
}
Expand Up @@ -2,7 +2,7 @@ package org.bigbluebutton.core.bus

import akka.actor.ActorRef
import akka.event.{ EventBus, LookupClassification }
import org.bigbluebutton.common2.messages.BbbCommonEnvCoreMsg
import org.bigbluebutton.common2.msgs.BbbCommonEnvCoreMsg

case class BbbMsgEvent(val topic: String, val payload: BbbCommonEnvCoreMsg)

Expand Down
Expand Up @@ -2,7 +2,7 @@ package org.bigbluebutton.core.bus

import akka.actor.ActorRef
import akka.event.{ EventBus, LookupClassification }
import org.bigbluebutton.common2.messages.{ BbbCommonEnvCoreMsg }
import org.bigbluebutton.common2.msgs.{ BbbCommonEnvCoreMsg }

case class BbbOutMessage(val topic: String, val payload: BbbCommonEnvCoreMsg)

Expand Down
Expand Up @@ -2,7 +2,7 @@ package org.bigbluebutton.core.bus

import akka.actor.ActorRef
import akka.event.{ EventBus, LookupClassification }
import org.bigbluebutton.common2.messages.{ BbbCoreMsg }
import org.bigbluebutton.common2.msgs.{ BbbCoreMsg }

case class BbbRecordMessage(val topic: String, val payload: BbbCoreMsg)

Expand Down
@@ -1,6 +1,6 @@
package org.bigbluebutton.core.models

import org.bigbluebutton.common2.messages.BreakoutRooms.{ BreakoutRoomVO, BreakoutUserVO }
import org.bigbluebutton.common2.msgs.{ BreakoutRoomVO, BreakoutUserVO }

object BreakoutRooms {

Expand Down
Expand Up @@ -2,7 +2,7 @@ package org.bigbluebutton.core.pubsub.senders

import com.fasterxml.jackson.databind.JsonNode
import org.bigbluebutton.SystemConfiguration
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.bus.BbbMsgEvent
import scala.reflect.runtime.universe._

Expand Down
Expand Up @@ -3,15 +3,7 @@ package org.bigbluebutton.core.pubsub.senders
import akka.actor.{ Actor, ActorLogging, Props }
import org.bigbluebutton.SystemConfiguration
import com.fasterxml.jackson.databind.JsonNode
import org.bigbluebutton.common2.messages.BreakoutRooms._
import org.bigbluebutton.common2.messages.Layout.{ BroadcastLayoutMsg, GetCurrentLayoutMsg, LockLayoutMsg }
import org.bigbluebutton.common2.messages.Polls._
import org.bigbluebutton.common2.messages.Presentation._
import org.bigbluebutton.common2.messages.Users.{ RegisterUserReqMsg, UserJoinMeetingReqMsg, UserLeaveReqMsg, ValidateAuthTokenReqMsg }
import org.bigbluebutton.common2.messages.VoiceConf._
import org.bigbluebutton.common2.messages.Webcams.{ UserBroadcastCamStartMsg, UserBroadcastCamStopMsg }
import org.bigbluebutton.common2.messages.Whiteboard._
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.bus._
import org.bigbluebutton.core2.ReceivedMessageRouter

Expand Down
Expand Up @@ -6,15 +6,6 @@ import akka.actor._
import akka.actor.ActorLogging
import akka.actor.SupervisorStrategy.Resume
import org.bigbluebutton.common2.domain.DefaultProps
import org.bigbluebutton.common2.messages.BreakoutRooms._
import org.bigbluebutton.common2.messages.Layout.{ BroadcastLayoutMsg, GetCurrentLayoutMsg, LockLayoutMsg }
import org.bigbluebutton.common2.messages.Polls._
import org.bigbluebutton.common2.messages.Presentation._
import org.bigbluebutton.common2.messages.Users.{ RegisterUserReqMsg, UserJoinMeetingReqMsg, UserLeaveReqMsg, ValidateAuthTokenReqMsg }
import org.bigbluebutton.common2.messages.VoiceConf.{ UserJoinedVoiceConfEvtMsg, UserLeftVoiceConfEvtMsg, UserMutedInVoiceConfEvtMsg, UserTalkingInVoiceConfEvtMsg }
import org.bigbluebutton.common2.messages.Webcams.{ UserBroadcastCamStartMsg, UserBroadcastCamStopMsg }
import org.bigbluebutton.common2.messages.Whiteboard._
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.core._
import org.bigbluebutton.core.api._
import org.bigbluebutton.core.apps._
Expand All @@ -27,7 +18,7 @@ import org.bigbluebutton.core.models.{ RegisteredUsers, Users1x }
import org.bigbluebutton.core2.MeetingStatus2x
import org.bigbluebutton.core2.message.handlers._
import org.bigbluebutton.core2.message.handlers.users._

import org.bigbluebutton.common2.msgs._
import scala.concurrent.duration._
import org.bigbluebutton.core.models.BreakoutRooms
import org.bigbluebutton.core2.message.handlers.breakoutrooms._
Expand Down
Expand Up @@ -2,7 +2,7 @@ package org.bigbluebutton.core2

import akka.actor.{ Actor, ActorLogging, Props }
import org.bigbluebutton.SystemConfiguration
import org.bigbluebutton.common2.messages.BbbCommonEnvCoreMsg
import org.bigbluebutton.common2.msgs.BbbCommonEnvCoreMsg
import org.bigbluebutton.common2.util.JsonUtil
import org.bigbluebutton.core.MessageSender

Expand Down
@@ -1,11 +1,10 @@
package org.bigbluebutton.core2.message.handlers

import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.core.models.Polls
import org.bigbluebutton.core.running.MeetingActor
import org.bigbluebutton.common2.domain.PollVO
import org.bigbluebutton.common2.messages.Polls.{ GetCurrentPollReqMsg, GetCurrentPollRespMsg, GetCurrentPollRespMsgBody }

trait GetCurrentPollReqMsgHdlr {
this: MeetingActor =>
Expand Down
@@ -1,7 +1,6 @@
package org.bigbluebutton.core2.message.handlers

import org.bigbluebutton.common2.messages.Polls.{ HidePollResultReqMsg, PollHideResultEvtMsg, PollHideResultEvtMsgBody }
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.core.models.Polls
import org.bigbluebutton.core.running.MeetingActor
Expand Down
@@ -1,7 +1,6 @@
package org.bigbluebutton.core2.message.handlers

import org.bigbluebutton.common2.messages.VoiceConf.{ MuteUserInVoiceConfMsg, MuteUserInVoiceConfMsgBody }
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.core.api.{ MeetingMuted, MuteAllExceptPresenterRequest, MuteVoiceUser }
import org.bigbluebutton.core.models.{ Users2x, VoiceUserState, VoiceUsers }
Expand Down
@@ -1,7 +1,6 @@
package org.bigbluebutton.core2.message.handlers

import org.bigbluebutton.common2.messages.VoiceConf.{ MuteUserInVoiceConfMsg, MuteUserInVoiceConfMsgBody }
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.OutMessageGateway
import org.bigbluebutton.core.api.{ MeetingMuted, MuteMeetingRequest, MuteVoiceUser }
import org.bigbluebutton.core.models.{ Users1x, VoiceUserState, VoiceUsers }
Expand Down

0 comments on commit 30827f6

Please sign in to comment.