diff --git a/bbb-screenshare/app/build.sbt b/bbb-screenshare/app/build.sbt
index 4c97207301073f691ed55a685c9c311150a02838..7e7f1b96f6f1631d1006f02b181e34b890dfd7f9 100755
--- a/bbb-screenshare/app/build.sbt
+++ b/bbb-screenshare/app/build.sbt
@@ -43,21 +43,17 @@ val akkaVersion = "2.5.1"
val scalaTestV = "2.2.6"
libraryDependencies ++= {
- val springVersion = "4.3.3.RELEASE"
+ val springVersion = "4.3.12.RELEASE"
Seq(
"com.typesafe.akka" %% "akka-actor" % akkaVersion,
"com.typesafe.akka" %% "akka-testkit" % akkaVersion % "test",
"com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
"com.typesafe" % "config" % "1.3.0",
- "ch.qos.logback" % "logback-classic" % "1.1.6" % "runtime",
- // "org.pegdown" % "pegdown" % "1.4.0",
- // "junit" % "junit" % "4.11",
- // "com.etaty.rediscala" %% "rediscala" % "1.4.0",
- "commons-codec" % "commons-codec" % "1.10",
- "redis.clients" % "jedis" % "2.7.2",
- // "org.apache.commons" % "commons-lang3" % "3.2",
+ "ch.qos.logback" % "logback-classic" % "1.2.3" % "runtime",
+ "commons-codec" % "commons-codec" % "1.11",
+ "redis.clients" % "jedis" % "2.7.2",
"org.apache.commons" % "commons-pool2" % "2.3",
- "org.red5" % "red5-server" % "1.0.8-M13",
+ "org.red5" % "red5-server" % "1.0.10-M5",
"com.google.code.gson" % "gson" % "2.5",
"org.springframework" % "spring-web" % springVersion,
"org.springframework" % "spring-beans" % springVersion,
diff --git a/bbb-screenshare/app/deploy.sh b/bbb-screenshare/app/deploy.sh
index c6f58aec32b7b374b83ff49c46a4b4ea4dc4a881..a008d431270aa34a5a1d524f5af29502fff112ef 100755
--- a/bbb-screenshare/app/deploy.sh
+++ b/bbb-screenshare/app/deploy.sh
@@ -21,7 +21,7 @@ sudo cp ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/bbb-sc
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/gson-2.5.jar \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/jedis-2.7.2.jar \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/commons-pool2-2.3.jar \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/spring-webmvc-4.3.3.RELEASE.jar \
+ ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/spring-webmvc-4.3.12.RELEASE.jar \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/rediscala_2.12-1.8.0.jar \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/bbb-common-message_2.12-0.0.19-SNAPSHOT.jar \
/usr/share/red5/webapps/screenshare/WEB-INF/lib/
diff --git a/bbb-video/build.gradle b/bbb-video/build.gradle
index a6237c6ded6e95e9d81ab3185a543730adec9ddb..88d9a056cc948c10ab31da12063df7dea0fb82cc 100755
--- a/bbb-video/build.gradle
+++ b/bbb-video/build.gradle
@@ -22,31 +22,31 @@ dependencies {
providedCompile 'javax.servlet:servlet-api:2.5@jar'
// Mina
- providedCompile 'org.apache.mina:mina-core:2.0.15@jar'
- providedCompile 'org.apache.mina:mina-integration-beans:2.0.15@jar'
- providedCompile 'org.apache.mina:mina-integration-jmx:2.0.14@jar'
+ providedCompile 'org.apache.mina:mina-core:2.0.17@jar'
+ 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.3.RELEASE@jar'
- providedCompile 'org.springframework:spring-beans:4.3.3.RELEASE@jar'
- providedCompile 'org.springframework:spring-context:4.3.3.RELEASE@jar'
- providedCompile 'org.springframework:spring-core:4.3.3.RELEASE@jar'
+ 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.12.RELEASE@jar'
- providedCompile 'org.red5:red5-server:1.0.8-M13@jar'
- providedCompile 'org.red5:red5-server-common:1.0.8-M13@jar'
- providedCompile 'org.red5:red5-io:1.0.8-M13@jar'
+ providedCompile 'org.red5:red5-server:1.0.10-M5@jar'
+ providedCompile 'org.red5:red5-server-common:1.0.10-M5@jar'
+ providedCompile 'org.red5:red5-io:1.0.10-M5@jar'
// Logging
- providedCompile 'ch.qos.logback:logback-core:1.1.7@jar'
- providedCompile 'ch.qos.logback:logback-classic:1.1.7@jar'
- providedCompile 'org.slf4j:log4j-over-slf4j:1.7.21@jar'
- providedCompile 'org.slf4j:jcl-over-slf4j:1.7.21@jar'
- providedCompile 'org.slf4j:jul-to-slf4j:1.7.21@jar'
- providedCompile 'org.slf4j:slf4j-api:1.7.21@jar'
+ providedCompile 'ch.qos.logback:logback-core:1.2.3@jar'
+ providedCompile 'ch.qos.logback:logback-classic:1.2.3@jar'
+ providedCompile 'org.slf4j:log4j-over-slf4j:1.7.25@jar'
+ providedCompile 'org.slf4j:jcl-over-slf4j:1.7.25@jar'
+ providedCompile 'org.slf4j:jul-to-slf4j:1.7.25@jar'
+ providedCompile 'org.slf4j:slf4j-api:1.7.25@jar'
// 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.3.RELEASE@jar'
+ providedCompile 'org.springframework:spring-aop:4.3.12.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'
// Testing
@@ -60,7 +60,7 @@ dependencies {
compile 'org.apache.commons:commons-pool2:2.3'
compile 'com.google.code.gson:gson:2.5'
- compile 'org.apache.commons:commons-lang3:3.5'
+ compile 'org.apache.commons:commons-lang3:3.7'
compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.19-SNAPSHOT'
}
diff --git a/bbb-voice/build.gradle b/bbb-voice/build.gradle
index f58d7d1375cb526ae99116a2050f7e13c92a3bb5..68a9cfe0b9148e17542fa7f408da3ae066d0e7b6 100755
--- a/bbb-voice/build.gradle
+++ b/bbb-voice/build.gradle
@@ -23,31 +23,31 @@ dependencies {
providedCompile 'javax.servlet:servlet-api:2.5@jar'
// Mina
- providedCompile 'org.apache.mina:mina-core:2.0.15@jar'
- providedCompile 'org.apache.mina:mina-integration-beans:2.0.15@jar'
- providedCompile 'org.apache.mina:mina-integration-jmx:2.0.14@jar'
+ providedCompile 'org.apache.mina:mina-core:2.0.17@jar'
+ 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.3.RELEASE@jar'
- providedCompile 'org.springframework:spring-beans:4.3.3.RELEASE@jar'
- providedCompile 'org.springframework:spring-context:4.3.3.RELEASE@jar'
- providedCompile 'org.springframework:spring-core:4.3.3.RELEASE@jar'
+ 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.12.RELEASE@jar'
- providedCompile 'org.red5:red5-server:1.0.8-M13@jar'
- providedCompile 'org.red5:red5-server-common:1.0.8-M13@jar'
- providedCompile 'org.red5:red5-io:1.0.8-M13@jar'
+ providedCompile 'org.red5:red5-server:1.0.10-M5@jar'
+ providedCompile 'org.red5:red5-server-common:1.0.10-M5@jar'
+ providedCompile 'org.red5:red5-io:1.0.10-M5@jar'
// Logging
- providedCompile 'ch.qos.logback:logback-core:1.1.7@jar'
- providedCompile 'ch.qos.logback:logback-classic:1.1.7@jar'
- providedCompile 'org.slf4j:log4j-over-slf4j:1.7.21@jar'
- providedCompile 'org.slf4j:jcl-over-slf4j:1.7.21@jar'
- providedCompile 'org.slf4j:jul-to-slf4j:1.7.21@jar'
- providedCompile 'org.slf4j:slf4j-api:1.7.21@jar'
+ providedCompile 'ch.qos.logback:logback-core:1.2.3@jar'
+ providedCompile 'ch.qos.logback:logback-classic:1.2.3@jar'
+ providedCompile 'org.slf4j:log4j-over-slf4j:1.7.25@jar'
+ providedCompile 'org.slf4j:jcl-over-slf4j:1.7.25@jar'
+ providedCompile 'org.slf4j:jul-to-slf4j:1.7.25@jar'
+ providedCompile 'org.slf4j:slf4j-api:1.7.25@jar'
// 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.3.RELEASE@jar'
+ providedCompile 'org.springframework:spring-aop:4.3.12.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'
// Testing
@@ -61,7 +61,7 @@ dependencies {
compile 'org.apache.commons:commons-pool2:2.3'
compile 'com.google.code.gson:gson:2.5'
- compile 'org.apache.commons:commons-lang3:3.5'
+ compile 'org.apache.commons:commons-lang3:3.7'
compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.19-SNAPSHOT'
}
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java
index 2cfc71c6fe1cad3c1e9b1d30a74ab55baba57f90..2500bf7382e93fe0bf779ada7429717117c679cb 100755
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java
+++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java
@@ -54,6 +54,7 @@ public class AudioBroadcastStream implements IBroadcastStream, IProvider, IPipeC
// Codec handling stuff for frame dropping
private StreamCodecInfo streamCodecInfo;
private Long creationTime;
+ private Long startTime;
public AudioBroadcastStream(String name) {
publishedStreamName = name;
@@ -137,6 +138,8 @@ public class AudioBroadcastStream implements IBroadcastStream, IProvider, IPipeC
public void start() {
log.debug("Starting AudioBroadcastStream()");
+ creationTime = System.currentTimeMillis();
+ startTime = creationTime;
}
public void stop() {
@@ -205,4 +208,8 @@ public class AudioBroadcastStream implements IBroadcastStream, IProvider, IPipeC
public long getCreationTime() {
return creationTime != null ? creationTime : 0L;
}
+
+ public long getStartTime() {
+ return startTime != null ? startTime : 0L;
+ }
}
diff --git a/bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java b/bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java
index 056c98c67d254e0b0c1ec9914f2bc18a7c28790c..30734823e3f1b8d05ddefb29ae97749e632839c4 100755
--- a/bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java
+++ b/bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java
@@ -37,7 +37,8 @@ public class AudioStream implements IBroadcastStream, IProvider, IPipeConnection
// Codec handling stuff for frame dropping
private StreamCodecInfo streamCodecInfo;
private Long creationTime;
-
+ private Long startTime;
+
public AudioStream(String name) {
publishedStreamName = name;
livePipe = null;
@@ -107,6 +108,8 @@ public class AudioStream implements IBroadcastStream, IProvider, IPipeConnection
public void start() {
log.trace("start()");
+ creationTime = System.currentTimeMillis();
+ startTime = creationTime;
}
public void stop() {
@@ -174,4 +177,8 @@ public class AudioStream implements IBroadcastStream, IProvider, IPipeConnection
public long getCreationTime() {
return creationTime != null ? creationTime : 0L;
}
+
+ public long getStartTime() {
+ return startTime != null ? startTime : 0L;
+ }
}
diff --git a/bigbluebutton-apps/build.gradle b/bigbluebutton-apps/build.gradle
index 283439e630ea7bfc394f31869dcfceabbcb37fcb..b8b8bc46f2af3317625379d4c223db072117655f 100755
--- a/bigbluebutton-apps/build.gradle
+++ b/bigbluebutton-apps/build.gradle
@@ -26,31 +26,31 @@ dependencies {
providedCompile 'javax.servlet:servlet-api:2.5@jar'
// Mina
- providedCompile 'org.apache.mina:mina-core:2.0.15@jar'
- providedCompile 'org.apache.mina:mina-integration-beans:2.0.15@jar'
- providedCompile 'org.apache.mina:mina-integration-jmx:2.0.14@jar'
+ providedCompile 'org.apache.mina:mina-core:2.0.17@jar'
+ 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.3.RELEASE@jar'
- providedCompile 'org.springframework:spring-beans:4.3.3.RELEASE@jar'
- providedCompile 'org.springframework:spring-context:4.3.3.RELEASE@jar'
- providedCompile 'org.springframework:spring-core:4.3.3.RELEASE@jar'
+ 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'
// Red5
- providedCompile 'org.red5:red5-server:1.0.8-M13@jar'
- providedCompile 'org.red5:red5-server-common:1.0.8-M13@jar'
+ providedCompile 'org.red5:red5-server:1.0.10-M5@jar'
+ providedCompile 'org.red5:red5-server-common:1.0.10-M5@jar'
// Logging
- providedCompile 'ch.qos.logback:logback-core:1.1.7@jar'
- providedCompile 'ch.qos.logback:logback-classic:1.1.7@jar'
- providedCompile 'org.slf4j:log4j-over-slf4j:1.7.21@jar'
- providedCompile 'org.slf4j:jcl-over-slf4j:1.7.21@jar'
- providedCompile 'org.slf4j:jul-to-slf4j:1.7.21@jar'
- providedCompile 'org.slf4j:slf4j-api:1.7.23@jar'
+ providedCompile 'ch.qos.logback:logback-core:1.2.3@jar'
+ providedCompile 'ch.qos.logback:logback-classic:1.2.3@jar'
+ providedCompile 'org.slf4j:log4j-over-slf4j:1.7.25@jar'
+ providedCompile 'org.slf4j:jcl-over-slf4j:1.7.25@jar'
+ providedCompile 'org.slf4j:jul-to-slf4j:1.7.25@jar'
+ providedCompile 'org.slf4j:slf4j-api:1.7.25@jar'
// 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.3.RELEASE@jar'
+ providedCompile 'org.springframework:spring-aop:4.3.12.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'
// Testing
@@ -61,7 +61,7 @@ dependencies {
compile 'org.apache.commons:commons-pool2:2.3'
compile 'com.google.code.gson:gson:2.5'
- providedCompile 'org.apache.commons:commons-lang3:3.2'
+ providedCompile 'org.apache.commons:commons-lang3:3.7'
compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.19-SNAPSHOT'
compile 'org.bigbluebutton:bbb-apps-common_2.12:0.0.1-SNAPSHOT'
diff --git a/bigbluebutton-apps/deploy.sh b/bigbluebutton-apps/deploy.sh
index 597754b1f6093904a30f3499d79c33211171bce0..83d2945f61d70aa994e7b9f3de45d584bdc7ad0a 100755
--- a/bigbluebutton-apps/deploy.sh
+++ b/bigbluebutton-apps/deploy.sh
@@ -1,6 +1,8 @@
#!/bin/bash
# deploying 'bigbluebutton-apps' to /usr/share/red5/webapps
+sudo chown -R red5.red5 /usr/share/red5/webapps
+
gradle clean
gradle resolveDeps
gradle war deploy
diff --git a/video-broadcast/build.gradle b/video-broadcast/build.gradle
index dbd293c67720f6d55f4aafc1b289bc003629cb8e..9501c6e62a02489b98d1abf806c202d33609d433 100755
--- a/video-broadcast/build.gradle
+++ b/video-broadcast/build.gradle
@@ -22,32 +22,32 @@ dependencies {
providedCompile 'javax.servlet:servlet-api:2.5@jar'
// Mina
- providedCompile 'org.apache.mina:mina-core:2.0.8@jar'
- providedCompile 'org.apache.mina:mina-integration-beans:2.0.8@jar'
- providedCompile 'org.apache.mina:mina-integration-jmx:2.0.8@jar'
+ providedCompile 'org.apache.mina:mina-core:2.0.17@jar'
+ 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.0.8.RELEASE@jar'
- providedCompile 'org.springframework:spring-beans:4.0.7.RELEASE@jar'
- providedCompile 'org.springframework:spring-context:4.0.7.RELEASE@jar'
- providedCompile 'org.springframework:spring-core:4.0.7.RELEASE@jar'
+ 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.12.RELEASE@jar'
// Red5
- providedCompile 'org.red5:red5-server:1.0.7-M10@jar'
- providedCompile 'org.red5:red5-server-common:1.0.7-M10@jar'
- providedCompile 'org.red5:red5-io:1.0.7-M8@jar'
+ providedCompile 'org.red5:red5-server:1.0.10-M5@jar'
+ providedCompile 'org.red5:red5-server-common:1.0.10-M5@jar'
+ providedCompile 'org.red5:red5-io:1.0.10-M5@jar'
// Logging
- providedCompile 'ch.qos.logback:logback-core:1.1.2@jar'
- providedCompile 'ch.qos.logback:logback-classic:1.1.2@jar'
- providedCompile 'org.slf4j:log4j-over-slf4j:1.7.9@jar'
- providedCompile 'org.slf4j:jcl-over-slf4j:1.7.9@jar'
- providedCompile 'org.slf4j:jul-to-slf4j:1.7.9@jar'
- providedCompile 'org.slf4j:slf4j-api:1.7.9@jar'
+ providedCompile 'ch.qos.logback:logback-core:1.2.3@jar'
+ providedCompile 'ch.qos.logback:logback-classic:1.2.3@jar'
+ providedCompile 'org.slf4j:log4j-over-slf4j:1.7.25@jar'
+ providedCompile 'org.slf4j:jcl-over-slf4j:1.7.25@jar'
+ providedCompile 'org.slf4j:jul-to-slf4j:1.7.25@jar'
+ providedCompile 'org.slf4j:slf4j-api:1.7.25@jar'
// 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.0.8.RELEASE@jar'
+ providedCompile 'org.springframework:spring-aop:4.3.12.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'
// Java Concurrency In Practice