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

- group messages into it's own file

Browse Source
This commit is contained in:
Richard Alam 2017-06-28 07:23:49 -07:00
parent 30827f680e
commit c2c6b19e95
20 changed files with 23 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgDeserializer.scala
View File

@ -1,8 +1,6 @@
package org.bigbluebutton.freeswitch
import org.bigbluebutton.common2.messages.BbbCoreEnvelope
import org.bigbluebutton.common2.messages.Deserializer
import org.bigbluebutton.common2.messages.voiceconf._
import org.bigbluebutton.common2.msgs._
import com.fasterxml.jackson.databind.JsonNode

3
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgHdlrActor.scala
View File

@ -3,8 +3,7 @@ package org.bigbluebutton.freeswitch
import akka.actor.{ Actor, ActorLogging, Props }
import com.fasterxml.jackson.databind.JsonNode
import org.bigbluebutton.SystemConfiguration
import org.bigbluebutton.common2.messages.BbbCoreEnvelope
import org.bigbluebutton.common2.messages.voiceconf._
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.freeswitch.bus.ReceivedJsonMsg
import org.bigbluebutton.freeswitch.voice.freeswitch.FreeswitchApplication

13
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
View File

@ -1,19 +1,10 @@
package org.bigbluebutton.freeswitch
import org.bigbluebutton.SystemConfiguration
import org.bigbluebutton.common.messages.{ DeskShareRTMPBroadcastStartedEventMessage, DeskShareRTMPBroadcastStoppedEventMessage, DeskShareStartedEventMessage, DeskShareStoppedEventMessage }
import org.bigbluebutton.freeswitch.voice.IVoiceConferenceService
import org.bigbluebutton.endpoint.redis.RedisPublisher
import org.bigbluebutton.common.messages.VoiceConfRecordingStartedMessage
import org.bigbluebutton.common.messages.UserJoinedVoiceConfMessage
import org.bigbluebutton.common.messages.UserLeftVoiceConfMessage
import org.bigbluebutton.common.messages.UserMutedInVoiceConfMessage
import org.bigbluebutton.common.messages.UserTalkingInVoiceConfMessage
import org.bigbluebutton.common.messages.DeskShareStartedEventMessage
import org.bigbluebutton.common.messages.DeskShareStoppedEventMessage
import org.bigbluebutton.common.messages.DeskShareRTMPBroadcastStartedEventMessage
import org.bigbluebutton.common.messages.DeskShareRTMPBroadcastStoppedEventMessage
import org.bigbluebutton.common2.messages.{ BbbCommonEnvCoreMsg, BbbCoreEnvelope }
import org.bigbluebutton.common2.messages.voiceconf._
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.common2.util.JsonUtil
class VoiceConferenceService(sender: RedisPublisher) extends IVoiceConferenceService with SystemConfiguration {

2
bbb-apps-common/src/main/scala/org/bigbluebutton/client/MsgToAkkaAppsToJsonActor.scala
View File

@ -2,7 +2,7 @@ package org.bigbluebutton.client
import akka.actor.{Actor, ActorLogging, Props}
import org.bigbluebutton.client.bus.{JsonMsgToAkkaAppsBus, JsonMsgToAkkaAppsBusMsg, JsonMsgToSendToAkkaApps}
import org.bigbluebutton.common2.messages.BbbCommonEnvJsNodeMsg
import org.bigbluebutton.common2.msgs.BbbCommonEnvJsNodeMsg
import org.bigbluebutton.common2.util.JsonUtil
object MsgToAkkaAppsToJsonActor {

2
bbb-apps-common/src/main/scala/org/bigbluebutton/client/ReceivedJsonMsgHdlrActor.scala
View File

@ -2,7 +2,7 @@ package org.bigbluebutton.client
import akka.actor.{Actor, ActorLogging, Props}
import org.bigbluebutton.client.bus.{JsonMsgFromAkkaApps, MsgFromAkkaApps, MsgFromAkkaAppsEventBus}
import org.bigbluebutton.common2.messages.BbbCommonEnvJsNodeMsg
import org.bigbluebutton.common2.msgs.BbbCommonEnvJsNodeMsg
import org.bigbluebutton.common2.util.JsonUtil
import scala.util.{Failure, Success}

2
bbb-apps-common/src/main/scala/org/bigbluebutton/client/RxJsonMsgHdlrTrait.scala
View File

@ -2,7 +2,7 @@ package org.bigbluebutton.client
import org.bigbluebutton.client.bus.JsonMsgFromAkkaApps
import org.bigbluebutton.common2.util.JsonUtil
import org.bigbluebutton.common2.messages.BbbCommonEnvJsNodeMsg
import org.bigbluebutton.common2.msgs.BbbCommonEnvJsNodeMsg
trait RxJsonMsgHdlrTrait {

2
bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgFromAkkaAppsEventBus.scala
View File

@ -2,7 +2,7 @@ package org.bigbluebutton.client.bus
import akka.actor.ActorRef
import akka.event.{EventBus, LookupClassification}
import org.bigbluebutton.common2.messages.{ BbbCommonEnvJsNodeMsg}
import org.bigbluebutton.common2.msgs.{ BbbCommonEnvJsNodeMsg}
case class MsgFromAkkaApps(val topic: String, val payload: BbbCommonEnvJsNodeMsg)

2
bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgToAkkaAppsEventBus.scala
View File

@ -2,7 +2,7 @@ package org.bigbluebutton.client.bus
import akka.actor.ActorRef
import akka.event.{EventBus, LookupClassification}
import org.bigbluebutton.common2.messages.{BbbCommonEnvJsNodeMsg}
import org.bigbluebutton.common2.msgs.{BbbCommonEnvJsNodeMsg}
case class MsgToAkkaApps(val topic: String, val payload: BbbCommonEnvJsNodeMsg)

2
bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgToClientEventBus.scala
View File

@ -2,7 +2,7 @@ package org.bigbluebutton.client.bus
import akka.actor.ActorRef
import akka.event.{EventBus, LookupClassification}
import org.bigbluebutton.common2.messages.BbbCommonEnvJsNodeMsg
import org.bigbluebutton.common2.msgs.BbbCommonEnvJsNodeMsg
sealed trait ToConnectionMsg
case class BroadcastMsgToMeeting(meetingId: String, data: BbbCommonEnvJsNodeMsg) extends ToConnectionMsg

2
bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/MeetingActor.scala
View File

@ -3,7 +3,7 @@ package org.bigbluebutton.client.meeting
import akka.actor.{Actor, ActorLogging, Props}
import org.bigbluebutton.client.SystemConfiguration
import org.bigbluebutton.client.bus._
import org.bigbluebutton.common2.messages.{BbbCommonEnvJsNodeMsg, MessageTypes}
import org.bigbluebutton.common2.msgs.{BbbCommonEnvJsNodeMsg, MessageTypes}
object MeetingActor {
def props(meetingId: String, msgToAkkaAppsEventBus: MsgToAkkaAppsEventBus,

2
bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/MeetingManagerActor.scala
View File

@ -2,7 +2,7 @@ package org.bigbluebutton.client.meeting
import akka.actor.{Actor, ActorLogging, Props}
import org.bigbluebutton.client.bus._
import org.bigbluebutton.common2.messages.{BbbCommonEnvJsNodeMsg, MessageTypes}
import org.bigbluebutton.common2.msgs.{BbbCommonEnvJsNodeMsg, MessageTypes}
object MeetingManagerActor {

3
bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/UserActor.scala
View File

@ -3,10 +3,9 @@ package org.bigbluebutton.client.meeting
import akka.actor.{Actor, ActorLogging, Props}
import org.bigbluebutton.client.{ConnInfo, SystemConfiguration}
import org.bigbluebutton.client.bus._
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.common2.util.JsonUtil
import com.fasterxml.jackson.databind.JsonNode
import org.bigbluebutton.common2.messages.users.{UserLeaveReqMsg, UserLeaveReqMsgBody}
import scala.util.{Failure, Success}

2
bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgFromAkkaAppsEventBus.scala
View File

@ -2,7 +2,7 @@ package org.bigbluebutton.api2.bus
import akka.actor.ActorRef
import akka.event.{EventBus, LookupClassification}
import org.bigbluebutton.common2.messages.{BbbCommonEnvCoreMsg}
import org.bigbluebutton.common2.msgs.{BbbCommonEnvCoreMsg}
case class MsgFromAkkaApps(val topic: String, val payload: BbbCommonEnvCoreMsg)

2
bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsEventBus.scala
View File

@ -2,7 +2,7 @@ package org.bigbluebutton.api2.bus
import akka.actor.ActorRef
import akka.event.{EventBus, LookupClassification}
import org.bigbluebutton.common2.messages.BbbCommonEnvCoreMsg
import org.bigbluebutton.common2.msgs.BbbCommonEnvCoreMsg
case class MsgToAkkaApps(val topic: String, val payload: BbbCommonEnvCoreMsg)

2
bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsToJsonActor.scala
View File

@ -2,7 +2,7 @@ package org.bigbluebutton.api2.bus
import akka.actor.{Actor, ActorLogging, Props}
import org.bigbluebutton.api2.SystemConfiguration
import org.bigbluebutton.common2.messages.BbbCommonEnvCoreMsg
import org.bigbluebutton.common2.msgs.BbbCommonEnvCoreMsg
import org.bigbluebutton.common2.util.JsonUtil
object MsgToAkkaAppsToJsonActor {

6
bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
View File

@ -1,9 +1,9 @@
package org.bigbluebutton.api2.bus
import org.bigbluebutton.api2.SystemConfiguration
import org.bigbluebutton.common2.messages.BbbCoreEnvelope
import org.bigbluebutton.common2.messages.Deserializer
import org.bigbluebutton.common2.messages.MeetingCreatedEvtMsg
import org.bigbluebutton.common2.msgs.BbbCoreEnvelope
import org.bigbluebutton.common2.msgs.Deserializer
import org.bigbluebutton.common2.msgs.MeetingCreatedEvtMsg
import com.fasterxml.jackson.databind.JsonNode

2
bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedMessageRouter.scala
View File

@ -2,7 +2,7 @@ package org.bigbluebutton.api2.bus
import org.bigbluebutton.api2.SystemConfiguration
import org.bigbluebutton.api2.SystemConfiguration
import org.bigbluebutton.common2.messages.{BbbCommonEnvCoreMsg, BbbCoreEnvelope, MeetingCreatedEvtMsg}
import org.bigbluebutton.common2.msgs.{BbbCommonEnvCoreMsg, BbbCoreEnvelope, MeetingCreatedEvtMsg}
trait ReceivedMessageRouter extends SystemConfiguration {

2
bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/FromAkkaAppsHandlersTrait.scala
View File

@ -1,6 +1,6 @@
package org.bigbluebutton.api2.meeting
import org.bigbluebutton.common2.messages.MeetingCreatedEvtMsg
import org.bigbluebutton.common2.msgs.MeetingCreatedEvtMsg
trait FromAkkaAppsHandlersTrait {
def handleMeetingCreatedEvtMsg(msg: MeetingCreatedEvtMsg): Unit = {

3
bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/MeetingsManagerActor.scala
View File

@ -6,8 +6,7 @@ import org.bigbluebutton.api2.bus.MsgToAkkaAppsEventBus
import org.bigbluebutton.common2.domain.DefaultProps
import org.bigbluebutton.api2.util.Util2
import org.bigbluebutton.common.messages.UserJoinedVoiceMessage
import org.bigbluebutton.common2.messages.{BbbCommonEnvCoreMsg, MeetingCreatedEvtMsg}
import org.bigbluebutton.common2.msgs.{BbbCommonEnvCoreMsg, MeetingCreatedEvtMsg}
sealed trait ApiMsg
case class CreateBreakoutRoomMsg(meetingId: String, parentMeetingId: String,

3
bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/ToAkkaAppsSendersTrait.scala
View File

@ -3,8 +3,7 @@ package org.bigbluebutton.api2.meeting
import org.bigbluebutton.api2.SystemConfiguration
import org.bigbluebutton.api2.bus.{MsgToAkkaApps, MsgToAkkaAppsEventBus}
import org.bigbluebutton.common2.domain.DefaultProps
import org.bigbluebutton.common2.messages._
import org.bigbluebutton.common2.messages.users.{RegisterUserReqMsg, RegisterUserReqMsgBody}
import org.bigbluebutton.common2.msgs._
trait ToAkkaAppsSendersTrait extends SystemConfiguration {
val msgToAkkaAppsEventBus: MsgToAkkaAppsEventBus