From 6b20807fc19902e8a8f0c14228c4757ee7634b5d Mon Sep 17 00:00:00 2001
From: Ghazi Triki <ghazi.triki@riadvice.tn>
Date: Fri, 30 Nov 2018 11:09:14 +0100
Subject: [PATCH] Fix class import.
---
bbb-screenshare/app/src/main/webapp/WEB-INF/red5-web.xml | 5 ++---
.../java/org/bigbluebutton/red5/pubsub/MessagePublisher.java | 2 +-
bbb-video/src/main/webapp/WEB-INF/bbb-redis-messaging.xml | 2 +-
bbb-voice/build.gradle | 2 --
bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml | 3 +--
5 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/bbb-screenshare/app/src/main/webapp/WEB-INF/red5-web.xml b/bbb-screenshare/app/src/main/webapp/WEB-INF/red5-web.xml
index 1b0b2b6b0e..91e61cb370 100755
--- a/bbb-screenshare/app/src/main/webapp/WEB-INF/red5-web.xml
+++ b/bbb-screenshare/app/src/main/webapp/WEB-INF/red5-web.xml
@@ -35,9 +35,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</property>
</bean>
- <import resource="bbb-redis-messaging.xml"/>
-
-
<bean id="screenShareApplication" class="org.bigbluebutton.app.screenshare.ScreenShareApplication">
<constructor-arg index="0" ref="messageBus"/>
<constructor-arg index="1" value="${jnlpFile}"/>
@@ -106,4 +103,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</property>
</bean>
+ <import resource="bbb-redis-messaging.xml"/>
+
</beans>
diff --git a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java b/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
index a8a013cc3f..f2619b6341 100755
--- a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
+++ b/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
@@ -12,7 +12,7 @@ import org.bigbluebutton.common2.msgs.UserBroadcastCamStopMsg;
import org.bigbluebutton.common2.msgs.UserBroadcastCamStopMsgBody;
import org.bigbluebutton.common2.msgs.ValidateConnAuthTokenSysMsg;
import org.bigbluebutton.common2.msgs.ValidateConnAuthTokenSysMsgBody;
-import org.bigbluebutton.common2.redis.MessageSender;
+import org.bigbluebutton.common2.redis.pubsub.MessageSender;
import com.google.gson.Gson;
diff --git a/bbb-video/src/main/webapp/WEB-INF/bbb-redis-messaging.xml b/bbb-video/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
index 1a2f37cbde..918167fe43 100755
--- a/bbb-video/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
+++ b/bbb-video/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
@@ -63,7 +63,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="clientName" value="BbbRed5VideoSender" />
</bean>
- <bean id="redisPublisher" class="org.bigbluebutton.red5.pubsub.MessagePublisher">
+ <bean id="redisPublisher" class="org.bigbluebutton.red5.pubsub.MessagePublisher">
<property name="messageSender" ref="redisSender"/>
</bean>
diff --git a/bbb-voice/build.gradle b/bbb-voice/build.gradle
index 672da941ea..8828b83c34 100755
--- a/bbb-voice/build.gradle
+++ b/bbb-voice/build.gradle
@@ -69,7 +69,6 @@ war.doLast {
ant.unzip(src: war.archivePath, dest: "$buildDir/sip")
}
-
task deploy() << {
def red5AppsDir = '/usr/share/red5/webapps'
def sipDir = new File("${red5AppsDir}/sip")
@@ -80,4 +79,3 @@ task deploy() << {
fileset(dir: "$buildDir/sip")
}
}
-
diff --git a/bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml b/bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
index b99210b1e7..8da5666584 100755
--- a/bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
+++ b/bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
@@ -24,8 +24,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
- ">
+ http://www.springframework.org/schema/util/spring-util-2.0.xsd">
<bean id="redisMessageDistributor" class="org.bigbluebutton.common2.redis.pubsub.MessageDistributor">
<property name="messageHandler"> <ref local="redisMessageHandler"/> </property>
--
GitLab