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

- try to upgrade to red5 1.0.2-M1. Need to fix compile and startup issues

Browse Source
This commit is contained in:
Richard Alam 2014-04-05 09:22:01 -07:00
parent 00974ecaae
commit 17868b5dba
5 changed files with 77 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bbb-voice/build.gradle
View File

@ -62,22 +62,22 @@ dependencies {
providedCompile 'org.apache.mina:mina-integration-beans:2.0.7@jar'
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.7@jar'
// Spring
providedCompile 'org.springframework:spring-web:3.1.1.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:3.1.1.RELEASE@jar'
providedCompile 'org.springframework:spring-context:3.1.1.RELEASE@jar'
providedCompile 'org.springframework:spring-core:3.1.1.RELEASE@jar'
// Red5
providedCompile 'org/red5:red5:1.0r4643@jar'
// Logging
providedCompile 'ch.qos.logback:logback-core:1.0.9@jar'
providedCompile 'ch.qos.logback:logback-classic:1.0.9@jar'
providedCompile 'org.slf4j:log4j-over-slf4j:1.7.2@jar'
providedCompile 'org.slf4j:jcl-over-slf4j:1.7.2@jar'
providedCompile 'org.slf4j:jul-to-slf4j:1.7.2@jar'
providedCompile 'org.slf4j:slf4j-api:1.7.2@jar'
// Spring
providedCompile 'org.springframework:spring-web:4.0.0.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.0.0.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.0.0.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.0.0.RELEASE@jar'
// Red5
providedCompile 'org/red5:red5:1.0.2-M1@jar'
// Logging
providedCompile 'ch.qos.logback:logback-core:1.0.13@jar'
providedCompile 'ch.qos.logback:logback-classic:1.0.13@jar'
providedCompile 'org.slf4j:log4j-over-slf4j:1.7.5@jar'
providedCompile 'org.slf4j:jcl-over-slf4j:1.7.5@jar'
providedCompile 'org.slf4j:jul-to-slf4j:1.7.5@jar'
providedCompile 'org.slf4j:slf4j-api:1.7.5@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.

60
bigbluebutton-apps/build.gradle
View File

@ -67,46 +67,38 @@ dependencies {
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.7@jar'
// Spring
providedCompile 'org.springframework:spring-web:3.1.1.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:3.1.1.RELEASE@jar'
providedCompile 'org.springframework:spring-context:3.1.1.RELEASE@jar'
providedCompile 'org.springframework:spring-core:3.1.1.RELEASE@jar'
providedCompile 'org.springframework:spring-web:4.0.0.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.0.0.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.0.0.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.0.0.RELEASE@jar'
compile 'org.springframework.amqp:spring-rabbit:1.2.0.RELEASE@jar'
compile 'org.springframework.integration:spring-integration-core:2.2.5.RELEASE@jar'
compile 'org.springframework.integration:spring-integration-amqp:2.2.5.RELEASE@jar'
compile 'org.springframework.integration:spring-integration-stream:2.2.5.RELEASE@jar'
// Red5
providedCompile 'org/red5:red5:1.0.2-M1@jar'
// Logging
providedCompile 'ch.qos.logback:logback-core:1.0.13@jar'
providedCompile 'ch.qos.logback:logback-classic:1.0.13@jar'
providedCompile 'org.slf4j:log4j-over-slf4j:1.7.5@jar'
providedCompile 'org.slf4j:jcl-over-slf4j:1.7.5@jar'
providedCompile 'org.slf4j:jul-to-slf4j:1.7.5@jar'
providedCompile 'org.slf4j:slf4j-api:1.7.5@jar'
compile "redis.clients:jedis:2.1.0"
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'
}
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'
}
// Red5
providedCompile 'org/red5:red5:1.0r4643@jar'
// Logging
providedCompile 'ch.qos.logback:logback-core:1.0.9@jar'
providedCompile 'ch.qos.logback:logback-classic:1.0.9@jar'
providedCompile 'org.slf4j:log4j-over-slf4j:1.7.2@jar'
providedCompile 'org.slf4j:jcl-over-slf4j:1.7.2@jar'
providedCompile 'org.slf4j:jul-to-slf4j:1.7.2@jar'
providedCompile 'org.slf4j:slf4j-api:1.7.2@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:3.0.6.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.testng:testng:5.8@jar'
compile 'org.easymock:easymock:2.4@jar'
//redis
//compile 'redis.clients:jedis:2.0.0'
@ -130,7 +122,7 @@ dependencies {
compile 'org.jboss.netty:netty:3.2.1.Final@jar'
compile 'com.google.code.gson:gson:1.7.1'
providedCompile 'org.apache.commons:commons-lang3:3.1'
compile 'commons-lang:commons-lang:2.5'
//compile 'commons-lang:commons-lang:2.5'
}
test {

1
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java
View File

@ -2,7 +2,6 @@ package org.bigbluebutton.conference.service.presentation;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang.StringEscapeUtils;
import org.bigbluebutton.conference.service.messaging.MessagingConstants;
import org.bigbluebutton.conference.service.messaging.redis.MessageHandler;
import com.google.gson.Gson;

39
deskshare/app/build.gradle
View File

@ -17,31 +17,28 @@ dependencies {
providedCompile 'org.apache.mina:mina-integration-beans:2.0.7@jar'
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.7@jar'
// Spring
providedCompile 'org.springframework:spring-web:3.1.1.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:3.1.1.RELEASE@jar'
providedCompile 'org.springframework:spring-context:3.1.1.RELEASE@jar'
providedCompile 'org.springframework:spring-core:3.1.1.RELEASE@jar'
// Red5
providedCompile 'org/red5:red5:1.0r4643@jar'
// Logging
providedCompile 'ch.qos.logback:logback-core:1.0.9@jar'
providedCompile 'ch.qos.logback:logback-classic:1.0.9@jar'
providedCompile 'org.slf4j:log4j-over-slf4j:1.7.2@jar'
providedCompile 'org.slf4j:jcl-over-slf4j:1.7.2@jar'
providedCompile 'org.slf4j:jul-to-slf4j:1.7.2@jar'
providedCompile 'org.slf4j:slf4j-api:1.7.2@jar'
// Spring
providedCompile 'org.springframework:spring-web:4.0.0.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.0.0.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.0.0.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.0.0.RELEASE@jar'
// Red5
providedCompile 'org/red5:red5:1.0.2-M1@jar'
// Logging
providedCompile 'ch.qos.logback:logback-core:1.0.13@jar'
providedCompile 'ch.qos.logback:logback-classic:1.0.13@jar'
providedCompile 'org.slf4j:log4j-over-slf4j:1.7.5@jar'
providedCompile 'org.slf4j:jcl-over-slf4j:1.7.5@jar'
providedCompile 'org.slf4j:jul-to-slf4j:1.7.5@jar'
providedCompile 'org.slf4j:slf4j-api:1.7.5@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:3.1.1.RELEASE@jar'
providedCompile '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'
@ -59,7 +56,7 @@ dependencies {
// java.lang.NoClassDefFoundError: org/apache/commons/fileupload/FileItemFactory or
// java.lang.NoClassDefFoundError: org/apache/commons/io/output/DeferredFileOutputStream
// ralam (Feb 27, 2013)
providedCompile 'commons-fileupload:commons-fileupload:1.2.2@jar'
providedCompile 'commons-fileupload:commons-fileupload:1.2.2@jar'
providedCompile 'commons-io:commons-io:2.1@jar'
// Libraries needed to run the scala tools

37
deskshare/build.gradle
View File

@ -66,22 +66,22 @@ dependencies {
compile 'org.apache.mina:mina-integration-beans:2.0.7@jar'
compile 'org.apache.mina:mina-integration-jmx:2.0.7@jar'
// Spring
compile 'org.springframework:spring-web:3.1.1.RELEASE@jar'
compile 'org.springframework:spring-beans:3.1.1.RELEASE@jar'
compile 'org.springframework:spring-context:3.1.1.RELEASE@jar'
compile 'org.springframework:spring-core:3.1.1.RELEASE@jar'
// Spring
compile 'org.springframework:spring-web:4.0.0.RELEASE@jar'
compile 'org.springframework:spring-beans:4.0.0.RELEASE@jar'
compile 'org.springframework:spring-context:4.0.0.RELEASE@jar'
compile 'org.springframework:spring-core:4.0.0.RELEASE@jar'
// Red5
compile 'org/red5:red5:1.0r4643@jar'
// Logging
compile 'ch.qos.logback:logback-core:1.0.9@jar'
compile 'ch.qos.logback:logback-classic:1.0.9@jar'
compile 'org.slf4j:log4j-over-slf4j:1.7.2@jar'
compile 'org.slf4j:jcl-over-slf4j:1.7.2@jar'
compile 'org.slf4j:jul-to-slf4j:1.7.2@jar'
compile 'org.slf4j:slf4j-api:1.7.2@jar'
// Red5
compile 'org/red5:red5:1.0.2-M1@jar'
// Logging
compile 'ch.qos.logback:logback-core:1.0.13@jar'
compile 'ch.qos.logback:logback-classic:1.0.13@jar'
compile 'org.slf4j:log4j-over-slf4j:1.7.5@jar'
compile 'org.slf4j:jcl-over-slf4j:1.7.5@jar'
compile 'org.slf4j:jul-to-slf4j:1.7.5@jar'
compile 'org.slf4j:slf4j-api:1.7.5@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.
@ -96,12 +96,9 @@ dependencies {
compile 'org.easymock:easymock:2.4@jar'
compile project(':common')
compile 'commons-fileupload:commons-fileupload:1.2.2@jar'
compile 'commons-fileupload:commons-fileupload:1.2.2@jar'
compile 'commons-io:commons-io:2.1@jar'
// Java Concurrency In Practice
compile 'net.jcip:jcip-annotations:1.0@jar'
// Libraries needed to run the scala tools
scalaTools 'org.scala-lang:scala-compiler:2.9.2'
scalaTools 'org.scala-lang:scala-library:2.9.2'