BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix class import.

Browse Source
This commit is contained in:
Ghazi Triki 2018-11-30 11:09:14 +01:00
parent 5faf558ad5
commit 6b20807fc1
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bbb-screenshare/app/src/main/webapp/WEB-INF/red5-web.xml
View File

@ -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>

2
bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
View File

@ -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;

2
bbb-video/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
View File

@ -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>

2
bbb-voice/build.gradle
View File

@ -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")
}
}

3
bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
View File

@ -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>