From f6b35ef6b5979a9fbbb2a1d2850b3f0b132a77cf Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Thu, 28 May 2015 20:55:39 +0000 Subject: [PATCH] - restructure message receivers --- .../chat => pubsub/receivers}/ChatMessageListener.java | 2 +- .../receivers}/ConversionUpdatesProcessor.java | 2 +- .../lock => pubsub/receivers}/LockMessageListener.java | 2 +- .../receivers}/ParticipantsListener.java | 2 +- .../receivers}/PresentationMessageListener.java | 2 +- .../receivers}/PreuploadedPresentation.java | 2 +- .../receivers}/PreuploadedPresentationsUtil.java | 2 +- .../voice => pubsub/receivers}/VoiceMessageListener.java | 4 +++- .../whiteboard => pubsub/receivers}/WhiteboardListener.java | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) rename labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/{service/chat => pubsub/receivers}/ChatMessageListener.java (97%) rename labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/{service/presentation => pubsub/receivers}/ConversionUpdatesProcessor.java (95%) rename labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/{service/lock => pubsub/receivers}/LockMessageListener.java (97%) rename labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/{service/participants => pubsub/receivers}/ParticipantsListener.java (99%) rename labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/{service/presentation => pubsub/receivers}/PresentationMessageListener.java (97%) rename labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/{service/presentation => pubsub/receivers}/PreuploadedPresentation.java (75%) rename labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/{service/presentation => pubsub/receivers}/PreuploadedPresentationsUtil.java (93%) rename labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/{service/voice => pubsub/receivers}/VoiceMessageListener.java (94%) rename labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/{service/whiteboard => pubsub/receivers}/WhiteboardListener.java (98%) diff --git a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/chat/ChatMessageListener.java b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ChatMessageListener.java similarity index 97% rename from labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/chat/ChatMessageListener.java rename to labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ChatMessageListener.java index 6451d9006031..f89beee09bb9 100755 --- a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/chat/ChatMessageListener.java +++ b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ChatMessageListener.java @@ -1,4 +1,4 @@ -package org.bigbluebutton.core.service.chat; +package org.bigbluebutton.core.pubsub.receivers; import org.bigbluebutton.common.messages.GetChatHistoryRequestMessage; import org.bigbluebutton.common.messages.MessagingConstants; diff --git a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/presentation/ConversionUpdatesProcessor.java b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java similarity index 95% rename from labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/presentation/ConversionUpdatesProcessor.java rename to labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java index d0c316de32f8..5465832f6a34 100755 --- a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/presentation/ConversionUpdatesProcessor.java +++ b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java @@ -16,7 +16,7 @@ * with BigBlueButton; if not, see . * */ -package org.bigbluebutton.core.service.presentation; +package org.bigbluebutton.core.pubsub.receivers; import org.bigbluebutton.core.api.IBigBlueButtonInGW; diff --git a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/lock/LockMessageListener.java b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/LockMessageListener.java similarity index 97% rename from labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/lock/LockMessageListener.java rename to labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/LockMessageListener.java index 5db541774abc..16d0bf3248ae 100755 --- a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/lock/LockMessageListener.java +++ b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/LockMessageListener.java @@ -1,4 +1,4 @@ -package org.bigbluebutton.core.service.lock; +package org.bigbluebutton.core.pubsub.receivers; import org.bigbluebutton.common.messages.GetLockSettingsMessage; import org.bigbluebutton.common.messages.LockUserMessage; diff --git a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/participants/ParticipantsListener.java b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ParticipantsListener.java similarity index 99% rename from labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/participants/ParticipantsListener.java rename to labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ParticipantsListener.java index 20a2ed1fb1fa..da6d9e65578e 100755 --- a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/participants/ParticipantsListener.java +++ b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ParticipantsListener.java @@ -1,5 +1,5 @@ -package org.bigbluebutton.core.service.participants; +package org.bigbluebutton.core.pubsub.receivers; import org.bigbluebutton.common.messages.AssignPresenterRequestMessage; import org.bigbluebutton.common.messages.BroadcastLayoutRequestMessage; diff --git a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/presentation/PresentationMessageListener.java b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/PresentationMessageListener.java similarity index 97% rename from labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/presentation/PresentationMessageListener.java rename to labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/PresentationMessageListener.java index 0f75638e1cbb..b755e00a7f21 100755 --- a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/presentation/PresentationMessageListener.java +++ b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/PresentationMessageListener.java @@ -1,4 +1,4 @@ -package org.bigbluebutton.core.service.presentation; +package org.bigbluebutton.core.pubsub.receivers; import java.util.HashMap; import java.util.Map; diff --git a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/presentation/PreuploadedPresentation.java b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/PreuploadedPresentation.java similarity index 75% rename from labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/presentation/PreuploadedPresentation.java rename to labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/PreuploadedPresentation.java index b254d676a633..d86492135597 100755 --- a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/presentation/PreuploadedPresentation.java +++ b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/PreuploadedPresentation.java @@ -1,4 +1,4 @@ -package org.bigbluebutton.core.service.presentation; +package org.bigbluebutton.core.pubsub.receivers; public class PreuploadedPresentation { diff --git a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/presentation/PreuploadedPresentationsUtil.java b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/PreuploadedPresentationsUtil.java similarity index 93% rename from labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/presentation/PreuploadedPresentationsUtil.java rename to labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/PreuploadedPresentationsUtil.java index 862efba8c043..21ec40982aec 100755 --- a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/presentation/PreuploadedPresentationsUtil.java +++ b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/PreuploadedPresentationsUtil.java @@ -1,4 +1,4 @@ -package org.bigbluebutton.core.service.presentation; +package org.bigbluebutton.core.pubsub.receivers; import java.io.File; import java.io.FileFilter; diff --git a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/voice/VoiceMessageListener.java b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/VoiceMessageListener.java similarity index 94% rename from labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/voice/VoiceMessageListener.java rename to labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/VoiceMessageListener.java index 79a9b7161717..c0fdc74d95f8 100755 --- a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/voice/VoiceMessageListener.java +++ b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/VoiceMessageListener.java @@ -1,8 +1,10 @@ -package org.bigbluebutton.core.service.voice; +package org.bigbluebutton.core.pubsub.receivers; import org.bigbluebutton.common.messages.MessagingConstants; import org.bigbluebutton.core.api.IBigBlueButtonInGW; import org.bigbluebutton.core.pubsub.redis.MessageHandler; +import org.bigbluebutton.core.service.voice.VoiceKeyUtil; + import com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/WhiteboardListener.java b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/WhiteboardListener.java similarity index 98% rename from labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/WhiteboardListener.java rename to labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/WhiteboardListener.java index fa9218b38c30..7aea4f92d948 100755 --- a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/whiteboard/WhiteboardListener.java +++ b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/WhiteboardListener.java @@ -1,5 +1,5 @@ -package org.bigbluebutton.core.service.whiteboard; +package org.bigbluebutton.core.pubsub.receivers; import org.bigbluebutton.common.messages.ClearWhiteboardRequestMessage;