Skip to content

Commit

Permalink
- organize messages
Browse files Browse the repository at this point in the history
  • Loading branch information
ritzalam committed May 25, 2015
1 parent 3619fd4 commit ee3280a
Show file tree
Hide file tree
Showing 84 changed files with 216 additions and 129 deletions.
@@ -1,7 +1,11 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.apps.sub.messages;

import java.util.HashMap;

import org.bigbluebutton.red5.pub.messages.Constants;
import org.bigbluebutton.red5.pub.messages.IMessage;
import org.bigbluebutton.red5.pub.messages.MessageBuilder;

import com.google.gson.JsonObject;
import com.google.gson.JsonParser;

Expand Down
@@ -1,6 +1,11 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.apps.sub.messages;

import java.util.HashMap;

import org.bigbluebutton.red5.pub.messages.Constants;
import org.bigbluebutton.red5.pub.messages.IMessage;
import org.bigbluebutton.red5.pub.messages.MessageBuilder;

import com.google.gson.JsonObject;
import com.google.gson.JsonParser;

Expand Down
Expand Up @@ -3,20 +3,20 @@
import java.util.HashMap;
import java.util.Map;

import org.bigbluebutton.apps.sub.messages.UserConnectedToGlobalAudio;
import org.bigbluebutton.apps.sub.messages.UserDisconnectedFromGlobalAudio;
import org.bigbluebutton.conference.service.messaging.redis.MessageHandler;
import org.bigbluebutton.core.api.IBigBlueButtonInGW;
import org.bigbluebutton.red5.pubsub.messages.CreateMeetingMessage;
import org.bigbluebutton.red5.pubsub.messages.DestroyMeetingMessage;
import org.bigbluebutton.red5.pubsub.messages.EndMeetingMessage;
import org.bigbluebutton.red5.pubsub.messages.GetAllMeetingsRequest;
import org.bigbluebutton.red5.pubsub.messages.IMessage;
import org.bigbluebutton.red5.pubsub.messages.KeepAliveMessage;
import org.bigbluebutton.red5.pubsub.messages.MessageFromJsonConverter;
import org.bigbluebutton.red5.pubsub.messages.MessagingConstants;
import org.bigbluebutton.red5.pubsub.messages.RegisterUserMessage;
import org.bigbluebutton.red5.pubsub.messages.UserConnectedToGlobalAudio;
import org.bigbluebutton.red5.pubsub.messages.UserDisconnectedFromGlobalAudio;
import org.bigbluebutton.red5.pubsub.messages.ValidateAuthTokenMessage;
import org.bigbluebutton.red5.pub.messages.CreateMeetingMessage;
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.KeepAliveMessage;
import org.bigbluebutton.red5.pub.messages.MessageFromJsonConverter;
import org.bigbluebutton.red5.pub.messages.MessagingConstants;
import org.bigbluebutton.red5.pub.messages.RegisterUserMessage;
import org.bigbluebutton.red5.pub.messages.ValidateAuthTokenMessage;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;

Expand Down
Expand Up @@ -6,10 +6,10 @@
import com.google.gson.JsonObject;

import org.bigbluebutton.core.api.IBigBlueButtonInGW;
import org.bigbluebutton.red5.pubsub.messages.GetChatHistory;
import org.bigbluebutton.red5.pubsub.messages.MessagingConstants;
import org.bigbluebutton.red5.pubsub.messages.SendPrivateChatMessage;
import org.bigbluebutton.red5.pubsub.messages.SendPublicChatMessage;
import org.bigbluebutton.red5.pub.messages.GetChatHistory;
import org.bigbluebutton.red5.pub.messages.MessagingConstants;
import org.bigbluebutton.red5.pub.messages.SendPrivateChatMessage;
import org.bigbluebutton.red5.pub.messages.SendPublicChatMessage;

public class ChatMessageListener implements MessageHandler{

Expand Down
Expand Up @@ -2,10 +2,10 @@

import org.bigbluebutton.conference.service.messaging.redis.MessageHandler;
import org.bigbluebutton.core.api.IBigBlueButtonInGW;
import org.bigbluebutton.red5.pubsub.messages.GetLockSettingsMessage;
import org.bigbluebutton.red5.pubsub.messages.LockUserMessage;
import org.bigbluebutton.red5.pubsub.messages.MessagingConstants;
import org.bigbluebutton.red5.pubsub.messages.SendLockSettingsMessage;
import org.bigbluebutton.red5.pub.messages.GetLockSettingsMessage;
import org.bigbluebutton.red5.pub.messages.LockUserMessage;
import org.bigbluebutton.red5.pub.messages.MessagingConstants;
import org.bigbluebutton.red5.pub.messages.SendLockSettingsMessage;

import com.google.gson.JsonParser;
import com.google.gson.JsonObject;
Expand Down
Expand Up @@ -3,7 +3,7 @@
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;

import org.bigbluebutton.red5.pubsub.messages.MessagingConstants;
import org.bigbluebutton.red5.pub.messages.MessagingConstants;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;

Expand Down
Expand Up @@ -7,7 +7,7 @@
//import org.bigbluebutton.core.api.*;

import org.bigbluebutton.core.api.IBigBlueButtonInGW;
import org.bigbluebutton.red5.pubsub.messages.MessagingConstants;
import org.bigbluebutton.red5.pub.messages.MessagingConstants;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;

Expand Down
Expand Up @@ -3,7 +3,7 @@

import org.bigbluebutton.conference.service.messaging.redis.MessageHandler;
import org.bigbluebutton.core.api.IBigBlueButtonInGW;
import org.bigbluebutton.red5.pubsub.messages.MessagingConstants;
import org.bigbluebutton.red5.pub.messages.MessagingConstants;

import com.google.gson.Gson;
import com.google.gson.JsonObject;
Expand Down
Expand Up @@ -2,12 +2,14 @@

import java.util.HashMap;
import java.util.Map;

import org.bigbluebutton.conference.service.messaging.redis.MessageHandler;

import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;

import org.bigbluebutton.core.api.IBigBlueButtonInGW;
import org.bigbluebutton.red5.pubsub.messages.*;
import org.bigbluebutton.red5.pub.messages.*;

import com.google.gson.JsonParser;
import com.google.gson.JsonObject;
Expand Down
Expand Up @@ -2,7 +2,7 @@

import org.bigbluebutton.conference.service.messaging.redis.MessageHandler;
import org.bigbluebutton.core.api.IBigBlueButtonInGW;
import org.bigbluebutton.red5.pubsub.messages.MessagingConstants;
import org.bigbluebutton.red5.pub.messages.MessagingConstants;

import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
Expand Down
Expand Up @@ -4,7 +4,7 @@

import org.bigbluebutton.conference.service.messaging.redis.MessageHandler;
import org.bigbluebutton.core.api.IBigBlueButtonInGW;
import org.bigbluebutton.red5.pubsub.messages.MessagingConstants;
import org.bigbluebutton.red5.pub.messages.MessagingConstants;

import com.google.gson.JsonParser;
import com.google.gson.JsonObject;
Expand Down
Expand Up @@ -3,7 +3,8 @@
import java.util.Map;

import org.bigbluebutton.conference.service.messaging.redis.MessageSender;
import org.bigbluebutton.red5.pubsub.messages.*;
import org.bigbluebutton.red5.pub.messages.*;
import org.bigbluebutton.red5.sub.messages.UserLeavingMessage;

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
Expand Down
Expand Up @@ -8,15 +8,16 @@
import org.bigbluebutton.conference.meeting.messaging.red5.DirectClientMessage;
import org.bigbluebutton.conference.meeting.messaging.red5.DisconnectAllClientsMessage;
import org.bigbluebutton.conference.meeting.messaging.red5.DisconnectClientMessage;
import org.bigbluebutton.red5.pubsub.messages.Constants;
import org.bigbluebutton.red5.pubsub.messages.DisconnectAllUsersMessage;
import org.bigbluebutton.red5.pubsub.messages.DisconnectUserMessage;
import org.bigbluebutton.red5.pubsub.messages.MeetingEndedMessage;
import org.bigbluebutton.red5.pubsub.messages.MeetingHasEndedMessage;
import org.bigbluebutton.red5.pubsub.messages.MeetingMutedMessage;
import org.bigbluebutton.red5.pubsub.messages.MeetingStateMessage;
import org.bigbluebutton.red5.pubsub.messages.NewPermissionsSettingMessage;
import org.bigbluebutton.red5.pubsub.messages.UserLockedMessage;
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.UserLockedMessage;

import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
Expand Down
Expand Up @@ -6,24 +6,25 @@
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.pubsub.messages.GetRecordingStatusReplyMessage;
import org.bigbluebutton.red5.pubsub.messages.GetUsersReplyMessage;
import org.bigbluebutton.red5.pubsub.messages.PresenterAssignedMessage;
import org.bigbluebutton.red5.pubsub.messages.RecordingStatusChangedMessage;
import org.bigbluebutton.red5.pubsub.messages.UserJoinedMessage;
import org.bigbluebutton.red5.pubsub.messages.UserJoinedVoiceMessage;
import org.bigbluebutton.red5.pubsub.messages.UserLeftMessage;
import org.bigbluebutton.red5.pubsub.messages.UserLeftVoiceMessage;
import org.bigbluebutton.red5.pubsub.messages.UserListeningOnlyMessage;
import org.bigbluebutton.red5.pubsub.messages.UserLoweredHandMessage;
import org.bigbluebutton.red5.pubsub.messages.UserRaisedHandMessage;
import org.bigbluebutton.red5.pubsub.messages.UserSharedWebcamMessage;
import org.bigbluebutton.red5.pubsub.messages.UserStatusChangedMessage;
import org.bigbluebutton.red5.pubsub.messages.UserUnsharedWebcamMessage;
import org.bigbluebutton.red5.pubsub.messages.UserVoiceMutedMessage;
import org.bigbluebutton.red5.pubsub.messages.UserVoiceTalkingMessage;
import org.bigbluebutton.red5.pubsub.messages.ValidateAuthTokenReplyMessage;
import org.bigbluebutton.red5.pubsub.messages.ValidateAuthTokenTimeoutMessage;
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.UserJoinedMessage;
import org.bigbluebutton.red5.sub.messages.UserJoinedVoiceMessage;
import org.bigbluebutton.red5.sub.messages.UserLeftMessage;
import org.bigbluebutton.red5.sub.messages.UserLeftVoiceMessage;
import org.bigbluebutton.red5.sub.messages.UserListeningOnlyMessage;
import org.bigbluebutton.red5.sub.messages.UserLoweredHandMessage;
import org.bigbluebutton.red5.sub.messages.UserRaisedHandMessage;
import org.bigbluebutton.red5.sub.messages.UserSharedWebcamMessage;
import org.bigbluebutton.red5.sub.messages.UserStatusChangedMessage;
import org.bigbluebutton.red5.sub.messages.UserUnsharedWebcamMessage;
import org.bigbluebutton.red5.sub.messages.UserVoiceMutedMessage;
import org.bigbluebutton.red5.sub.messages.UserVoiceTalkingMessage;
import org.bigbluebutton.red5.sub.messages.ValidateAuthTokenReplyMessage;
import org.bigbluebutton.red5.sub.messages.ValidateAuthTokenTimeoutMessage;

import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

public class Constants {
public static final String NAME = "name";
Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

public class CreateMeetingMessage implements IMessage {
public static final String CREATE_MEETING_REQUEST_EVENT = "create_meeting_request";
Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

public class DestroyMeetingMessage implements IMessage {
public static final String DESTROY_MEETING_REQUEST_EVENT = "destroy_meeting_request_event";
Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.HashMap;
import com.google.gson.JsonObject;
Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.HashMap;
import com.google.gson.JsonObject;
Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

public class EndMeetingMessage implements IMessage {
public static final String END_MEETING_REQUEST_EVENT = "end_meeting_request_event";
Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

public class GetAllMeetingsRequest implements IMessage {
public static final String GET_ALL_MEETINGS_REQUEST_EVENT = "get_all_meetings_request";
Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.HashMap;

Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.HashMap;

Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.HashMap;

Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.HashMap;

Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.HashMap;

Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.HashMap;

Expand Down
@@ -0,0 +1,5 @@
package org.bigbluebutton.red5.pub.messages;

public interface IMessage {

}
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

public class KeepAliveMessage implements IMessage {
public static final String KEEP_ALIVE_REQUEST = "keep_alive_request";
Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.HashMap;

Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.HashMap;
import com.google.gson.JsonObject;
Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.HashMap;
import com.google.gson.JsonObject;
Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.HashMap;
import com.google.gson.JsonObject;
Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.HashMap;
import java.util.Map;
Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.concurrent.TimeUnit;

Expand Down
@@ -1,4 +1,7 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import org.bigbluebutton.apps.sub.messages.UserConnectedToGlobalAudio;
import org.bigbluebutton.apps.sub.messages.UserDisconnectedFromGlobalAudio;

import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
Expand Down
Expand Up @@ -16,7 +16,7 @@
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

public class MessagingConstants {

Expand Down
Expand Up @@ -16,7 +16,7 @@
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import redis.clients.jedis.Jedis;

Expand Down
@@ -1,4 +1,4 @@
package org.bigbluebutton.red5.pubsub.messages;
package org.bigbluebutton.red5.pub.messages;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down

0 comments on commit ee3280a

Please sign in to comment.