Permalink
Browse files

Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master

Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	record-and-playback/core/scripts/bigbluebutton.yml
  • Loading branch information...
2 parents e9cfe1c + b24c5b4 commit 58c239bc43f5b37adfcb5198b70ade3c916c54de @ritzalam ritzalam committed May 16, 2016
Showing 540 changed files with 48,506 additions and 43,162 deletions.
View
@@ -1,170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
- <head>
- <title></title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <style type="text/css" media="screen">
- html, body, #content { height:100%; }
- body { margin:0; padding:0; overflow:hidden; }
- #altContent { /* style alt content */ }
- .visually-hidden {
- position: absolute !important;
- clip: rect(1px 1px, 1px, 1px);
- clip: rect(1px, 1px, 1px, 1px);
- padding: 0 !important;
- border: 0 !important;
- height: 1px !important;
- width: 1px !important;
- overflow: hidden;
- }
-
- #deployJavaPlugin {
- display : none;
- }
- </style>
-
- <script type="text/javascript" src="swfobject/swfobject.js"></script>
- <script src="lib/deployJava.js?v=264" language="javascript"></script>
- <script type="text/javascript">
- //swfobject.registerObject("BigBlueButton", "11", "expressInstall.swf");
- var flashvars = {};
- var params = {};
- params.quality = "high";
- params.bgcolor = "#869ca7";
- params.allowfullscreen = "true";
- params.wmode = "window";
- params.allowscriptaccess = "true";
- params.seamlesstabbing = "true";
- var attributes = {};
- attributes.id = "BigBlueButton";
- attributes.name = "BigBlueButton";
- attributes.align = "middle";
- attributes.tabIndex = 0;
- swfobject.embedSWF("BigBlueButton.swf?v=264", "altFlash", "100%", "100%", "11.0.0", "expressInstall.swf", flashvars, params, attributes, embedCallback);
-
- function embedCallback(e) {
- // Work around pixel alignment bug with Chrome 21 on Mac.
- // See: http://code.google.com/p/bigbluebutton/issues/detail?id=1294
- var objs = $('object');
- objs.each(function(i, o) {
- var o = $(o);
- var top = o.offset().top;
- var left = o.offset().left;
- var roundtop = Math.round(top);
- var roundleft = Math.round(left);
- o.css("position", "relative");
- if (roundtop === top) {
- } else {
- o.css("top", roundtop - top);
- }
- if (roundleft === left) {
- } else {
- o.css("left", roundleft - left);
- }
- });
- }
- </script>
- <script src="lib/jquery-1.5.1.min.js?v=264" language="javascript"></script>
- <script src="lib/bbblogger.js?v=264" language="javascript"></script>
- <script src="lib/bigbluebutton.js?v=264" language="javascript"></script>
- <script src="lib/bbb_localization.js?v=264" language="javascript"></script>
- <script src="lib/bbb_blinker.js?v=264" language="javascript"></script>
- <script src="lib/bbb_deskshare.js?v=264" language="javascript"></script>
- <script src="lib/bbb_api_bridge.js?v=264" language="javascript"></script>
- <script src="lib/sip.js?v=264" language="javascript"></script>
- <script src="lib/bbb_webrtc_bridge_sip.js?v=264" language="javascript"></script>
- <script src="lib/weburl_regex.js?v=264" language="javascript"></script>
- <script>
- window.chatLinkClicked = function(url) {
- window.open(url, '_blank');
- window.focus();
- }
- </script>
- <script type="text/javascript">
- function html5() {
- // no Flash detected on the client
-
- var originalPath, request;
- originalPath = document.location.pathname;
-
- // reuse code in a function to log an error when needed
- var reportError = function() {
- alert("Unable to load the HTML5 client!");
- BBBLog.debug("Could not redirect to html5client (the server side does not seem to be running)");
- }
-
- var checkRequest = $.ajax({
- dataType: 'json',
- url: '/html5client/check'
- });
-
- checkRequest.done(function(data) {
- if(typeof data.html5clientStatus !== "undefined" && data.html5clientStatus !== null) {
- if(data.html5clientStatus === "running") {
- // use the enter api to detect the meetingid, userid and authToken
- // for the attempted joining of the meeting
- // and reuse them to join via the HTML5 client
- var enterRequest = $.ajax({
- dataType: 'json',
- url: '/bigbluebutton/api/enter'
- });
-
- enterRequest.done(function(enterData) {
- var authToken, meetingId, userId;
-
- meetingId = enterData.response.meetingID;
- userId = enterData.response.externUserID;
- authToken = enterData.response.authToken;
-
- if ((meetingId != null) && (userId != null) && (authToken != null)) {
- // redirect to the html5 client with the received info
- // format <IP>/html5client/<meetingId>/<userId>/<authToken>
- document.location.pathname = "/html5client/"+meetingId+"/"+userId+"/"+authToken;
- } else {
- // go back to the redirection page
- document.location.pathname = originalPath;
- }
- });
-
- enterRequest.fail(function(enterData, textStatus, errorThrown){
- reportError();
- });
- }
- else {
- reportError();
- }
- }
- else {
- reportError();
- }
- });
-
- checkRequest.fail(function(data, textStatus, errorThrown){
- reportError();
- });
- }
- </script>
- </head>
-
- <body>
- <div>
- <audio id="remote-media" autoplay="autoplay"></audio>
- </div>
-
- <div id="content">
- <div id="altFlash" style="width:50%; margin-left: auto; margin-right: auto; ">
- <h2>You need Flash installed and enabled in order to use the Flash client.</h2>
- <br/>
- <div style="width:50%; margin-left: auto; margin-right: auto; ">
- <a href="http://www.adobe.com/go/getflashplayer">
- <img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" />
- </a>
- <p style="margin-left:50px;" >OR</p>
- <button type="button" onclick="html5();"><h3>Launch the HTML5 client instead</h3></button>
- </div>
- </div>
- </div>
- <button id="enterFlash" type="button" class="visually-hidden" onclick="startFlashFocus();" value="Click to focus the client"></button>
- <div id="clientReady" aria-atomic="false" aria-live="polite"></div>
- </body>
-</html>
View
@@ -1,72 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
-Vagrant.configure(2) do |config|
- # The most common configuration options are documented and commented below.
- # For a complete reference, please see the online documentation at
- # https://docs.vagrantup.com.
-
- # Every Vagrant development environment requires a box. You can search for
- # boxes at https://atlas.hashicorp.com/search.
- config.vm.box = "RIADVICE/bigbluebutton-dev"
-
- # Disable automatic box update checking. If you disable this, then
- # boxes will only be checked for updates when the user runs
- # `vagrant box outdated`. This is not recommended.
- # config.vm.box_check_update = false
-
- # Create a forwarded port mapping which allows access to a specific port
- # within the machine from a port on the host machine. In the example below,
- # accessing "localhost:8080" will access port 80 on the guest machine.
- # config.vm.network "forwarded_port", guest: 80, host: 8080
-
- # Create a private network, which allows host-only access to the machine
- # using a specific IP.
- config.vm.network "private_network", ip: "192.168.33.22"
-
- # Create a public network, which generally matched to bridged network.
- # Bridged networks make the machine appear as another physical device on
- # your network.
- # config.vm.network "public_network"
-
- # Share an additional folder to the guest VM. The first argument is
- # the path on the host to the actual folder. The second argument is
- # the path on the guest to mount the folder. And the optional third
- # argument is a set of non-required options.
- config.vm.synced_folder ".", "/vagrant"
-
- # Provider-specific configuration so you can fine-tune various
- # backing providers for Vagrant. These expose provider-specific options.
- # Example for VirtualBox:
- #
- config.vm.provider "virtualbox" do |vb|
- # Display the VirtualBox GUI when booting the machine
- # vb.gui = false
-
- # Customize the amount of memory on the VM:
- vb.memory = "4096"
- vb.cpus = 2
- end
- #
- # View the documentation for the provider you are using for more
- # information on available options.
-
- # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
- # such as FTP and Heroku are also available. See the documentation at
- # https://docs.vagrantup.com/v2/push/atlas.html for more information.
- # config.push.define "atlas" do |push|
- # push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
- # end
-
- # Enable provisioning with a shell script. Additional provisioners such as
- # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
- # documentation for more information about their specific syntax and use.
- # config.vm.provision "shell", inline: <<-SHELL
- # sudo apt-get update
- # sudo apt-get install -y apache2
- # SHELL
-end
Oops, something went wrong.

0 comments on commit 58c239b

Please sign in to comment.