From 4ecda1e0031db4d2228855ceda6f39b86b8d46fa Mon Sep 17 00:00:00 2001
From: Ghazi Triki <ghazi.triki@riadvice.tn>
Date: Thu, 22 Nov 2018 11:35:48 -0200
Subject: [PATCH] Improve red5 applications dependencies.

---
 .../app/project/Dependencies.scala            |  2 +-
 bbb-video/build.gradle                        | 18 ++++--------
 .../webapp/WEB-INF/bbb-redis-messaging.xml    | 18 ++++++------
 .../WEB-INF/bigbluebutton-video.properties    |  1 +
 .../src/main/webapp/WEB-INF/red5-web.xml      | 16 ++++++-----
 bbb-voice/build.gradle                        | 19 ++++---------
 .../webapp/WEB-INF/bbb-redis-messaging.xml    | 28 +++++++++----------
 .../src/main/webapp/WEB-INF/red5-web.xml      | 21 +++++++-------
 bigbluebutton-apps/build.gradle               | 10 +++----
 9 files changed, 61 insertions(+), 72 deletions(-)

diff --git a/bbb-screenshare/app/project/Dependencies.scala b/bbb-screenshare/app/project/Dependencies.scala
index a3802c86e8..0441ac6a63 100644
--- a/bbb-screenshare/app/project/Dependencies.scala
+++ b/bbb-screenshare/app/project/Dependencies.scala
@@ -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"
diff --git a/bbb-video/build.gradle b/bbb-video/build.gradle
index 1a332bef98..d767f014d3 100755
--- a/bbb-video/build.gradle
+++ b/bbb-video/build.gradle
@@ -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) {
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 56b09f1b2e..864c7d3abb 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
@@ -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>
diff --git a/bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties b/bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
index 5f8030de0c..afaaf239a5 100755
--- a/bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
+++ b/bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
@@ -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
diff --git a/bbb-video/src/main/webapp/WEB-INF/red5-web.xml b/bbb-video/src/main/webapp/WEB-INF/red5-web.xml
index 6639e50543..7bb5cd84a9 100755
--- a/bbb-video/src/main/webapp/WEB-INF/red5-web.xml
+++ b/bbb-video/src/main/webapp/WEB-INF/red5-web.xml
@@ -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"/>
diff --git a/bbb-voice/build.gradle b/bbb-voice/build.gradle
index c90d8a47b9..bbcd993045 100755
--- a/bbb-voice/build.gradle
+++ b/bbb-voice/build.gradle
@@ -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 {
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 8246ea6834..e7344b49f9 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
@@ -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>
diff --git a/bbb-voice/src/main/webapp/WEB-INF/red5-web.xml b/bbb-voice/src/main/webapp/WEB-INF/red5-web.xml
index bf68930d6a..610836054c 100755
--- a/bbb-voice/src/main/webapp/WEB-INF/red5-web.xml
+++ b/bbb-voice/src/main/webapp/WEB-INF/red5-web.xml
@@ -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>
diff --git a/bigbluebutton-apps/build.gradle b/bigbluebutton-apps/build.gradle
index 1a8d19d706..2d9aa55366 100755
--- a/bigbluebutton-apps/build.gradle
+++ b/bigbluebutton-apps/build.gradle
@@ -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