Skip to content
Snippets Groups Projects
Commit 53dc204e authored by Richard Alam's avatar Richard Alam
Browse files

Update to Java 8 

 Change dependencies to build against latest red5 to upgrade to java 8
parent 7d5c9d63
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
bbb-screenshare/app/build.sbt
+ 3
− 3
View file @ 53dc204e
...@@ -36,20 +36,20 @@ retrieveManaged := true ...@@ -36,20 +36,20 @@ retrieveManaged := true
libraryDependencies ++= { libraryDependencies ++= {
// val akkaVersion = "2.3.11" // val akkaVersion = "2.3.11"
val akkaVersion = "2.4.2" val akkaVersion = "2.4.2"
val springVersion = "4.1.8.RELEASE" val springVersion = "4.2.5.RELEASE"
Seq( Seq(
"com.typesafe.akka" %% "akka-actor" % akkaVersion, "com.typesafe.akka" %% "akka-actor" % akkaVersion,
"com.typesafe.akka" %% "akka-testkit" % akkaVersion % "test", "com.typesafe.akka" %% "akka-testkit" % akkaVersion % "test",
"com.typesafe.akka" %% "akka-slf4j" % akkaVersion, "com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
"com.typesafe" % "config" % "1.3.0", "com.typesafe" % "config" % "1.3.0",
"ch.qos.logback" % "logback-classic" % "1.0.13" % "runtime", "ch.qos.logback" % "logback-classic" % "1.1.6" % "runtime",
// "org.pegdown" % "pegdown" % "1.4.0", // "org.pegdown" % "pegdown" % "1.4.0",
// "junit" % "junit" % "4.11", // "junit" % "junit" % "4.11",
// "com.etaty.rediscala" %% "rediscala" % "1.4.0", // "com.etaty.rediscala" %% "rediscala" % "1.4.0",
"commons-codec" % "commons-codec" % "1.8", "commons-codec" % "commons-codec" % "1.8",
"redis.clients" % "jedis" % "2.7.2", "redis.clients" % "jedis" % "2.7.2",
// "org.apache.commons" % "commons-lang3" % "3.2", // "org.apache.commons" % "commons-lang3" % "3.2",
"org.red5" % "red5-server" % "1.0.6-RELEASE", "org.red5" % "red5-server" % "1.0.7-M8",
"com.google.code.gson" % "gson" % "1.7.1", "com.google.code.gson" % "gson" % "1.7.1",
"org.springframework" % "spring-web" % springVersion, "org.springframework" % "spring-web" % springVersion,
......
bbb-screenshare/app/deploy.sh
+ 5
− 3
View file @ 53dc204e
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
sbt clean sbt clean
sbt compile sbt compile
sbt package sbt package
sudo rm -r /usr/share/red5/webapps/screenshare if [[ -d /usr/share/red5/webapps/screenshare ]]; then
sudo rm -r /usr/share/red5/webapps/screenshare
fi
sudo cp -r target/webapp/ /usr/share/red5/webapps/screenshare sudo cp -r target/webapp/ /usr/share/red5/webapps/screenshare
...@@ -19,11 +21,11 @@ sudo cp ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/bbb-sc ...@@ -19,11 +21,11 @@ sudo cp ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/bbb-sc
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/akka-* \ ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/akka-* \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/config-1.3.0.jar \ ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/config-1.3.0.jar \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/gson-1.7.1.jar \ ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/gson-1.7.1.jar \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/spring-webmvc-4.1.8.RELEASE.jar \ ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/spring-webmvc-4.2.5.RELEASE.jar \
/usr/share/red5/webapps/screenshare/WEB-INF/lib/ /usr/share/red5/webapps/screenshare/WEB-INF/lib/
sudo mkdir /usr/share/red5/webapps/screenshare/WEB-INF/classes #sudo mkdir /usr/share/red5/webapps/screenshare/WEB-INF/classes
cd /usr/share/red5/webapps/screenshare/WEB-INF/classes/ cd /usr/share/red5/webapps/screenshare/WEB-INF/classes/
sudo jar -xf ../lib/bbb-screenshare-akka_2.11-0.0.1.jar sudo jar -xf ../lib/bbb-screenshare-akka_2.11-0.0.1.jar
sudo rm /usr/share/red5/webapps/screenshare/WEB-INF/lib/bbb-screenshare-akka_2.11-0.0.1.jar sudo rm /usr/share/red5/webapps/screenshare/WEB-INF/lib/bbb-screenshare-akka_2.11-0.0.1.jar
......
bbb-screenshare/app/src/main/webapp/WEB-INF/screenshare.properties
+ 4
− 4
View file @ 53dc204e
...@@ -15,9 +15,9 @@ redis.host=127.0.0.1 ...@@ -15,9 +15,9 @@ redis.host=127.0.0.1
redis.port=6379 redis.port=6379
streamBaseUrl=rtmp://192.168.23.44/screenshare streamBaseUrl=rtmp://192.168.23.9/screenshare
jnlpUrl=http://192.168.23.44/screenshare jnlpUrl=http://192.168.23.9/screenshare
jnlpFile=http://192.168.23.44/screenshare/screenshare.jnlp jnlpFile=http://192.168.23.9/screenshare/screenshare.jnlp
# NOTES: # NOTES:
# 1. GOP (group of pictures) is calculated as frameRate * keyFrameInterval # 1. GOP (group of pictures) is calculated as frameRate * keyFrameInterval
...@@ -26,4 +26,4 @@ jnlpFile=http://192.168.23.44/screenshare/screenshare.jnlp ...@@ -26,4 +26,4 @@ jnlpFile=http://192.168.23.44/screenshare/screenshare.jnlp
# 3. keyFrameInterval is in seconds # 3. keyFrameInterval is in seconds
# 4. Make sure you encode & into & as it will break the JNLP XML # 4. Make sure you encode & into & as it will break the JNLP XML
#codecOptions=crf=36&preset=veryfast&tune=animation,zerolatency&frameRate=12.0&keyFrameInterval=6 #codecOptions=crf=36&preset=veryfast&tune=animation,zerolatency&frameRate=12.0&keyFrameInterval=6
codecOptions=crf=38&preset=veryfast&tune=zerolatency&frameRate=12.0&keyFrameInterval=6&intra-refresh=1 codecOptions=crf=38&preset=veryfast&tune=zerolatency&frameRate=12.0&keyFrameInterval=6
bbb-video/build.gradle
+ 18
− 18
View file @ 53dc204e
...@@ -52,32 +52,32 @@ dependencies { ...@@ -52,32 +52,32 @@ dependencies {
providedCompile 'javax.servlet:servlet-api:2.5@jar' providedCompile 'javax.servlet:servlet-api:2.5@jar'
// Mina // Mina
providedCompile 'org.apache.mina:mina-core:2.0.8@jar' providedCompile 'org.apache.mina:mina-core:2.0.13@jar'
providedCompile 'org.apache.mina:mina-integration-beans:2.0.8@jar' providedCompile 'org.apache.mina:mina-integration-beans:2.0.13@jar'
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.8@jar' providedCompile 'org.apache.mina:mina-integration-jmx:2.0.13@jar'
// Spring // Spring
providedCompile 'org.springframework:spring-web:4.0.8.RELEASE@jar' providedCompile 'org.springframework:spring-web:4.2.5.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.0.7.RELEASE@jar' providedCompile 'org.springframework:spring-beans:4.2.5.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.0.7.RELEASE@jar' providedCompile 'org.springframework:spring-context:4.2.5.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.0.7.RELEASE@jar' providedCompile 'org.springframework:spring-core:4.2.5.RELEASE@jar'
// Red5 // Red5
providedCompile 'org.red5:red5-server:1.0.6-SNAPSHOT@jar' providedCompile 'org.red5:red5-server:1.0.7-M8@jar'
providedCompile 'org.red5:red5-server-common:1.0.6-SNAPSHOT@jar' providedCompile 'org.red5:red5-server-common:1.0.7-M8@jar'
providedCompile 'org.red5:red5-io:1.0.6-SNAPSHOT@jar' providedCompile 'org.red5:red5-io:1.0.7-M8@jar'
// Logging // Logging
providedCompile 'ch.qos.logback:logback-core:1.1.2@jar' providedCompile 'ch.qos.logback:logback-core:1.1.6@jar'
providedCompile 'ch.qos.logback:logback-classic:1.1.2@jar' providedCompile 'ch.qos.logback:logback-classic:1.1.6@jar'
providedCompile 'org.slf4j:log4j-over-slf4j:1.7.9@jar' providedCompile 'org.slf4j:log4j-over-slf4j:1.7.18@jar'
providedCompile 'org.slf4j:jcl-over-slf4j:1.7.9@jar' providedCompile 'org.slf4j:jcl-over-slf4j:1.7.18@jar'
providedCompile 'org.slf4j:jul-to-slf4j:1.7.9@jar' providedCompile 'org.slf4j:jul-to-slf4j:1.7.18@jar'
providedCompile 'org.slf4j:slf4j-api:1.7.9@jar' providedCompile 'org.slf4j:slf4j-api:1.7.18@jar'
// Needed for the JVM shutdown hook but needs to be put into red5/lib dir. // 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. // 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.2.5.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar' compile 'aopalliance:aopalliance:1.0@jar'
// Java Concurrency In Practice // Java Concurrency In Practice
...@@ -89,7 +89,7 @@ dependencies { ...@@ -89,7 +89,7 @@ dependencies {
//redis //redis
compile 'redis.clients:jedis:2.0.0' compile 'redis.clients:jedis:2.0.0'
providedCompile 'commons-pool:commons-pool:1.5.6' compile 'commons-pool:commons-pool:1.5.6'
compile 'com.google.code.gson:gson:2.5' compile 'com.google.code.gson:gson:2.5'
compile 'org.bigbluebutton:bbb-common-message:0.0.17-SNAPSHOT' compile 'org.bigbluebutton:bbb-common-message:0.0.17-SNAPSHOT'
......
bbb-voice/build.gradle
+ 18
− 18
View file @ 53dc204e
...@@ -52,31 +52,31 @@ dependencies { ...@@ -52,31 +52,31 @@ dependencies {
providedCompile 'javax.servlet:servlet-api:2.5@jar' providedCompile 'javax.servlet:servlet-api:2.5@jar'
// Mina // Mina
providedCompile 'org.apache.mina:mina-core:2.0.8@jar' providedCompile 'org.apache.mina:mina-core:2.0.13@jar'
providedCompile 'org.apache.mina:mina-integration-beans:2.0.8@jar' providedCompile 'org.apache.mina:mina-integration-beans:2.0.13@jar'
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.8@jar' providedCompile 'org.apache.mina:mina-integration-jmx:2.0.13@jar'
// Spring // Spring
providedCompile 'org.springframework:spring-web:4.0.8.RELEASE@jar' providedCompile 'org.springframework:spring-web:4.2.5.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.0.8.RELEASE@jar' providedCompile 'org.springframework:spring-beans:4.2.5.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.0.8.RELEASE@jar' providedCompile 'org.springframework:spring-context:4.2.5.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.0.8.RELEASE@jar' providedCompile 'org.springframework:spring-core:4.2.5.RELEASE@jar'
providedCompile 'org.red5:red5-server:1.0.6-SNAPSHOT@jar' providedCompile 'org.red5:red5-server:1.0.7-M8@jar'
providedCompile 'org.red5:red5-server-common:1.0.6-SNAPSHOT@jar' providedCompile 'org.red5:red5-server-common:1.0.7-M8@jar'
providedCompile 'org.red5:red5-io:1.0.6-SNAPSHOT@jar' providedCompile 'org.red5:red5-io:1.0.7-M8@jar'
// Logging // Logging
providedCompile 'ch.qos.logback:logback-core:1.1.2@jar' providedCompile 'ch.qos.logback:logback-core:1.1.6@jar'
providedCompile 'ch.qos.logback:logback-classic:1.1.2@jar' providedCompile 'ch.qos.logback:logback-classic:1.1.6@jar'
providedCompile 'org.slf4j:log4j-over-slf4j:1.7.9@jar' providedCompile 'org.slf4j:log4j-over-slf4j:1.7.18@jar'
providedCompile 'org.slf4j:jcl-over-slf4j:1.7.9@jar' providedCompile 'org.slf4j:jcl-over-slf4j:1.7.18@jar'
providedCompile 'org.slf4j:jul-to-slf4j:1.7.9@jar' providedCompile 'org.slf4j:jul-to-slf4j:1.7.18@jar'
providedCompile 'org.slf4j:slf4j-api:1.7.9@jar' providedCompile 'org.slf4j:slf4j-api:1.7.18@jar'
// Needed for the JVM shutdown hook but needs to be put into red5/lib dir. // 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. // 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.2.5.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar' compile 'aopalliance:aopalliance:1.0@jar'
// Java Concurrency In Practice // Java Concurrency In Practice
...@@ -94,7 +94,7 @@ dependencies { ...@@ -94,7 +94,7 @@ dependencies {
// Redis pubsub // Redis pubsub
compile "redis.clients:jedis:2.1.0" compile "redis.clients:jedis:2.1.0"
providedCompile 'commons-pool:commons-pool:1.5.6' compile 'commons-pool:commons-pool:1.5.6'
compile 'com.google.code.gson:gson:2.5' compile 'com.google.code.gson:gson:2.5'
......
bigbluebutton-apps/build.gradle
+ 16
− 17
View file @ 53dc204e
...@@ -59,27 +59,27 @@ dependencies { ...@@ -59,27 +59,27 @@ dependencies {
providedCompile 'javax.servlet:servlet-api:2.5@jar' providedCompile 'javax.servlet:servlet-api:2.5@jar'
// Mina // Mina
providedCompile 'org.apache.mina:mina-core:2.0.8@jar' providedCompile 'org.apache.mina:mina-core:2.0.13@jar'
providedCompile 'org.apache.mina:mina-integration-beans:2.0.8@jar' providedCompile 'org.apache.mina:mina-integration-beans:2.0.13@jar'
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.8@jar' providedCompile 'org.apache.mina:mina-integration-jmx:2.0.13@jar'
// Spring // Spring
providedCompile 'org.springframework:spring-web:4.0.8.RELEASE@jar' providedCompile 'org.springframework:spring-web:4.2.5.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.0.8.RELEASE@jar' providedCompile 'org.springframework:spring-beans:4.2.5.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.0.8.RELEASE@jar' providedCompile 'org.springframework:spring-context:4.2.5.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.0.8.RELEASE@jar' providedCompile 'org.springframework:spring-core:4.2.5.RELEASE@jar'
// Red5 // Red5
providedCompile 'org.red5:red5-server:1.0.6-SNAPSHOT@jar' providedCompile 'org.red5:red5-server:1.0.7-M8@jar'
providedCompile 'org.red5:red5-server-common:1.0.6-SNAPSHOT@jar' providedCompile 'org.red5:red5-server-common:1.0.7-M8@jar'
// Logging // Logging
providedCompile 'ch.qos.logback:logback-core:1.1.2@jar' providedCompile 'ch.qos.logback:logback-core:1.1.6@jar'
providedCompile 'ch.qos.logback:logback-classic:1.1.2@jar' providedCompile 'ch.qos.logback:logback-classic:1.1.6@jar'
providedCompile 'org.slf4j:log4j-over-slf4j:1.7.9@jar' providedCompile 'org.slf4j:log4j-over-slf4j:1.7.18@jar'
providedCompile 'org.slf4j:jcl-over-slf4j:1.7.9@jar' providedCompile 'org.slf4j:jcl-over-slf4j:1.7.18@jar'
providedCompile 'org.slf4j:jul-to-slf4j:1.7.9@jar' providedCompile 'org.slf4j:jul-to-slf4j:1.7.18@jar'
providedCompile 'org.slf4j:slf4j-api:1.7.9@jar' providedCompile 'org.slf4j:slf4j-api:1.7.18@jar'
compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion" compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion" compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
...@@ -90,11 +90,10 @@ dependencies { ...@@ -90,11 +90,10 @@ dependencies {
// Needed for the JVM shutdown hook but needs to be put into red5/lib dir. // 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. // Otherwise we get exception on aop utils class not found.
providedCompile 'org.springframework:spring-aop:4.0.7.RELEASE@jar' providedCompile 'org.springframework:spring-aop:4.2.5.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar' compile 'aopalliance:aopalliance:1.0@jar'
// Testing // Testing
//compile 'org.testng:testng:5.8-jdk15@jar'
compile 'org.easymock:easymock:2.4@jar' compile 'org.easymock:easymock:2.4@jar'
//redis //redis
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net