- start implementing custom poll

akka-bbb-apps/build.sbt

@@ -50,7 +50,7 @@ libraryDependencies ++= {
 	  "com.google.code.gson"      %  "gson"              % "1.7.1",
 	  "redis.clients"             %  "jedis"             % "2.1.0",
       "org.apache.commons"        %  "commons-lang3"     % "3.2",
-      "org.bigbluebutton"         %  "bbb-common-message" % "0.0.11"
+      "org.bigbluebutton"         %  "bbb-common-message" % "0.0.12-SNAPSHOT"
 	)}
 
 

akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java

@@ -1,10 +1,12 @@
 package org.bigbluebutton.core.api;
 
 import java.util.Map;
-
+import org.bigbluebutton.common.messages.*;
 
 public interface IBigBlueButtonInGW {
 
+	void handleBigBlueButtonMessage(IBigBlueButtonMessage message);
+
 	void isAliveAudit(String aliveID);
 	void statusMeetingAudit(String meetingID);
 	void endMeeting(String meetingID);

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

@@ -6,7 +6,7 @@
 import org.bigbluebutton.common.messages.DestroyMeetingMessage;
 import org.bigbluebutton.common.messages.EndMeetingMessage;
 import org.bigbluebutton.common.messages.GetAllMeetingsRequest;
-import org.bigbluebutton.common.messages.IPublishedMessage;
+import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
 import org.bigbluebutton.common.messages.KeepAliveMessage;
 import org.bigbluebutton.common.messages.MessageFromJsonConverter;
 import org.bigbluebutton.common.messages.MessagingConstants;
@@ -33,7 +33,7 @@ public void handleMessage(String pattern, String channel, String message) {
 //		LOG.debug("Checking message: " + pattern + " " + channel + " " + message);
 		if (channel.equalsIgnoreCase(MessagingConstants.TO_MEETING_CHANNEL)) {
 //			System.out.println("Meeting message: " + channel + " " + message);
-			IPublishedMessage msg = MessageFromJsonConverter.convert(message);
+			IBigBlueButtonMessage msg = MessageFromJsonConverter.convert(message);
 
 			if (msg != null) {
 				if (msg instanceof EndMeetingMessage) {
@@ -96,7 +96,7 @@ else if (msg instanceof GetAllMeetingsRequest) {
 				System.out.println("Failed to decode message: [" + message + "]");
 			}
 		} else if (channel.equalsIgnoreCase(MessagingConstants.TO_SYSTEM_CHANNEL)) {
-			IPublishedMessage msg = MessageFromJsonConverter.convert(message);
+			IBigBlueButtonMessage msg = MessageFromJsonConverter.convert(message);
 
 			if (msg != null) {
 				if (msg instanceof KeepAliveMessage) {

akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/PollingMessageReceiver.java

@@ -2,6 +2,7 @@
 
 import org.bigbluebutton.common.messages.*;
 
+import com.google.gson.Gson;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonObject;
 
@@ -40,6 +41,10 @@ public void handleMessage(String pattern, String channel, String message) {
 					} else if (ShowPollResultRequestMessage.SHOW_POLL_RESULT_REQUEST.equals(messageName)){
 						ShowPollResultRequestMessage msg = ShowPollResultRequestMessage.fromJson(message);
 						bbbGW.showPollResult(msg.meetingId, msg.requesterId, msg.pollId, msg.show);
+					} else if (StartCustomPollRequestMessage.START_CUSTOM_POLL_REQUEST.equals(messageName)){
+						Gson gson = new Gson();
+						StartCustomPollRequestMessage msg = gson.fromJson(message, StartCustomPollRequestMessage.class);
+						bbbGW.handleBigBlueButtonMessage(msg);
 					}
 				}
 			}

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

@@ -15,11 +15,19 @@ import scala.concurrent.duration._
 import scala.util.Success
 import scala.util.Failure
 import org.bigbluebutton.core.service.recorder.RecorderApplication
+import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
+import org.bigbluebutton.common.messages.StartCustomPollRequestMessage
 
 class BigBlueButtonInGW(val system: ActorSystem, recorderApp: RecorderApplication, messageSender: MessageSender, voiceEventRecorder: VoiceEventRecorder) extends IBigBlueButtonInGW {
   val log = system.log
   val bbbActor = system.actorOf(BigBlueButtonActor.props(system, recorderApp, messageSender, voiceEventRecorder), "bigbluebutton-actor")
 
+  def handleBigBlueButtonMessage(message: IBigBlueButtonMessage) {
+    if (message.isInstanceOf[StartCustomPollRequestMessage]) {
+
+    }
+  }
+
   // Meeting
   def createMeeting2(meetingID: String, externalMeetingID: String, meetingName: String, record: Boolean,
     voiceBridge: String, duration: Long, autoStartRecording: Boolean,

akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala

@@ -26,7 +26,7 @@ class RedisPublisher(val system: ActorSystem) extends SystemConfiguration {
   //  system.scheduler.schedule(2 seconds, 5 seconds)(redis.publish("bigbluebutton:to-bbb-apps:users", "pattern value"))
 
   def publish(channel: String, data: String) {
-    //  println("PUBLISH TO [" + channel + "]: \n [" + data + "]")
+    println("PUBLISH TO [" + channel + "]: \n [" + data + "]")
     redis.publish(channel, data)
   }
 

bbb-common-message/build.sbt

@@ -4,7 +4,7 @@ name := "bbb-common-message"
 
 organization := "org.bigbluebutton"
 
-version := "0.0.11"
+version := "0.0.12-SNAPSHOT"
 
 // We want to have our jar files in lib_managed dir.
 // This way we'll have the right path when we import
@@ -20,6 +20,9 @@ libraryDependencies ++= {
 	  "com.google.code.gson"      %  "gson"              % "1.7.1"
 	)}
 
+libraryDependencies += "junit" % "junit" % "4.11" % "test"
+libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
+
 seq(Revolver.settings: _*)
 
 //-----------
@@ -45,20 +48,20 @@ autoScalaLibrary := false
 * publish to the local maven repo using "sbt publish"
 */
 // Uncomment this to publish to local maven repo while commenting out the nexus repo
-//publishTo := Some(Resolver.file("file",  new File(Path.userHome.absolutePath+"/.m2/repository")))
+publishTo := Some(Resolver.file("file",  new File(Path.userHome.absolutePath+"/.m2/repository")))
 
 
 // Comment this out when publishing to local maven repo using SNAPSHOT version.
 // To push to sonatype "sbt publishSigned"
-
+/*
 publishTo := {
   val nexus = "https://oss.sonatype.org/"
   if (isSnapshot.value)
     Some("snapshots" at nexus + "content/repositories/snapshots")
   else
     Some("releases"  at nexus + "service/local/staging/deploy/maven2")
 }
-
+*/
 
 // Enables publishing to maven repo
 publishMavenStyle := true

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/AssignPresenterRequestMessage.java

@@ -4,7 +4,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class AssignPresenterRequestMessage implements IPublishedMessage {
+public class AssignPresenterRequestMessage implements IBigBlueButtonMessage {
 	public static final String ASSIGN_PRESENTER_REQUEST = "assign_presenter_request_message";
 	public final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/CreateMeetingMessage.java

@@ -1,6 +1,6 @@
 package org.bigbluebutton.common.messages;
 
-public class CreateMeetingMessage implements IPublishedMessage {
+public class CreateMeetingMessage implements IBigBlueButtonMessage {
 	public static final String CREATE_MEETING_REQUEST_EVENT  = "create_meeting_request";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/DestroyMeetingMessage.java

@@ -1,6 +1,6 @@
 package org.bigbluebutton.common.messages;
 
-public class DestroyMeetingMessage implements IPublishedMessage {
+public class DestroyMeetingMessage implements IBigBlueButtonMessage {
 	public static final String DESTROY_MEETING_REQUEST_EVENT  = "destroy_meeting_request_event";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/DisconnectAllUsersMessage.java

@@ -4,7 +4,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class DisconnectAllUsersMessage implements IPublishedMessage {
+public class DisconnectAllUsersMessage implements IBigBlueButtonMessage {
 	public static final String DISCONNECT_All_USERS = "disconnect_all_users_message";
 	public final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/DisconnectUserMessage.java

@@ -4,7 +4,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class DisconnectUserMessage implements IPublishedMessage {
+public class DisconnectUserMessage implements IBigBlueButtonMessage {
 	public static final String DISCONNECT_USER = "disconnect_user_message";
 	public final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/EndMeetingMessage.java

@@ -1,6 +1,6 @@
 package org.bigbluebutton.common.messages;
 
-public class EndMeetingMessage implements IPublishedMessage {
+public class EndMeetingMessage implements IBigBlueButtonMessage {
 	public static final String END_MEETING_REQUEST_EVENT  = "end_meeting_request_event";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetAllMeetingsRequest.java

@@ -1,6 +1,6 @@
 package org.bigbluebutton.common.messages;
 
-public class GetAllMeetingsRequest implements IPublishedMessage {
+public class GetAllMeetingsRequest implements IBigBlueButtonMessage {
 	public static final String GET_ALL_MEETINGS_REQUEST_EVENT  = "get_all_meetings_request";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetChatHistory.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class GetChatHistory implements IPublishedMessage {
+public class GetChatHistory implements IBigBlueButtonMessage {
 	public static final String GET_CHAT_HISTORY_REQUEST = "get_chat_history_request";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetChatHistoryRequestMessage.java

@@ -3,7 +3,7 @@
 import java.util.HashMap;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-public class GetChatHistoryRequestMessage implements IPublishedMessage {
+public class GetChatHistoryRequestMessage implements IBigBlueButtonMessage {
 	public static final String GET_CHAT_HISTORY_REQUEST = "get_chat_history_request";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetLockSettingsMessage.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class GetLockSettingsMessage implements IPublishedMessage {
+public class GetLockSettingsMessage implements IBigBlueButtonMessage {
 	public static final String GET_LOCK_SETTINGS = "get_lock_settings";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetPresentationInfoMessage.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class GetPresentationInfoMessage implements IPublishedMessage {
+public class GetPresentationInfoMessage implements IBigBlueButtonMessage {
 	public static final String GET_PRESENTATION_INFO = "get_presentation_info";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetPresentationInfoReplyMessage.java

@@ -8,7 +8,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class GetPresentationInfoReplyMessage implements IPublishedMessage {
+public class GetPresentationInfoReplyMessage implements IBigBlueButtonMessage {
 	public static final String GET_PRESENTATION_INFO_REPLY = "get_presentation_info_reply";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetSlideInfoMessage.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class GetSlideInfoMessage implements IPublishedMessage {
+public class GetSlideInfoMessage implements IBigBlueButtonMessage {
 	public static final String GET_SLIDE_INFO = "get_slide_info";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GetUsersRequestMessage.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class GetUsersRequestMessage implements IPublishedMessage {
+public class GetUsersRequestMessage implements IBigBlueButtonMessage {
 	public static final String GET_USERS_REQUEST = "get_users_request_message";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/GoToSlideMessage.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class GoToSlideMessage implements IPublishedMessage {
+public class GoToSlideMessage implements IBigBlueButtonMessage {
 	public static final String GO_TO_SLIDE = "go_to_slide";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/IPublishedMessage.java → bbb-common-message/src/main/java/org/bigbluebutton/common/messages/IBigBlueButtonMessage.java

@@ -1,5 +1,5 @@
 package org.bigbluebutton.common.messages;
 
-public interface IPublishedMessage {
+public interface IBigBlueButtonMessage {
 
 }

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/KeepAliveMessage.java

@@ -1,6 +1,6 @@
 package org.bigbluebutton.common.messages;
 
-public class KeepAliveMessage implements IPublishedMessage {
+public class KeepAliveMessage implements IBigBlueButtonMessage {
 	public static final String KEEP_ALIVE_REQUEST                 = "keep_alive_request";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/LockUserMessage.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class LockUserMessage implements IPublishedMessage {
+public class LockUserMessage implements IBigBlueButtonMessage {
 	public static final String LOCK_USER = "lock_user";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java

@@ -5,7 +5,7 @@
 
 public class MessageFromJsonConverter {
 
-	public static IPublishedMessage convert(String message) {
+	public static IBigBlueButtonMessage convert(String message) {
 		JsonParser parser = new JsonParser();
 		JsonObject obj = (JsonObject) parser.parse(message);
 
@@ -41,7 +41,7 @@ public static IPublishedMessage convert(String message) {
 		return null;
 	}
 
-	private static IPublishedMessage processValidateAuthTokenMessage(JsonObject header, JsonObject payload) {
+	private static IBigBlueButtonMessage processValidateAuthTokenMessage(JsonObject header, JsonObject payload) {
 		String id = payload.get(Constants.MEETING_ID).getAsString();
 		String userid = payload.get(Constants.USER_ID).getAsString();
 		String authToken = payload.get(Constants.AUTH_TOKEN).getAsString();
@@ -51,7 +51,7 @@ private static IPublishedMessage processValidateAuthTokenMessage(JsonObject head
 		    sessionId);
 	}
 
-	private static IPublishedMessage processCreateMeeting(JsonObject payload) {
+	private static IBigBlueButtonMessage processCreateMeeting(JsonObject payload) {
 		String id = payload.get(Constants.MEETING_ID).getAsString();
 		String externalId = payload.get(Constants.EXTERNAL_MEETING_ID).getAsString();
 		String name = payload.get(Constants.NAME).getAsString();
@@ -70,17 +70,17 @@ private static IPublishedMessage processCreateMeeting(JsonObject payload) {
 				          moderatorPassword, viewerPassword, createTime, createDate);
 	}
 
-	private static IPublishedMessage processDestroyMeeting(JsonObject payload) {
+	private static IBigBlueButtonMessage processDestroyMeeting(JsonObject payload) {
 		String id = payload.get(Constants.MEETING_ID).getAsString();		
 		return new DestroyMeetingMessage(id);
 	}
 
-	private static IPublishedMessage processEndMeetingMessage(JsonObject payload) {
+	private static IBigBlueButtonMessage processEndMeetingMessage(JsonObject payload) {
 		String id = payload.get(Constants.MEETING_ID).getAsString();		
 		return new EndMeetingMessage(id);
 	}	
 
-	private static IPublishedMessage processKeepAlive(JsonObject payload) {
+	private static IBigBlueButtonMessage processKeepAlive(JsonObject payload) {
 		String id = payload.get(Constants.KEEP_ALIVE_ID).getAsString();		
 		return new KeepAliveMessage(id);
 	}

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessageHeader.java

@@ -0,0 +1,10 @@
+package org.bigbluebutton.common.messages;
+
+public class MessageHeader {
+
+	public String name;
+	public String version;
+	public Long timestamp;
+	public String replyTo;
+
+}

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java

@@ -4,7 +4,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class RegisterUserMessage implements IPublishedMessage {
+public class RegisterUserMessage implements IBigBlueButtonMessage {
 	public static final String REGISTER_USER = "register_user_request";
 	public final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RemovePresentationMessage.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class RemovePresentationMessage implements IPublishedMessage {
+public class RemovePresentationMessage implements IBigBlueButtonMessage {
 	public static final String REMOVE_PRESENTATION = "remove_presentation";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/ResizeAndMoveSlideMessage.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class ResizeAndMoveSlideMessage implements IPublishedMessage {
+public class ResizeAndMoveSlideMessage implements IBigBlueButtonMessage {
 	public static final String RESIZE_AND_MOVE_SLIDE = "resize_and_move_slide";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SendConversionCompletedMessage.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class SendConversionCompletedMessage implements IPublishedMessage {
+public class SendConversionCompletedMessage implements IBigBlueButtonMessage {
 	public static final String SEND_CONVERSION_COMPLETED = "send_conversion_completed";
 	public static final String VERSION = "0.0.1";
 

bbb-common-message/src/main/java/org/bigbluebutton/common/messages/SendConversionUpdateMessage.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class SendConversionUpdateMessage implements IPublishedMessage {
+public class SendConversionUpdateMessage implements IBigBlueButtonMessage {
 	public static final String SEND_CONVERSION_UPDATE = "send_conversion_update";
 	public static final String VERSION = "0.0.1";