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

Improve red5 applications dependencies.

Browse Source
This commit is contained in:
Ghazi Triki 2018-11-22 11:35:48 -02:00
parent e768cbe3c5
commit 4ecda1e003
9 changed files with 61 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bbb-screenshare/app/project/Dependencies.scala
View File

@ -17,7 +17,7 @@ object Dependencies {
val jackson = "2.9.7"
val logback = "1.2.3"
val springVersion = "4.3.20.RELEASE"
val red5 = "1.0.10-M9"
val red5 = "1.0.10-M5"
val servlet = "2.5"
val ffmpeg = "4.0.2-1.4.3"
val openCv = "1.4.3"

18
bbb-video/build.gradle
View File

@ -34,10 +34,10 @@ dependencies {
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.17@jar'
// Spring
providedCompile 'org.springframework:spring-web:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.13.RELEASE@jar'
providedCompile 'org.springframework:spring-web:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.20.RELEASE@jar'
// Red5
providedCompile 'org.red5:red5-server:1.0.10-M5@jar'
@ -54,12 +54,9 @@ dependencies {
// Needed for the JVM shutdown hook but needs to be put into red5/lib dir.
// Otherwise we get exception on aop utils class not found.
providedCompile 'org.springframework:spring-aop:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-aop:4.3.20.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'
// Testing
testRuntime 'org.easymock:easymock:3.6@jar'
//redis
compile 'org.apache.commons:commons-pool2:2.6.0'
compile 'com.google.code.gson:gson:2.8.5'
@ -68,10 +65,6 @@ dependencies {
compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.20-SNAPSHOT'
}
test {
useTestNG()
}
war.doLast {
ant.unzip(src: war.archivePath, dest: "$buildDir/video")
}
@ -80,6 +73,7 @@ war.doLast {
task deploy() << {
def red5AppsDir = '/usr/share/red5/webapps'
def videoDir = new File("${red5AppsDir}/video")
println "Deleting $videoDir"
if (videoDir.exists()) ant.delete(dir: videoDir)
ant.mkdir(dir: videoDir)
ant.copy(todir: videoDir) {

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

@ -27,6 +27,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
http://www.springframework.org/schema/util/spring-util-2.0.xsd
">
<bean id="meetingMessageHandler" class="org.bigbluebutton.red5.pubsub.MeetingMessageHandler">
<property name="meetingManager" ref="meetingManager"/>
<property name="connInvokerService" ref="connInvokerService"/>
</bean>
<bean id="receivedMessageHandler" class="org.bigbluebutton.common2.redis.pubsub.ReceivedMessageHandler"
init-method="start" destroy-method="stop">
</bean>
<bean id="redisStorageService"
class="org.bigbluebutton.common2.redis.RedisStorageService"
init-method="start" destroy-method="stop">
@ -66,14 +75,5 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</set>
</property>
</bean>
<bean id="meetingMessageHandler" class="org.bigbluebutton.red5.pubsub.MeetingMessageHandler">
<property name="meetingManager" ref="meetingManager"/>
<property name="connInvokerService" ref="connInvokerService"/>
</bean>
<bean id="receivedMessageHandler" class="org.bigbluebutton.common2.redis.pubsub.ReceivedMessageHandler"
init-method="start" destroy-method="stop">
</bean>
</beans>

1
bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
View File

@ -1,4 +1,5 @@
redis.host=127.0.0.1
redis.port=6379
redis.password=
# recording keys should expire in 14 days
redis.keyExpiry=1209600

16
bbb-video/src/main/webapp/WEB-INF/red5-web.xml
View File

@ -21,8 +21,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:lang="http://www.springframework.org/schema/lang"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
<bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="locations">
@ -34,6 +36,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</bean>
<import resource="bbb-redis-messaging.xml"/>
<bean id="meetingManager" class="org.bigbluebutton.app.video.MeetingManager"/>
<bean id="connInvokerService" class="org.bigbluebutton.app.video.ConnectionInvokerService"
init-method="start" destroy-method="stop"/>
<bean id="web.context" class="org.red5.server.Context"
autowire="byType" />
@ -47,11 +54,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="virtualHosts" value="${webapp.virtualHosts}" />
</bean>
<bean id="connInvokerService" class="org.bigbluebutton.app.video.ConnectionInvokerService"
init-method="start" destroy-method="stop"/>
<bean id="meetingManager" class="org.bigbluebutton.app.video.MeetingManager"/>
<bean id="web.handler" class="org.bigbluebutton.app.video.VideoApplication">
<property name="packetTimeout" value="10000"/>
<property name="eventRecordingService" ref="redisStorageService"/>

19
bbb-voice/build.gradle
View File

@ -33,11 +33,11 @@ dependencies {
providedCompile 'org.apache.mina:mina-integration-beans:2.0.17@jar'
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.17@jar'
// Spring
providedCompile 'org.springframework:spring-web:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.13.RELEASE@jar'
// Spring
providedCompile 'org.springframework:spring-web:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.20.RELEASE@jar'
// Red5
providedCompile 'org.red5:red5-server:1.0.10-M5@jar'
@ -54,7 +54,7 @@ dependencies {
// Needed for the JVM shutdown hook but needs to be put into red5/lib dir.
// Otherwise we get exception on aop utils class not found.
providedCompile 'org.springframework:spring-aop:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-aop:4.3.20.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'
//redis
@ -63,13 +63,6 @@ dependencies {
compile 'org.apache.commons:commons-lang3:3.8.1'
compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.20-SNAPSHOT'
// Testing
testRuntime 'org.easymock:easymock:3.6@jar'
}
test {
useTestNG()
}
war.doLast {

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

@ -27,6 +27,20 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
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>
<property name="messageListeners">
<set>
<ref bean="meetingMessageHandler" />
</set>
</property>
</bean>
<bean id="redisMessageHandler" class="org.bigbluebutton.common2.redis.pubsub.ReceivedMessageHandler"
init-method="start" destroy-method="stop">
<property name="messageDistributor"><ref bean="redisMessageDistributor" /></property>
</bean>
<bean id="redisMessageSender" class="org.bigbluebutton.common2.redis.pubsub.MessageSender"
init-method="start" destroy-method="stop">
<property name="host" value="${redis.host}"/>
@ -52,18 +66,4 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="messageHandler"> <ref local="redisMessageHandler"/> </property>
</bean>
<bean id="redisMessageHandler" class="org.bigbluebutton.common2.redis.pubsub.ReceivedMessageHandler"
init-method="start" destroy-method="stop">
<property name="messageDistributor"><ref bean="redisMessageDistributor" /></property>
</bean>
<bean id="redisMessageDistributor" class="org.bigbluebutton.common2.redis.pubsub.MessageDistributor">
<property name="messageHandler"> <ref local="redisMessageHandler"/> </property>
<property name="messageListeners">
<set>
<ref bean="meetingMessageHandler" />
</set>
</property>
</bean>
</beans>

21
bbb-voice/src/main/webapp/WEB-INF/red5-web.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
@ -55,6 +54,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="contextPath" value="${webapp.contextPath}" />
<property name="virtualHosts" value="${webapp.virtualHosts}" />
</bean>
<bean id="sipPeerManager" class="org.bigbluebutton.voiceconf.sip.SipPeerManager">
<property name="sipStackDebugLevel" value="${sipStackDebugLevel}"/>
<property name="sipRemotePort" value="${freeswitch.port}"/>
<property name="messagingService" ref="messagingService"/>
</bean>
<bean id="voiceconf.service" class="org.bigbluebutton.voiceconf.red5.Service">
<property name="sipPeerManager" ref="sipPeerManager"/>
</bean>
<bean id="web.handler" class="org.bigbluebutton.voiceconf.red5.Application">
<property name="sipClientRtpIp" value="${bbb.sip.app.ip}" />
@ -70,14 +79,4 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="messagingService" ref="messagingService"/>
</bean>
<bean id="sipPeerManager" class="org.bigbluebutton.voiceconf.sip.SipPeerManager">
<property name="sipStackDebugLevel" value="${sipStackDebugLevel}"/>
<property name="sipRemotePort" value="${freeswitch.port}"/>
<property name="messagingService" ref="messagingService"/>
</bean>
<bean id="voiceconf.service" class="org.bigbluebutton.voiceconf.red5.Service">
<property name="sipPeerManager" ref="sipPeerManager"/>
</bean>
</beans>

10
bigbluebutton-apps/build.gradle
View File

@ -38,10 +38,10 @@ dependencies {
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.17@jar'
// Spring
providedCompile 'org.springframework:spring-web:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.13.RELEASE@jar'
providedCompile 'org.springframework:spring-web:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.20.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.20.RELEASE@jar'
// Red5
providedCompile 'org.red5:red5-server:1.0.10-M5@jar'
@ -58,7 +58,7 @@ dependencies {
// Needed for the JVM shutdown hook but needs to be put into red5/lib dir.
// Otherwise we get exception on aop utils class not found.
providedCompile 'org.springframework:spring-aop:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-aop:4.3.20.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'
// Testing