- determine if message is published or subscribed message type

bigbluebutton-apps/src/main/java/org/bigbluebutton/apps/sub/messages/UserConnectedToGlobalAudio.java

@@ -3,13 +3,13 @@
 import java.util.HashMap;
 
 import org.bigbluebutton.red5.pub.messages.Constants;
-import org.bigbluebutton.red5.pub.messages.IMessage;
+import org.bigbluebutton.red5.pub.messages.IPublishedMessage;
 import org.bigbluebutton.red5.pub.messages.MessageBuilder;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class UserConnectedToGlobalAudio implements IMessage {
+public class UserConnectedToGlobalAudio implements IPublishedMessage {
 	public static final String USER_CONNECTED_TO_GLOBAL_AUDIO = "user_connected_to_global_audio";
 	public static final String VERSION = "0.0.1";
 

bigbluebutton-apps/src/main/java/org/bigbluebutton/apps/sub/messages/UserDisconnectedFromGlobalAudio.java

@@ -3,13 +3,13 @@
 import java.util.HashMap;
 
 import org.bigbluebutton.red5.pub.messages.Constants;
-import org.bigbluebutton.red5.pub.messages.IMessage;
+import org.bigbluebutton.red5.pub.messages.IPublishedMessage;
 import org.bigbluebutton.red5.pub.messages.MessageBuilder;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class UserDisconnectedFromGlobalAudio implements IMessage {
+public class UserDisconnectedFromGlobalAudio implements IPublishedMessage {
 	public static final String USER_DISCONNECTED_FROM_GLOBAL_AUDIO = "user_disconnected_from_global_audio";
 	public static final String VERSION = "0.0.1";
 

bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/MeetingClientMessageSender.java

@@ -11,11 +11,11 @@
 import org.bigbluebutton.red5.pub.messages.Constants;
 import org.bigbluebutton.red5.pub.messages.DisconnectAllUsersMessage;
 import org.bigbluebutton.red5.pub.messages.DisconnectUserMessage;
-import org.bigbluebutton.red5.pub.messages.MeetingEndedMessage;
-import org.bigbluebutton.red5.pub.messages.MeetingHasEndedMessage;
-import org.bigbluebutton.red5.pub.messages.MeetingMutedMessage;
-import org.bigbluebutton.red5.pub.messages.MeetingStateMessage;
-import org.bigbluebutton.red5.pub.messages.NewPermissionsSettingMessage;
+import org.bigbluebutton.red5.sub.messages.MeetingEndedMessage;
+import org.bigbluebutton.red5.sub.messages.MeetingHasEndedMessage;
+import org.bigbluebutton.red5.sub.messages.MeetingMutedMessage;
+import org.bigbluebutton.red5.sub.messages.MeetingStateMessage;
+import org.bigbluebutton.red5.sub.messages.NewPermissionsSettingMessage;
 import org.bigbluebutton.red5.sub.messages.UserLockedMessage;
 
 import com.google.gson.Gson;

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java

@@ -6,10 +6,10 @@
 import org.bigbluebutton.conference.meeting.messaging.red5.BroadcastClientMessage;
 import org.bigbluebutton.conference.meeting.messaging.red5.ConnectionInvokerService;
 import org.bigbluebutton.conference.meeting.messaging.red5.DirectClientMessage;
-import org.bigbluebutton.red5.pub.messages.GetRecordingStatusReplyMessage;
-import org.bigbluebutton.red5.pub.messages.GetUsersReplyMessage;
-import org.bigbluebutton.red5.pub.messages.PresenterAssignedMessage;
-import org.bigbluebutton.red5.pub.messages.RecordingStatusChangedMessage;
+import org.bigbluebutton.red5.sub.messages.GetRecordingStatusReplyMessage;
+import org.bigbluebutton.red5.sub.messages.GetUsersReplyMessage;
+import org.bigbluebutton.red5.sub.messages.PresenterAssignedMessage;
+import org.bigbluebutton.red5.sub.messages.RecordingStatusChangedMessage;
 import org.bigbluebutton.red5.sub.messages.UserJoinedMessage;
 import org.bigbluebutton.red5.sub.messages.UserJoinedVoiceMessage;
 import org.bigbluebutton.red5.sub.messages.UserLeftMessage;

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/CreateMeetingMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/DestroyMeetingMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/DisconnectAllUsersMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/DisconnectUserMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/EndMeetingMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/GetAllMeetingsRequest.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/GetChatHistory.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/GetLockSettingsMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/GetPresentationInfoMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/GetSlideInfoMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/GoToSlideMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/IMessage.java → bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/IPublishedMessage.java

@@ -1,5 +1,5 @@
 package org.bigbluebutton.red5.pub.messages;
 
-public interface IMessage {
+public interface IPublishedMessage {
 
 }

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/KeepAliveMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/LockUserMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/MessageFromJsonConverter.java

@@ -8,7 +8,7 @@
 
 public class MessageFromJsonConverter {
 
-	public static IMessage convert(String message) {
+	public static IPublishedMessage convert(String message) {
 		JsonParser parser = new JsonParser();
 		JsonObject obj = (JsonObject) parser.parse(message);
 
@@ -46,7 +46,7 @@ public static IMessage convert(String message) {
 		return null;
 	}
 
-	private static IMessage processValidateAuthTokenMessage(JsonObject header, JsonObject payload) {
+	private static IPublishedMessage 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();
@@ -56,7 +56,7 @@ private static IMessage processValidateAuthTokenMessage(JsonObject header, JsonO
 		    sessionId);
 	}
 
-	private static IMessage processCreateMeeting(JsonObject payload) {
+	private static IPublishedMessage 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();
@@ -75,17 +75,17 @@ private static IMessage processCreateMeeting(JsonObject payload) {
 				          moderatorPassword, viewerPassword, createTime, createDate);
 	}
 
-	private static IMessage processDestroyMeeting(JsonObject payload) {
+	private static IPublishedMessage processDestroyMeeting(JsonObject payload) {
 		String id = payload.get(Constants.MEETING_ID).getAsString();		
 		return new DestroyMeetingMessage(id);
 	}
 
-	private static IMessage processEndMeetingMessage(JsonObject payload) {
+	private static IPublishedMessage processEndMeetingMessage(JsonObject payload) {
 		String id = payload.get(Constants.MEETING_ID).getAsString();		
 		return new EndMeetingMessage(id);
 	}	
 
-	private static IMessage processKeepAlive(JsonObject payload) {
+	private static IPublishedMessage processKeepAlive(JsonObject payload) {
 		String id = payload.get(Constants.KEEP_ALIVE_ID).getAsString();		
 		return new KeepAliveMessage(id);
 	}

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/RegisterUserMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/RemovePresentationMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/ResizeAndMoveSlideMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/SendConversionCompletedMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/SendConversionUpdateMessage.java

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

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/SendCursorUpdateMessage.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class SendCursorUpdateMessage implements IMessage {
+public class SendCursorUpdateMessage implements IPublishedMessage {
 	public static final String SEND_CURSOR_UPDATE = "send_cursor_update";
 	public static final String VERSION = "0.0.1";
 

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/SendLockSettingsMessage.java

@@ -6,7 +6,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class SendLockSettingsMessage implements IMessage {
+public class SendLockSettingsMessage implements IPublishedMessage {
 	public static final String SEND_LOCK_SETTINGS = "send_lock_settings";
 	public static final String VERSION = "0.0.1";
 

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/SendPageCountErrorMessage.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class SendPageCountErrorMessage implements IMessage {
+public class SendPageCountErrorMessage implements IPublishedMessage {
 	public static final String SEND_PAGE_COUNT_ERROR = "send_page_count_error";
 	public static final String VERSION = "0.0.1";
 

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/SendPrivateChatMessage.java

@@ -8,7 +8,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class SendPrivateChatMessage implements IMessage {
+public class SendPrivateChatMessage implements IPublishedMessage {
 	public static final String SEND_PRIVATE_CHAT_MESSAGE = "send_private_chat_message";
 	public static final String VERSION = "0.0.1";
 

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/SendPublicChatMessage.java

@@ -8,7 +8,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class SendPublicChatMessage implements IMessage {
+public class SendPublicChatMessage implements IPublishedMessage {
 	public static final String SEND_PUBLIC_CHAT_MESSAGE = "send_public_chat_message";
 	public static final String VERSION = "0.0.1";
 

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/SendSlideGeneratedMessage.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class SendSlideGeneratedMessage implements IMessage {
+public class SendSlideGeneratedMessage implements IPublishedMessage {
 	public static final String SEND_SLIDE_GENERATED = "send_slide_generated";
 	public static final String VERSION = "0.0.1";
 

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/SharePresentationMessage.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class SharePresentationMessage implements IMessage {
+public class SharePresentationMessage implements IPublishedMessage {
 	public static final String SHARE_PRESENTATION = "share_presentation";
 	public static final String VERSION = "0.0.1";
 

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/ValidateAuthTokenMessage.java

@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-public class ValidateAuthTokenMessage implements IMessage {
+public class ValidateAuthTokenMessage implements IPublishedMessage {
 	public static final String VALIDATE_AUTH_TOKEN  = "validate_auth_token";
 	public static final String VERSION = "0.0.1";
 

bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pub/messages/GetRecordingStatusReplyMessage.java → bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/sub/messages/GetRecordingStatusReplyMessage.java

@@ -1,12 +1,14 @@
-package org.bigbluebutton.red5.pub.messages;
+package org.bigbluebutton.red5.sub.messages;
 
 import java.util.HashMap;
-
+import org.bigbluebutton.red5.pub.messages.Constants;
+import org.bigbluebutton.red5.pub.messages.IPublishedMessage;
+import org.bigbluebutton.red5.pub.messages.MessageBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
 
-public class GetRecordingStatusReplyMessage implements IMessage {
+public class GetRecordingStatusReplyMessage implements ISubscribedMessage {
 	public static final String Get_RECORDING_STATUS_REPLY  = "get_recording_status_reply";
 	public static final String VERSION = "0.0.1";