- minor formatting from IDE

wolbernd · Nov 22, 2016 · 3ead2b4 · 3ead2b4
1 parent 9f383c9
commit 3ead2b4
Show file tree

Hide file tree

Showing 14 changed files with 64 additions and 62 deletions.
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
@@ -11,33 +11,33 @@ import org.bigbluebutton.SystemConfiguration
 
 object BigBlueButtonActor extends SystemConfiguration {
   def props(system: ActorSystem,
-            eventBus: IncomingEventBus,
-            outGW: OutMessageGateway): Props =
+    eventBus: IncomingEventBus,
+    outGW: OutMessageGateway): Props =
     Props(classOf[BigBlueButtonActor], system, eventBus, outGW)
 }
 
 class BigBlueButtonActor(val system: ActorSystem,
-                         eventBus: IncomingEventBus, outGW: OutMessageGateway) extends Actor with ActorLogging {
+    eventBus: IncomingEventBus, outGW: OutMessageGateway) extends Actor with ActorLogging {
 
   implicit def executionContext = system.dispatcher
   implicit val timeout = Timeout(5 seconds)
 
   private var meetings = new collection.immutable.HashMap[String, RunningMeeting]
 
   def receive = {
-    case msg: CreateMeeting                    => handleCreateMeeting(msg)
-    case msg: DestroyMeeting                   => handleDestroyMeeting(msg)
-    case msg: KeepAliveMessage                 => handleKeepAliveMessage(msg)
-    case msg: PubSubPing                       => handlePubSubPingMessage(msg)
-    case msg: ValidateAuthToken                => handleValidateAuthToken(msg)
-    case msg: GetAllMeetingsRequest            => handleGetAllMeetingsRequest(msg)
-    case msg: UserJoinedVoiceConfMessage       => handleUserJoinedVoiceConfMessage(msg)
-    case msg: UserLeftVoiceConfMessage         => handleUserLeftVoiceConfMessage(msg)
-    case msg: UserLockedInVoiceConfMessage     => handleUserLockedInVoiceConfMessage(msg)
-    case msg: UserMutedInVoiceConfMessage      => handleUserMutedInVoiceConfMessage(msg)
-    case msg: UserTalkingInVoiceConfMessage    => handleUserTalkingInVoiceConfMessage(msg)
+    case msg: CreateMeeting => handleCreateMeeting(msg)
+    case msg: DestroyMeeting => handleDestroyMeeting(msg)
+    case msg: KeepAliveMessage => handleKeepAliveMessage(msg)
+    case msg: PubSubPing => handlePubSubPingMessage(msg)
+    case msg: ValidateAuthToken => handleValidateAuthToken(msg)
+    case msg: GetAllMeetingsRequest => handleGetAllMeetingsRequest(msg)
+    case msg: UserJoinedVoiceConfMessage => handleUserJoinedVoiceConfMessage(msg)
+    case msg: UserLeftVoiceConfMessage => handleUserLeftVoiceConfMessage(msg)
+    case msg: UserLockedInVoiceConfMessage => handleUserLockedInVoiceConfMessage(msg)
+    case msg: UserMutedInVoiceConfMessage => handleUserMutedInVoiceConfMessage(msg)
+    case msg: UserTalkingInVoiceConfMessage => handleUserTalkingInVoiceConfMessage(msg)
     case msg: VoiceConfRecordingStartedMessage => handleVoiceConfRecordingStartedMessage(msg)
-    case _                                     => // do nothing
+    case _ => // do nothing
   }
 
   private def findMeetingWithVoiceConfId(voiceConfId: String): Option[RunningMeeting] = {

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageDecoder.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageDecoder.scala
@@ -51,7 +51,7 @@ object JsonMessageDecoder {
   def decode(json: String): Option[InMessage] = {
     unmarshall(json) match {
       case Success(validMsg) => Some(validMsg)
-      case Failure(ex)       => None
+      case Failure(ex) => None
     }
   }
 

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageSenderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageSenderActor.scala
@@ -38,16 +38,16 @@ class JsonMessageSenderActor(val service: MessageSender)
   def receive = {
 
     // Breakout
-    case msg: CreateBreakoutRoom            => handleCreateBreakoutRoom(msg)
-    case msg: EndBreakoutRoom               => handleEndBreakoutRoom(msg)
-    case msg: BreakoutRoomsListOutMessage   => handleBreakoutRoomsList(msg)
+    case msg: CreateBreakoutRoom => handleCreateBreakoutRoom(msg)
+    case msg: EndBreakoutRoom => handleEndBreakoutRoom(msg)
+    case msg: BreakoutRoomsListOutMessage => handleBreakoutRoomsList(msg)
     case msg: BreakoutRoomJoinURLOutMessage => handleBreakoutRoomJoinURL(msg)
     case msg: BreakoutRoomStartedOutMessage => handleBreakoutRoomStarted(msg)
-    case msg: BreakoutRoomEndedOutMessage   => handleBreakoutRoomEnded(msg)
+    case msg: BreakoutRoomEndedOutMessage => handleBreakoutRoomEnded(msg)
     case msg: UpdateBreakoutUsersOutMessage => handleUpdateBreakoutUsers(msg)
-    case msg: MeetingTimeRemainingUpdate    => handleMeetingTimeRemainingUpdate(msg)
+    case msg: MeetingTimeRemainingUpdate => handleMeetingTimeRemainingUpdate(msg)
 
-    case _                                  => // do nothing
+    case _ => // do nothing
   }
 
   // Breakout

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
@@ -12,17 +12,17 @@ import org.bigbluebutton.core.apps.CaptionApp
 import org.bigbluebutton.core.apps.CaptionModel
 
 class LiveMeeting(val mProps: MeetingProperties,
-                  val eventBus: IncomingEventBus,
-                  val outGW: OutMessageGateway,
-                  val chatModel: ChatModel,
-                  val layoutModel: LayoutModel,
-                  val meetingModel: MeetingModel,
-                  val usersModel: UsersModel,
-                  val pollModel: PollModel,
-                  val wbModel: WhiteboardModel,
-                  val presModel: PresentationModel,
-                  val breakoutModel: BreakoutRoomModel,
-                  val captionModel: CaptionModel)(implicit val context: ActorContext)
+  val eventBus: IncomingEventBus,
+  val outGW: OutMessageGateway,
+  val chatModel: ChatModel,
+  val layoutModel: LayoutModel,
+  val meetingModel: MeetingModel,
+  val usersModel: UsersModel,
+  val pollModel: PollModel,
+  val wbModel: WhiteboardModel,
+  val presModel: PresentationModel,
+  val breakoutModel: BreakoutRoomModel,
+  val captionModel: CaptionModel)(implicit val context: ActorContext)
     extends UsersApp with PresentationApp
     with LayoutApp with ChatApp with WhiteboardApp with PollApp
     with BreakoutRoomApp with CaptionApp {

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
@@ -5,14 +5,14 @@ import java.util.concurrent.TimeUnit
 
 case object StopMeetingActor
 case class MeetingProperties(meetingID: String, externalMeetingID: String, parentMeetingID: String, meetingName: String,
-                             recorded: Boolean, voiceBridge: String, deskshareBridge: String, duration: Int,
-                             autoStartRecording: Boolean, allowStartStopRecording: Boolean, moderatorPass: String,
-                             viewerPass: String, createTime: Long, createDate: String,
-                             red5DeskShareIP: String, red5DeskShareApp: String, isBreakout: Boolean, sequence: Int)
+  recorded: Boolean, voiceBridge: String, deskshareBridge: String, duration: Int,
+  autoStartRecording: Boolean, allowStartStopRecording: Boolean, moderatorPass: String,
+  viewerPass: String, createTime: Long, createDate: String,
+  red5DeskShareIP: String, red5DeskShareApp: String, isBreakout: Boolean, sequence: Int)
 
 case class MeetingExtensionProp(maxExtensions: Int = 2, numExtensions: Int = 0, extendByMinutes: Int = 20,
-                                sendNotice: Boolean = true, sent15MinNotice: Boolean = false,
-                                sent10MinNotice: Boolean = false, sent5MinNotice: Boolean = false)
+  sendNotice: Boolean = true, sent15MinNotice: Boolean = false,
+  sent10MinNotice: Boolean = false, sent5MinNotice: Boolean = false)
 
 class MeetingModel {
   private var audioSettingsInited = false

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/Protocol.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/Protocol.scala
@@ -20,7 +20,7 @@ object UserMessagesProtocol extends DefaultJsonProtocol {
 
     def read(json: JsValue): MessageType.MessageType = json match {
       case JsString(str) => MessageType.withName(str)
-      case _             => throw new DeserializationException("Enum string expected")
+      case _ => throw new DeserializationException("Enum string expected")
     }
   }
 

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/ProtocolMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/ProtocolMessages.scala
@@ -8,6 +8,6 @@ trait OutMessage
 case class CreateBreakoutRoomOutMsgEnvelope(header: OutMsgEnvelopeHeader, payload: CreateBreakoutRoomOutMsgEnvelopePayload)
 case class CreateBreakoutRoomOutMsgEnvelopePayload(header: OutMsgHeader, payload: CreateBreakoutRoomOutMsgPayload)
 case class CreateBreakoutRoomOutMsgPayload(meetingId: String, parentId: String, name: String,
-                                           voiceConfId: String, moderatorPassword: String, viewerPassword: String,
-                                           durationInMinutes: Int, sourcePresentationId: String, sourcePresentationSlide: Int,
-                                           record: Boolean, sequence: Int)
+  voiceConfId: String, moderatorPassword: String, viewerPassword: String,
+  durationInMinutes: Int, sourcePresentationId: String, sourcePresentationSlide: Int,
+  record: Boolean, sequence: Int)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
@@ -73,9 +73,9 @@ case class GetLockSettings(meetingID: String, userId: String) extends InMessage
 /////////////////////////////////////////////////////////////////////////////////
 
 case class ValidateAuthToken(meetingID: String, userId: String, token: String,
-                             correlationId: String, sessionId: String) extends InMessage
+  correlationId: String, sessionId: String) extends InMessage
 case class RegisterUser(meetingID: String, userID: String, name: String, role: Role,
-                        extUserID: String, authToken: String, avatarURL: String) extends InMessage
+  extUserID: String, authToken: String, avatarURL: String) extends InMessage
 case class UserJoining(meetingID: String, userID: String, authToken: String) extends InMessage
 case class UserLeaving(meetingID: String, userID: String, sessionId: String) extends InMessage
 case class GetUsers(meetingID: String, requesterID: String) extends InMessage
@@ -97,9 +97,9 @@ case class GetChatHistoryRequest(meetingID: String, requesterID: String, replyTo
 case class SendPublicMessageRequest(meetingID: String, requesterID: String, message: Map[String, String]) extends InMessage
 case class SendPrivateMessageRequest(meetingID: String, requesterID: String, message: Map[String, String]) extends InMessage
 case class UserConnectedToGlobalAudio(meetingID: String, /** Not used. Just to satisfy trait **/ voiceConf: String,
-                                      userid: String, name: String) extends InMessage
+  userid: String, name: String) extends InMessage
 case class UserDisconnectedFromGlobalAudio(meetingID: String, /** Not used. Just to satisfy trait **/ voiceConf: String,
-                                           userid: String, name: String) extends InMessage
+  userid: String, name: String) extends InMessage
 
 ///////////////////////////////////////////////////////////////////////////////////////
 // Layout
@@ -108,7 +108,7 @@ case class UserDisconnectedFromGlobalAudio(meetingID: String, /** Not used. Just
 case class GetCurrentLayoutRequest(meetingID: String, requesterID: String) extends InMessage
 case class SetLayoutRequest(meetingID: String, requesterID: String, layoutID: String) extends InMessage
 case class LockLayoutRequest(meetingID: String, setById: String, lock: Boolean, viewersOnly: Boolean,
-                             layout: Option[String]) extends InMessage
+  layout: Option[String]) extends InMessage
 case class BroadcastLayoutRequest(meetingID: String, requesterID: String, layout: String) extends InMessage
 
 //////////////////////////////////////////////////////////////////////////////////////
@@ -120,19 +120,19 @@ case class RemovePresentation(meetingID: String, presentationID: String) extends
 case class GetPresentationInfo(meetingID: String, requesterID: String, replyTo: String) extends InMessage
 case class SendCursorUpdate(meetingID: String, xPercent: Double, yPercent: Double) extends InMessage
 case class ResizeAndMoveSlide(meetingID: String, xOffset: Double, yOffset: Double,
-                              widthRatio: Double, heightRatio: Double) extends InMessage
+  widthRatio: Double, heightRatio: Double) extends InMessage
 case class GotoSlide(meetingID: String, page: String) extends InMessage
 case class SharePresentation(meetingID: String, presentationID: String, share: Boolean) extends InMessage
 case class GetSlideInfo(meetingID: String, requesterID: String, replyTo: String) extends InMessage
 case class PreuploadedPresentations(meetingID: String, presentations: Seq[Presentation]) extends InMessage
 case class PresentationConversionUpdate(meetingID: String, messageKey: String, code: String,
-                                        presentationId: String, presName: String) extends InMessage
+  presentationId: String, presName: String) extends InMessage
 case class PresentationPageCountError(meetingID: String, messageKey: String, code: String, presentationId: String,
-                                      numberOfPages: Int, maxNumberPages: Int, presName: String) extends InMessage
+  numberOfPages: Int, maxNumberPages: Int, presName: String) extends InMessage
 case class PresentationSlideGenerated(meetingID: String, messageKey: String, code: String, presentationId: String,
-                                      numberOfPages: Int, pagesCompleted: Int, presName: String) extends InMessage
+  numberOfPages: Int, pagesCompleted: Int, presName: String) extends InMessage
 case class PresentationConversionCompleted(meetingID: String, messageKey: String, code: String,
-                                           presentation: Presentation) extends InMessage
+  presentation: Presentation) extends InMessage
 
 /////////////////////////////////////////////////////////////////////////////////////  
 // Polling
@@ -161,9 +161,9 @@ case class MuteUserRequest(meetingID: String, requesterID: String, userID: Strin
 case class LockUserRequest(meetingID: String, requesterID: String, userID: String, lock: Boolean) extends InMessage
 case class EjectUserFromVoiceRequest(meetingID: String, userId: String, ejectedBy: String) extends InMessage
 case class VoiceUserJoinedMessage(meetingID: String, user: String, voiceConfId: String,
-                                  callerIdNum: String, callerIdName: String, muted: Boolean, talking: Boolean) extends InMessage
+  callerIdNum: String, callerIdName: String, muted: Boolean, talking: Boolean) extends InMessage
 case class UserJoinedVoiceConfMessage(voiceConfId: String, voiceUserId: String, userId: String, externUserId: String,
-                                      callerIdName: String, callerIdNum: String, muted: Boolean, talking: Boolean, avatarURL: String, listenOnly: Boolean) extends InMessage
+  callerIdName: String, callerIdNum: String, muted: Boolean, talking: Boolean, avatarURL: String, listenOnly: Boolean) extends InMessage
 case class UserLeftVoiceConfMessage(voiceConfId: String, voiceUserId: String) extends InMessage
 case class UserLockedInVoiceConfMessage(voiceConfId: String, voiceUserId: String, locked: Boolean) extends InMessage
 case class UserMutedInVoiceConfMessage(voiceConfId: String, voiceUserId: String, muted: Boolean) extends InMessage

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
@@ -15,7 +15,7 @@ case class VoiceRecordingStopped(meetingID: String, recorded: Boolean, recording
 case class RecordingStatusChanged(meetingID: String, recorded: Boolean, userId: String, recording: Boolean) extends IOutMessage
 case class GetRecordingStatusReply(meetingID: String, recorded: Boolean, userId: String, recording: Boolean) extends IOutMessage
 case class MeetingCreated(meetingID: String, externalMeetingID: String, parentMeetingID: String, recorded: Boolean, name: String,
-                          voiceBridge: String, duration: Int, moderatorPass: String, viewerPass: String, createTime: Long, createDate: String, isBreakout: Boolean) extends IOutMessage
+  voiceBridge: String, duration: Int, moderatorPass: String, viewerPass: String, createTime: Long, createDate: String, isBreakout: Boolean) extends IOutMessage
 case class MeetingMuted(meetingID: String, recorded: Boolean, meetingMuted: Boolean) extends IOutMessage
 case class MeetingEnded(meetingID: String, recorded: Boolean, voiceBridge: String) extends IOutMessage
 case class MeetingState(meetingID: String, recorded: Boolean, userId: String, permissions: Permissions, meetingMuted: Boolean) extends IOutMessage

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
@@ -187,7 +187,7 @@ object BreakoutRoomsUtil {
   }
 
   def joinParams(username: String, userId: String, isBreakout: Boolean, breakoutMeetingId: String,
-                 password: String, redirect: Boolean): mutable.Map[String, String] = {
+    password: String, redirect: Boolean): mutable.Map[String, String] = {
     val params = new collection.mutable.HashMap[String, String]
     params += "fullName" -> urlEncode(username)
     params += "userID" -> urlEncode(userId + "-" + breakoutMeetingId.substring(breakoutMeetingId.lastIndexOf("-") + 1));

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomModel.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomModel.scala
@@ -4,7 +4,7 @@ import scala.Vector
 
 case class BreakoutUser(id: String, name: String)
 case class BreakoutRoom(id: String, externalMeetingId: String, name: String, parentRoomId: String, sequence: Integer, voiceConfId: String,
-                        assignedUsers: Vector[String], users: Vector[BreakoutUser])
+  assignedUsers: Vector[String], users: Vector[BreakoutUser])
 
 class BreakoutRoomModel {
   private var rooms = new collection.immutable.HashMap[String, BreakoutRoom]
@@ -22,7 +22,7 @@ class BreakoutRoomModel {
   }
 
   def createBreakoutRoom(parentRoomId: String, id: String, externalMeetingId: String, name: String, sequence: Integer, voiceConfId: String,
-                         assignedUsers: Vector[String]): BreakoutRoom = {
+    assignedUsers: Vector[String]): BreakoutRoom = {
     val room = new BreakoutRoom(id, externalMeetingId, name, parentRoomId, sequence, voiceConfId, assignedUsers, Vector())
     add(room)
   }

diff --git a/bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties b/bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties
@@ -1,5 +1,5 @@
 # The ip and port the BBB SIP app is going to use
-bbb.sip.app.ip=192.168.23.44
+bbb.sip.app.ip=192.168.23.53
 bbb.sip.app.port=5070
 
 # The username and password the BBB SIP app to use to 
@@ -9,7 +9,7 @@ sip.server.password=secret
 
 
 # The ip and port of the FreeSWITCH server
-freeswitch.ip=192.168.23.44
+freeswitch.ip=192.168.23.53
 freeswitch.port=5060
 
 # The start/stop RTP port the application is going to use

diff --git a/bbb.sh b/bbb.sh
@@ -5,6 +5,8 @@ set -x
 RED5_DIR=/usr/share/red5
 BBB_DIR=$(pwd)
 
+sudo chmod -R 777 $RED5_DIR/webapps/
+
 cd $BBB_DIR
 
 DESKSHARE=$BBB_DIR/bbb-screenshare

diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
@@ -94,7 +94,7 @@ private void getHeapStats() {
 		Runnable getHeapTask = () -> getHeapStatsHelper();
 
 		ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
-		executor.scheduleAtFixedRate(getHeapTask, 0, 60, TimeUnit.SECONDS);
+		executor.scheduleAtFixedRate(getHeapTask, 0, 5, TimeUnit.SECONDS);
 	}
 
 	private void getHeapStatsHelper() {