From 35fa440b8143f7fe506bff86e12a6dc5a771eab4 Mon Sep 17 00:00:00 2001 From: Ghazi Triki Date: Thu, 22 Nov 2018 12:53:42 -0200 Subject: [PATCH] Improve build shell scripts. --- .../app/screenshare/red5/Red5AppService.java | 5 --- .../ffmpeg-linux-x86/h264/sign-jar.sh | 34 +++++++++---------- .../ffmpeg-linux-x86/svc2/sign-jar.sh | 34 +++++++++---------- .../ffmpeg-linux-x86_64/h264/sign-jar.sh | 33 +++++++++--------- .../ffmpeg-linux-x86_64/svc2/sign-jar.sh | 33 +++++++++--------- .../ffmpeg-macosx-x86_64/h264/sign-jar.sh | 31 ++++++++--------- .../ffmpeg-macosx-x86_64/svc2/sign-jar.sh | 31 ++++++++--------- .../ffmpeg-windows-x86/h264/sign-jar.sh | 33 +++++++++--------- .../ffmpeg-windows-x86/svc2/sign-jar.sh | 33 +++++++++--------- .../ffmpeg-windows-x86_64/h264/sign-jar.sh | 33 +++++++++--------- .../ffmpeg-windows-x86_64/svc2/sign-jar.sh | 33 +++++++++--------- .../native-libs/unsigned-jars/sign-ffmpeg.sh | 31 ++++++++--------- bbb-screenshare/jws/webstart/build.sh | 21 ++++++------ bbb-screenshare/jws/webstart/deploy.sh | 3 +- bbb-video/deploy.sh | 4 +-- .../WEB-INF/bigbluebutton-video.properties | 10 +++--- bbb-voice/deploy.sh | 6 ++-- .../red5/media/SipToFlashAudioStream.java | 4 +-- .../org/red5/app/sip/stream/ListenStream.java | 4 +-- .../WEB-INF/bigbluebutton-sip.properties | 2 -- .../main/webapp/WEB-INF/red5-web.properties | 4 +-- bigbluebutton-apps/deploy.sh | 4 +-- bigbluebutton-web/build.sh | 1 - bigbluebutton-web/pres-checker/build.sh | 1 - bigbluebutton-web/pres-checker/run.sh | 1 - bigbluebutton-web/run.sh | 1 - 26 files changed, 201 insertions(+), 229 deletions(-) diff --git a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppService.java b/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppService.java index 6319bdcf269b..1e459fafa28e 100755 --- a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppService.java +++ b/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppService.java @@ -3,7 +3,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import java.util.concurrent.TimeUnit; import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.IConnection; @@ -180,10 +179,6 @@ public void screenShareClientPongMessage(Map msg) { handler.screenShareClientPongMessage(meetingId, userId, streamId, timestamp.longValue()); } - private Long genTimestamp() { - return TimeUnit.NANOSECONDS.toMillis(System.nanoTime()); - } - public void setAppHandler(Red5AppHandler handler) { this.handler = handler; } diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/h264/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/h264/sign-jar.sh index 01e78770a36a..09225a39145e 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/h264/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/h264/sign-jar.sh @@ -1,18 +1,16 @@ -FFMPEG=ffmpeg-3.0.2-1.2-linux-x86-h264.jar -mkdir workdir -cp $FFMPEG workdir/ffmpeg-linux-x86.jar -rm -rf src -mkdir -p src/main/resources -mkdir -p src/main/java -cd workdir -jar xvf ffmpeg-linux-x86.jar -cp org/bytedeco/javacpp/linux-x86/*.so* ../src/main/resources -cd .. -gradle jar -cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86-h264-unsigned.jar -ant sign-jar -cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86-h264.jar -rm -rf workdir -rm -rf src - - +FFMPEG=ffmpeg-3.0.2-1.2-linux-x86-h264.jar +mkdir workdir +cp $FFMPEG workdir/ffmpeg-linux-x86.jar +rm -rf src +mkdir -p src/main/resources +mkdir -p src/main/java +cd workdir +jar xvf ffmpeg-linux-x86.jar +cp org/bytedeco/javacpp/linux-x86/*.so* ../src/main/resources +cd .. +gradle jar +cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86-h264-unsigned.jar +ant sign-jar +cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86-h264.jar +rm -rf workdir +rm -rf src diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/svc2/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/svc2/sign-jar.sh index e82feeb760ee..ae658006f6ca 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/svc2/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/svc2/sign-jar.sh @@ -1,18 +1,16 @@ -FFMPEG=ffmpeg-3.0.2-1.2-linux-x86-svc2.jar -mkdir workdir -cp $FFMPEG workdir/ffmpeg-linux-x86.jar -rm -rf src -mkdir -p src/main/resources -mkdir -p src/main/java -cd workdir -jar xvf ffmpeg-linux-x86.jar -cp org/bytedeco/javacpp/linux-x86/*.so* ../src/main/resources -cd .. -gradle jar -cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86-svc2-unsigned.jar -ant sign-jar -cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86-svc2.jar -rm -rf workdir -rm -rf src - - +FFMPEG=ffmpeg-3.0.2-1.2-linux-x86-svc2.jar +mkdir workdir +cp $FFMPEG workdir/ffmpeg-linux-x86.jar +rm -rf src +mkdir -p src/main/resources +mkdir -p src/main/java +cd workdir +jar xvf ffmpeg-linux-x86.jar +cp org/bytedeco/javacpp/linux-x86/*.so* ../src/main/resources +cd .. +gradle jar +cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86-svc2-unsigned.jar +ant sign-jar +cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86-svc2.jar +rm -rf workdir +rm -rf src diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/h264/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/h264/sign-jar.sh index 2ffaf065ce97..d9c1ba9c026d 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/h264/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/h264/sign-jar.sh @@ -1,17 +1,16 @@ -FFMPEG=ffmpeg-3.0.2-1.2-linux-x86_64-h264.jar -mkdir workdir -cp $FFMPEG workdir/ffmpeg-linux-x86_64.jar -rm -rf src -mkdir -p src/main/resources -mkdir -p src/main/java -cd workdir -jar xvf ffmpeg-linux-x86_64.jar -cp org/bytedeco/javacpp/linux-x86_64/*.so* ../src/main/resources -cd .. -gradle jar -cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86_64-h264-unsigned.jar -ant sign-jar -cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86_64-h264.jar -rm -rf workdir -rm -rf src - +FFMPEG=ffmpeg-3.0.2-1.2-linux-x86_64-h264.jar +mkdir workdir +cp $FFMPEG workdir/ffmpeg-linux-x86_64.jar +rm -rf src +mkdir -p src/main/resources +mkdir -p src/main/java +cd workdir +jar xvf ffmpeg-linux-x86_64.jar +cp org/bytedeco/javacpp/linux-x86_64/*.so* ../src/main/resources +cd .. +gradle jar +cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86_64-h264-unsigned.jar +ant sign-jar +cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86_64-h264.jar +rm -rf workdir +rm -rf src diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/svc2/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/svc2/sign-jar.sh index 781bc3e08401..72f4872670e8 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/svc2/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/svc2/sign-jar.sh @@ -1,17 +1,16 @@ -FFMPEG=ffmpeg-3.0.2-1.2-linux-x86_64-svc2.jar -mkdir workdir -cp $FFMPEG workdir/ffmpeg-linux-x86_64.jar -rm -rf src -mkdir -p src/main/resources -mkdir -p src/main/java -cd workdir -jar xvf ffmpeg-linux-x86_64.jar -cp org/bytedeco/javacpp/linux-x86_64/*.so* ../src/main/resources -cd .. -gradle jar -cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86_64-svc2-unsigned.jar -ant sign-jar -cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86_64-svc2.jar -rm -rf workdir -rm -rf src - +FFMPEG=ffmpeg-3.0.2-1.2-linux-x86_64-svc2.jar +mkdir workdir +cp $FFMPEG workdir/ffmpeg-linux-x86_64.jar +rm -rf src +mkdir -p src/main/resources +mkdir -p src/main/java +cd workdir +jar xvf ffmpeg-linux-x86_64.jar +cp org/bytedeco/javacpp/linux-x86_64/*.so* ../src/main/resources +cd .. +gradle jar +cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86_64-svc2-unsigned.jar +ant sign-jar +cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86_64-svc2.jar +rm -rf workdir +rm -rf src diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/h264/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/h264/sign-jar.sh index 61c91813178c..d8255408d3d9 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/h264/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/h264/sign-jar.sh @@ -1,16 +1,15 @@ -FFMPEG=ffmpeg-3.0.2-1.2-macosx-x86_64-h264.jar -mkdir workdir -cp $FFMPEG workdir/ffmpeg-macosx-x86_64.jar -rm -rf src -mkdir -p src/main/resources -cd workdir -jar xvf ffmpeg-macosx-x86_64.jar -cp org/bytedeco/javacpp/macosx-x86_64/* ../src/main/resources -cd .. -rm -rf workdir -gradle jar -cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-macosx-x86_64-h264-unsigned.jar -ant sign-jar -cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-macosx-x86_64-h264.jar -rm -rf src - +FFMPEG=ffmpeg-3.0.2-1.2-macosx-x86_64-h264.jar +mkdir workdir +cp $FFMPEG workdir/ffmpeg-macosx-x86_64.jar +rm -rf src +mkdir -p src/main/resources +cd workdir +jar xvf ffmpeg-macosx-x86_64.jar +cp org/bytedeco/javacpp/macosx-x86_64/* ../src/main/resources +cd .. +rm -rf workdir +gradle jar +cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-macosx-x86_64-h264-unsigned.jar +ant sign-jar +cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-macosx-x86_64-h264.jar +rm -rf src diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/svc2/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/svc2/sign-jar.sh index 159d670c4b56..1639a806d089 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/svc2/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/svc2/sign-jar.sh @@ -1,16 +1,15 @@ -FFMPEG=ffmpeg-3.0.2-1.2-macosx-x86_64-svc2.jar -mkdir workdir -cp $FFMPEG workdir/ffmpeg-macosx-x86_64.jar -rm -rf src -mkdir -p src/main/resources -cd workdir -jar xvf ffmpeg-macosx-x86_64.jar -cp org/bytedeco/javacpp/macosx-x86_64/* ../src/main/resources -cd .. -rm -rf workdir -gradle jar -cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-macosx-x86_64-svc2-unsigned.jar -ant sign-jar -cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-macosx-x86_64-svc2.jar -rm -rf src - +FFMPEG=ffmpeg-3.0.2-1.2-macosx-x86_64-svc2.jar +mkdir workdir +cp $FFMPEG workdir/ffmpeg-macosx-x86_64.jar +rm -rf src +mkdir -p src/main/resources +cd workdir +jar xvf ffmpeg-macosx-x86_64.jar +cp org/bytedeco/javacpp/macosx-x86_64/* ../src/main/resources +cd .. +rm -rf workdir +gradle jar +cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-macosx-x86_64-svc2-unsigned.jar +ant sign-jar +cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-macosx-x86_64-svc2.jar +rm -rf src diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/h264/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/h264/sign-jar.sh index 1fbfa0ec4152..4f7c36064ba8 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/h264/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/h264/sign-jar.sh @@ -1,17 +1,16 @@ -FFMPEG=ffmpeg-3.0.2-1.2-windows-x86-h264.jar -mkdir workdir -cp $FFMPEG workdir/ffmpeg-windows-x86.jar -rm -rf src -mkdir -p src/main/resources -mkdir -p src/main/java -cd workdir -jar xvf ffmpeg-windows-x86.jar -cp org/bytedeco/javacpp/windows-x86/*.dll ../src/main/resources -cd .. -rm -rf workdir -gradle jar -cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86-h264-unsigned.jar -ant sign-jar -cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86-h264.jar -rm -rf src - +FFMPEG=ffmpeg-3.0.2-1.2-windows-x86-h264.jar +mkdir workdir +cp $FFMPEG workdir/ffmpeg-windows-x86.jar +rm -rf src +mkdir -p src/main/resources +mkdir -p src/main/java +cd workdir +jar xvf ffmpeg-windows-x86.jar +cp org/bytedeco/javacpp/windows-x86/*.dll ../src/main/resources +cd .. +rm -rf workdir +gradle jar +cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86-h264-unsigned.jar +ant sign-jar +cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86-h264.jar +rm -rf src diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/svc2/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/svc2/sign-jar.sh index 1e8a5d3afb9c..320f34680b98 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/svc2/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/svc2/sign-jar.sh @@ -1,17 +1,16 @@ -FFMPEG=ffmpeg-3.0.2-1.2-windows-x86-svc2.jar -mkdir workdir -cp $FFMPEG workdir/ffmpeg-windows-x86.jar -rm -rf src -mkdir -p src/main/resources -mkdir -p src/main/java -cd workdir -jar xvf ffmpeg-windows-x86.jar -cp org/bytedeco/javacpp/windows-x86/*.dll ../src/main/resources -cd .. -rm -rf workdir -gradle jar -cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86-svc2-unsigned.jar -ant sign-jar -cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86-svc2.jar -rm -rf src - +FFMPEG=ffmpeg-3.0.2-1.2-windows-x86-svc2.jar +mkdir workdir +cp $FFMPEG workdir/ffmpeg-windows-x86.jar +rm -rf src +mkdir -p src/main/resources +mkdir -p src/main/java +cd workdir +jar xvf ffmpeg-windows-x86.jar +cp org/bytedeco/javacpp/windows-x86/*.dll ../src/main/resources +cd .. +rm -rf workdir +gradle jar +cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86-svc2-unsigned.jar +ant sign-jar +cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86-svc2.jar +rm -rf src diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/h264/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/h264/sign-jar.sh index 94ed509cc73f..7ace75cc22b9 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/h264/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/h264/sign-jar.sh @@ -1,17 +1,16 @@ -FFMPEG=ffmpeg-3.0.2-1.2-windows-x86_64-h264.jar -mkdir workdir -cp $FFMPEG workdir/ffmpeg-windows-x86_64.jar -rm -rf src -mkdir -p src/main/resources -mkdir -p src/main/java -cd workdir -jar xvf ffmpeg-windows-x86_64.jar -cp org/bytedeco/javacpp/windows-x86_64/*.dll ../src/main/resources -cd .. -rm -rf workdir -gradle jar -cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86_64-h264-unsigned.jar -ant sign-jar -cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86_64-h264.jar -rm -rf src - +FFMPEG=ffmpeg-3.0.2-1.2-windows-x86_64-h264.jar +mkdir workdir +cp $FFMPEG workdir/ffmpeg-windows-x86_64.jar +rm -rf src +mkdir -p src/main/resources +mkdir -p src/main/java +cd workdir +jar xvf ffmpeg-windows-x86_64.jar +cp org/bytedeco/javacpp/windows-x86_64/*.dll ../src/main/resources +cd .. +rm -rf workdir +gradle jar +cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86_64-h264-unsigned.jar +ant sign-jar +cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86_64-h264.jar +rm -rf src diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/svc2/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/svc2/sign-jar.sh index 4b8c8c1023ac..0c67733b6a4d 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/svc2/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/svc2/sign-jar.sh @@ -1,17 +1,16 @@ -FFMPEG=ffmpeg-3.0.2-1.2-windows-x86_64-svc2.jar -mkdir workdir -cp $FFMPEG workdir/ffmpeg-windows-x86_64.jar -rm -rf src -mkdir -p src/main/resources -mkdir -p src/main/java -cd workdir -jar xvf ffmpeg-windows-x86_64.jar -cp org/bytedeco/javacpp/windows-x86_64/*.dll ../src/main/resources -cd .. -rm -rf workdir -gradle jar -cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86_64-svc2-unsigned.jar -ant sign-jar -cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86_64-svc2.jar -rm -rf src - +FFMPEG=ffmpeg-3.0.2-1.2-windows-x86_64-svc2.jar +mkdir workdir +cp $FFMPEG workdir/ffmpeg-windows-x86_64.jar +rm -rf src +mkdir -p src/main/resources +mkdir -p src/main/java +cd workdir +jar xvf ffmpeg-windows-x86_64.jar +cp org/bytedeco/javacpp/windows-x86_64/*.dll ../src/main/resources +cd .. +rm -rf workdir +gradle jar +cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86_64-svc2-unsigned.jar +ant sign-jar +cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86_64-svc2.jar +rm -rf src diff --git a/bbb-screenshare/jws/native-libs/unsigned-jars/sign-ffmpeg.sh b/bbb-screenshare/jws/native-libs/unsigned-jars/sign-ffmpeg.sh index 6cb98b0ea993..0ea0ec71b4c7 100755 --- a/bbb-screenshare/jws/native-libs/unsigned-jars/sign-ffmpeg.sh +++ b/bbb-screenshare/jws/native-libs/unsigned-jars/sign-ffmpeg.sh @@ -1,16 +1,15 @@ -FFMPEG=ffmpeg-3.0.2-1.2.jar -if [ -d "workdir" ]; then - rm -rf workdir -fi -mkdir workdir -cp $FFMPEG workdir -cd workdir -jar xf $FFMPEG -rm $FFMPEG -rm -rf META-INF -jar cf ffmpeg.jar * -cd .. -ant sign-ffmpeg-jar -cp workdir/ffmpeg.jar ../../../app/jws/lib/ -rm -rf workdir - +FFMPEG=ffmpeg-3.0.2-1.2.jar +if [ -d "workdir" ]; then + rm -rf workdir +fi +mkdir workdir +cp $FFMPEG workdir +cd workdir +jar xf $FFMPEG +rm $FFMPEG +rm -rf META-INF +jar cf ffmpeg.jar * +cd .. +ant sign-ffmpeg-jar +cp workdir/ffmpeg.jar ../../../app/jws/lib/ +rm -rf workdir diff --git a/bbb-screenshare/jws/webstart/build.sh b/bbb-screenshare/jws/webstart/build.sh index 7074eba05053..fec75ea03c9b 100755 --- a/bbb-screenshare/jws/webstart/build.sh +++ b/bbb-screenshare/jws/webstart/build.sh @@ -1,11 +1,10 @@ -if [ -d "lib" ]; then - rm -rf lib -fi -mkdir lib -cp ../../app/jws/lib/ffmpeg.jar lib -gradle clean -gradle jar -ant sign-jar -cp build/libs/javacv-screenshare-0.0.1.jar ../../app/jws/lib/ -rm -rf lib - +if [ -d "lib" ]; then + rm -rf lib +fi +mkdir lib +cp ../../app/jws/lib/ffmpeg.jar lib +gradle clean +gradle jar +ant sign-jar +cp build/libs/javacv-screenshare-0.0.1.jar ../../app/jws/lib/ +rm -rf lib diff --git a/bbb-screenshare/jws/webstart/deploy.sh b/bbb-screenshare/jws/webstart/deploy.sh index d8322cc8028d..e49c761f5592 100755 --- a/bbb-screenshare/jws/webstart/deploy.sh +++ b/bbb-screenshare/jws/webstart/deploy.sh @@ -1,2 +1 @@ -cp build/libs/javacv-screenshare-0.0.1.jar /usr/share/red5/webapps/screenshare/lib - +cp build/libs/javacv-screenshare-0.0.1.jar /usr/share/red5/webapps/screenshare/lib diff --git a/bbb-video/deploy.sh b/bbb-video/deploy.sh index 242a1ffae146..b7cab36a4bc4 100755 --- a/bbb-video/deploy.sh +++ b/bbb-video/deploy.sh @@ -1,10 +1,10 @@ #!/bin/bash # deploying 'bigbluebutton-apps' to /usr/share/red5/webapps -sudo chown -R red5.red5 /usr/share/red5/webapps +sudo chmod -R 777 /usr/share/red5/webapps/* gradle clean gradle resolveDeps gradle war deploy -sudo chown -R red5.red5 /usr/share/red5/webapps +sudo chown -R red5:red5 /usr/share/red5/webapps 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 afaaf239a5b5..c8b4ea2405ec 100755 --- a/bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties +++ b/bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties @@ -1,5 +1,5 @@ -redis.host=127.0.0.1 -redis.port=6379 -redis.password= -# recording keys should expire in 14 days -redis.keyExpiry=1209600 +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-voice/deploy.sh b/bbb-voice/deploy.sh index 06a8c8d804d6..b7cab36a4bc4 100755 --- a/bbb-voice/deploy.sh +++ b/bbb-voice/deploy.sh @@ -1,12 +1,10 @@ #!/bin/bash # deploying 'bigbluebutton-apps' to /usr/share/red5/webapps -sudo chmod -R 777 /usr/share/red5/webapps -sudo chown -R red5.red5 /usr/share/red5/webapps +sudo chmod -R 777 /usr/share/red5/webapps/* gradle clean gradle resolveDeps gradle war deploy -sudo chown -R red5.red5 /usr/share/red5/webapps -sudo chmod -R 777 /usr/share/red5/webapps +sudo chown -R red5:red5 /usr/share/red5/webapps diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/SipToFlashAudioStream.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/SipToFlashAudioStream.java index b81cdd554ab6..51b77259fb35 100644 --- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/SipToFlashAudioStream.java +++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/SipToFlashAudioStream.java @@ -19,16 +19,16 @@ package org.bigbluebutton.voiceconf.red5.media; import java.net.DatagramSocket; + import org.apache.mina.core.buffer.IoBuffer; import org.bigbluebutton.voiceconf.red5.media.transcoder.SipToFlashTranscoder; import org.bigbluebutton.voiceconf.red5.media.transcoder.TranscodedAudioDataListener; import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.IContext; import org.red5.server.api.scope.IScope; -import org.red5.server.net.rtmp.event.AudioData; +import org.red5.server.net.rtmp.event.AudioData; import org.red5.server.net.rtmp.event.Notify; import org.red5.server.net.rtmp.message.Constants; -import org.red5.server.scope.Scope; import org.red5.server.stream.IProviderService; import org.slf4j.Logger; diff --git a/bbb-voice/src/main/java/org/red5/app/sip/stream/ListenStream.java b/bbb-voice/src/main/java/org/red5/app/sip/stream/ListenStream.java index e0c4543b911c..ab41d32d8985 100755 --- a/bbb-voice/src/main/java/org/red5/app/sip/stream/ListenStream.java +++ b/bbb-voice/src/main/java/org/red5/app/sip/stream/ListenStream.java @@ -5,13 +5,13 @@ import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.IContext; import org.red5.server.api.scope.IScope; -import org.red5.server.net.rtmp.event.AudioData; +import org.red5.server.net.rtmp.event.AudioData; import org.red5.server.scope.Scope; import org.red5.server.stream.IProviderService; import org.slf4j.Logger; public class ListenStream implements TranscodedAudioDataListener { - final private Logger log = Red5LoggerFactory.getLogger(ListenStream.class, "sip"); + private final Logger log = Red5LoggerFactory.getLogger(ListenStream.class, "sip"); private AudioStream broadcastStream; private IScope scope; diff --git a/bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties b/bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties index 1e88bb9bc452..3dc265ff1bea 100755 --- a/bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties +++ b/bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties @@ -7,7 +7,6 @@ bbb.sip.app.port=5070 sip.server.username=bbbuser sip.server.password=secret - # The ip and port of the FreeSWITCH server freeswitch.ip=192.168.23.53 freeswitch.port=5060 @@ -21,7 +20,6 @@ redis.host=127.0.0.1 redis.port=6379 redis.password= - # If you want mjsip stack (red5/log/*access*.log) to minimize the amount of logs it # generates, set this to a lower value (e.g. 3). sipStackDebugLevel=3 diff --git a/bbb-voice/src/main/webapp/WEB-INF/red5-web.properties b/bbb-voice/src/main/webapp/WEB-INF/red5-web.properties index 1e17dff094bf..5d646d514744 100644 --- a/bbb-voice/src/main/webapp/WEB-INF/red5-web.properties +++ b/bbb-voice/src/main/webapp/WEB-INF/red5-web.properties @@ -1,2 +1,2 @@ -webapp.contextPath=/sip -webapp.virtualHosts=*, localhost, localhost:8088, 127.0.0.1:8088 +webapp.contextPath=/sip +webapp.virtualHosts=*, localhost, localhost:8088, 127.0.0.1:8088 diff --git a/bigbluebutton-apps/deploy.sh b/bigbluebutton-apps/deploy.sh index 242a1ffae146..b7cab36a4bc4 100755 --- a/bigbluebutton-apps/deploy.sh +++ b/bigbluebutton-apps/deploy.sh @@ -1,10 +1,10 @@ #!/bin/bash # deploying 'bigbluebutton-apps' to /usr/share/red5/webapps -sudo chown -R red5.red5 /usr/share/red5/webapps +sudo chmod -R 777 /usr/share/red5/webapps/* gradle clean gradle resolveDeps gradle war deploy -sudo chown -R red5.red5 /usr/share/red5/webapps +sudo chown -R red5:red5 /usr/share/red5/webapps diff --git a/bigbluebutton-web/build.sh b/bigbluebutton-web/build.sh index f725095d2b29..a18f016ad30f 100755 --- a/bigbluebutton-web/build.sh +++ b/bigbluebutton-web/build.sh @@ -1,4 +1,3 @@ gradle clean gradle resolveDeps grails clean - diff --git a/bigbluebutton-web/pres-checker/build.sh b/bigbluebutton-web/pres-checker/build.sh index 1f5048f55723..d2a60ea6951c 100755 --- a/bigbluebutton-web/pres-checker/build.sh +++ b/bigbluebutton-web/pres-checker/build.sh @@ -1,4 +1,3 @@ gradle clean gradle jar cp build/lib/*.jar lib - diff --git a/bigbluebutton-web/pres-checker/run.sh b/bigbluebutton-web/pres-checker/run.sh index 04fc97183cb1..faa48086ab4f 100755 --- a/bigbluebutton-web/pres-checker/run.sh +++ b/bigbluebutton-web/pres-checker/run.sh @@ -1,2 +1 @@ java -cp "/usr/share/prescheck/lib/*" org.bigbluebutton.prescheck.Main $@ - diff --git a/bigbluebutton-web/run.sh b/bigbluebutton-web/run.sh index b707bed78f2b..a9e681a95cbf 100755 --- a/bigbluebutton-web/run.sh +++ b/bigbluebutton-web/run.sh @@ -1,2 +1 @@ grails -Dserver.port=8989 run-war -