Permalink
Browse files

- upgrade to latest red5

  • Loading branch information...
1 parent faa2e35 commit 8f6213b77d72d39b8c116db57f5b478071013ed3 @ritzalam ritzalam committed Nov 22, 2016
@@ -34,7 +34,7 @@ retrieveManaged := true
libraryDependencies ++= {
val akkaVersion = "2.4.2"
- val springVersion = "4.2.5.RELEASE"
+ val springVersion = "4.3.3.RELEASE"
Seq(
"com.typesafe.akka" %% "akka-actor" % akkaVersion,
"com.typesafe.akka" %% "akka-testkit" % akkaVersion % "test",
@@ -48,7 +48,7 @@ libraryDependencies ++= {
"redis.clients" % "jedis" % "2.7.2",
// "org.apache.commons" % "commons-lang3" % "3.2",
"org.apache.commons" % "commons-pool2" % "2.3",
- "org.red5" % "red5-server" % "1.0.7-M10",
+ "org.red5" % "red5-server" % "1.0.8-M13",
"com.google.code.gson" % "gson" % "2.5",
"org.springframework" % "spring-web" % springVersion,
"org.springframework" % "spring-beans" % springVersion,
@@ -18,7 +18,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.2.5.RELEASE.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/bbb-common-message-0.0.18-SNAPSHOT.jar \
/usr/share/red5/webapps/screenshare/WEB-INF/lib/
@@ -18,51 +18,51 @@ repositories {
}
dependencies {
- // Servlet
- providedCompile 'javax.servlet:servlet-api:2.5@jar'
-
- // Mina
- providedCompile 'org.apache.mina:mina-core:2.0.13@jar'
- providedCompile 'org.apache.mina:mina-integration-beans:2.0.13@jar'
- providedCompile 'org.apache.mina:mina-integration-jmx:2.0.13@jar'
-
- // Spring
- providedCompile 'org.springframework:spring-web:4.2.5.RELEASE@jar'
- providedCompile 'org.springframework:spring-beans:4.2.5.RELEASE@jar'
- providedCompile 'org.springframework:spring-context:4.2.5.RELEASE@jar'
- providedCompile 'org.springframework:spring-core:4.2.5.RELEASE@jar'
+ // Servlet
+ 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'
+
+ // 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'
- // 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'
+ // 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-io:1.0.8-M13@jar'
- // Logging
- providedCompile 'ch.qos.logback:logback-core:1.1.6@jar'
- providedCompile 'ch.qos.logback:logback-classic:1.1.6@jar'
- providedCompile 'org.slf4j:log4j-over-slf4j:1.7.18@jar'
- providedCompile 'org.slf4j:jcl-over-slf4j:1.7.18@jar'
- providedCompile 'org.slf4j:jul-to-slf4j:1.7.18@jar'
- providedCompile 'org.slf4j:slf4j-api:1.7.18@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'
- // 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.2.5.RELEASE@jar'
- compile 'aopalliance:aopalliance:1.0@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'
+ compile 'aopalliance:aopalliance:1.0@jar'
- // Java Concurrency In Practice
- providedCompile 'net.jcip:jcip-annotations:1.0@jar'
+ // Java Concurrency In Practice
+ providedCompile 'net.jcip:jcip-annotations:1.0@jar'
- // Testing
-// compile 'org.testng:testng:5.8@jar'
- compile 'org.easymock:easymock:2.4@jar'
+ // Testing
+ // compile 'org.testng:testng:5.8@jar'
+ compile 'org.easymock:easymock:2.4@jar'
- //redis
- compile 'redis.clients:jedis:2.0.0'
- compile 'commons-pool:commons-pool:1.5.6'
- compile 'com.google.code.gson:gson:2.5'
+ //redis
+ compile 'redis.clients:jedis:2.0.0'
+ compile 'commons-pool:commons-pool:1.5.6'
+ compile 'com.google.code.gson:gson:2.5'
- compile 'org.bigbluebutton:bbb-common-message:0.0.18-SNAPSHOT'
+ compile 'org.bigbluebutton:bbb-common-message:0.0.18-SNAPSHOT'
}
test {
@@ -19,54 +19,48 @@ repositories {
dependencies {
- // Servlet
- providedCompile 'javax.servlet:servlet-api:2.5@jar'
-
- // Mina
- providedCompile 'org.apache.mina:mina-core:2.0.13@jar'
- providedCompile 'org.apache.mina:mina-integration-beans:2.0.13@jar'
- providedCompile 'org.apache.mina:mina-integration-jmx:2.0.13@jar'
+ // Servlet
+ 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'
// Spring
- providedCompile 'org.springframework:spring-web:4.2.5.RELEASE@jar'
- providedCompile 'org.springframework:spring-beans:4.2.5.RELEASE@jar'
- providedCompile 'org.springframework:spring-context:4.2.5.RELEASE@jar'
- providedCompile 'org.springframework:spring-core:4.2.5.RELEASE@jar'
+ 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.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-M10@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'
- // Logging
- providedCompile 'ch.qos.logback:logback-core:1.1.6@jar'
- providedCompile 'ch.qos.logback:logback-classic:1.1.6@jar'
- providedCompile 'org.slf4j:log4j-over-slf4j:1.7.18@jar'
- providedCompile 'org.slf4j:jcl-over-slf4j:1.7.18@jar'
- providedCompile 'org.slf4j:jul-to-slf4j:1.7.18@jar'
- providedCompile 'org.slf4j:slf4j-api:1.7.18@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'
- // 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.2.5.RELEASE@jar'
- compile 'aopalliance:aopalliance:1.0@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'
+ compile 'aopalliance:aopalliance:1.0@jar'
- // Java Concurrency In Practice
- //providedCompile 'net.jcip:jcip-annotations:1.0@jar'
-
- // Testing
-// compile 'org.testng:testng:5.8@jar'
- compile 'org.easymock:easymock:2.4@jar'
+ // Testing
+ compile 'org.easymock:easymock:2.4@jar'
- // Testing
-// testRuntime 'org/testng:testng:5.8@jar'
- testRuntime 'org.easymock:easymock:2.4@jar'
+ // Testing
+ testRuntime 'org.easymock:easymock:2.4@jar'
- // Redis pubsub
- compile "redis.clients:jedis:2.1.0"
- compile 'commons-pool:commons-pool:1.5.6'
- compile 'com.google.code.gson:gson:2.5'
+ // Redis pubsub
+ compile "redis.clients:jedis:2.1.0"
+ compile 'commons-pool:commons-pool:1.5.6'
+ compile 'com.google.code.gson:gson:2.5'
-
}
test {
@@ -149,33 +149,21 @@ public void onOOBControlMessage(IMessageComponent source, IPipe pipe, OOBControl
public void onPipeConnectionEvent(PipeConnectionEvent event) {
log.trace("onPipeConnectionEvent(event:{})", event);
- switch (event.getType()) {
- case PipeConnectionEvent.PROVIDER_CONNECT_PUSH:
- log.trace("PipeConnectionEvent.PROVIDER_CONNECT_PUSH");
- System.out.println("PipeConnectionEvent.PROVIDER_CONNECT_PUSH");
- if (event.getProvider() == this
- && (event.getParamMap() == null
- || !event.getParamMap().containsKey("record"))) {
- log.trace("Creating a live pipe");
- this.livePipe = (IPipe) event.getSource();
- }
- break;
- case PipeConnectionEvent.PROVIDER_DISCONNECT:
- log.trace("PipeConnectionEvent.PROVIDER_DISCONNECT");
- if (this.livePipe == event.getSource()) {
- log.trace("PipeConnectionEvent.PROVIDER_DISCONNECT - this.mLivePipe = null;");
- this.livePipe = null;
- }
- break;
- case PipeConnectionEvent.CONSUMER_CONNECT_PUSH:
- log.trace("PipeConnectionEvent.CONSUMER_CONNECT_PUSH");
- break;
- case PipeConnectionEvent.CONSUMER_DISCONNECT:
- log.trace("PipeConnectionEvent.CONSUMER_DISCONNECT");
- break;
- default:
- log.trace("PipeConnectionEvent default");
- break;
+ if (event.getType() == PipeConnectionEvent.EventType.PROVIDER_CONNECT_PUSH) {
+ log.trace("PipeConnectionEvent.PROVIDER_CONNECT_PUSH");
+ System.out.println("PipeConnectionEvent.PROVIDER_CONNECT_PUSH");
+ if (event.getProvider() == this
+ && (event.getParamMap() == null
+ || !event.getParamMap().containsKey("record"))) {
+ log.trace("Creating a live pipe");
+ this.livePipe = (IPipe) event.getSource();
+ }
+ } else if (event.getType() == PipeConnectionEvent.EventType.PROVIDER_DISCONNECT) {
+ log.trace("PipeConnectionEvent.PROVIDER_DISCONNECT");
+ if (this.livePipe == event.getSource()) {
+ log.trace("PipeConnectionEvent.PROVIDER_DISCONNECT - this.mLivePipe = null;");
+ this.livePipe = null;
+ }
}
}
@@ -119,33 +119,20 @@ public void onOOBControlMessage(IMessageComponent source, IPipe pipe, OOBControl
public void onPipeConnectionEvent(PipeConnectionEvent event) {
log.trace("onPipeConnectionEvent(event:{})", event);
- switch (event.getType())
- {
- case PipeConnectionEvent.PROVIDER_CONNECT_PUSH:
- log.trace("PipeConnectionEvent.PROVIDER_CONNECT_PUSH");
- System.out.println("PipeConnectionEvent.PROVIDER_CONNECT_PUSH");
- if (event.getProvider() == this && (event.getParamMap() == null || !event.getParamMap().containsKey("record"))) {
- log.trace("Creating a live pipe");
- System.out.println("Creating a live pipe");
- this.livePipe = (IPipe) event.getSource();
- }
- break;
- case PipeConnectionEvent.PROVIDER_DISCONNECT:
- log.trace("PipeConnectionEvent.PROVIDER_DISCONNECT");
- if (this.livePipe == event.getSource()) {
- log.trace("PipeConnectionEvent.PROVIDER_DISCONNECT - this.mLivePipe = null;");
- this.livePipe = null;
- }
- break;
- case PipeConnectionEvent.CONSUMER_CONNECT_PUSH:
- log.trace("PipeConnectionEvent.CONSUMER_CONNECT_PUSH");
- break;
- case PipeConnectionEvent.CONSUMER_DISCONNECT:
- log.trace("PipeConnectionEvent.CONSUMER_DISCONNECT");
- break;
- default:
- log.trace("PipeConnectionEvent default");
- break;
+ if (event.getType() == PipeConnectionEvent.EventType.PROVIDER_CONNECT_PUSH) {
+ log.trace("PipeConnectionEvent.PROVIDER_CONNECT_PUSH");
+ System.out.println("PipeConnectionEvent.PROVIDER_CONNECT_PUSH");
+ if (event.getProvider() == this && (event.getParamMap() == null || !event.getParamMap().containsKey("record"))) {
+ log.trace("Creating a live pipe");
+ System.out.println("Creating a live pipe");
+ this.livePipe = (IPipe) event.getSource();
+ }
+ } else if(event.getType() == PipeConnectionEvent.EventType.PROVIDER_DISCONNECT) {
+ log.trace("PipeConnectionEvent.PROVIDER_DISCONNECT");
+ if (this.livePipe == event.getSource()) {
+ log.trace("PipeConnectionEvent.PROVIDER_DISCONNECT - this.mLivePipe = null;");
+ this.livePipe = null;
+ }
}
}
@@ -26,40 +26,31 @@ dependencies {
providedCompile 'javax.servlet:servlet-api:2.5@jar'
// Mina
- providedCompile 'org.apache.mina:mina-core:2.0.13@jar'
- providedCompile 'org.apache.mina:mina-integration-beans:2.0.13@jar'
- providedCompile 'org.apache.mina:mina-integration-jmx:2.0.13@jar'
+ 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'
// Spring
- providedCompile 'org.springframework:spring-web:4.2.5.RELEASE@jar'
- providedCompile 'org.springframework:spring-beans:4.2.5.RELEASE@jar'
- providedCompile 'org.springframework:spring-context:4.2.5.RELEASE@jar'
- providedCompile 'org.springframework:spring-core:4.2.5.RELEASE@jar'
+ 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'
// 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-server:1.0.8-M13@jar'
+ providedCompile 'org.red5:red5-server-common:1.0.8-M13@jar'
// Logging
- providedCompile 'ch.qos.logback:logback-core:1.1.6@jar'
- providedCompile 'ch.qos.logback:logback-classic:1.1.6@jar'
- providedCompile 'org.slf4j:log4j-over-slf4j:1.7.18@jar'
- providedCompile 'org.slf4j:jcl-over-slf4j:1.7.18@jar'
- providedCompile 'org.slf4j:jul-to-slf4j:1.7.18@jar'
- providedCompile 'org.slf4j:slf4j-api:1.7.18@jar'
+ 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'
-/*
- compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
- compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
- compile "javax.servlet:com.springsource.javax.servlet.jsp.jstl:1.2.0"
- compile ("org.springframework.data:spring-data-redis:$springRedisVersion") {
- exclude group: 'commons-logging'
- }
-*/
-
// 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.2.5.RELEASE@jar'
+ providedCompile 'org.springframework:spring-aop:4.3.3.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'
// Testing

0 comments on commit 8f6213b

Please sign in to comment.